From f7b483358ff114b56c753ee9c2964059a55a3bd2 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 15 Nov 2021 20:32:59 -0800
Subject: [PATCH 01/39] Escape custom field values in API response

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

diff --git a/app/Http/Transformers/AssetsTransformer.php b/app/Http/Transformers/AssetsTransformer.php
index c323241cf0..0da314002f 100644
--- a/app/Http/Transformers/AssetsTransformer.php
+++ b/app/Http/Transformers/AssetsTransformer.php
@@ -93,15 +93,15 @@ class AssetsTransformer
                     $value = (Gate::allows('superadmin')) ? $decrypted : strtoupper(trans('admin/custom_fields/general.encrypted'));
 
                     $fields_array[$field->name] = [
-                            'field' => $field->convertUnicodeDbSlug(),
-                            'value' => $value,
+                            'field' => e($field->convertUnicodeDbSlug()),
+                            'value' => e($value),
                             'field_format' => $field->format,
                         ];
 
                 } else {
                     $fields_array[$field->name] = [
-                        'field' => $field->convertUnicodeDbSlug(),
-                        'value' => $asset->{$field->convertUnicodeDbSlug()},
+                        'field' => e($field->convertUnicodeDbSlug()),
+                        'value' => e($asset->{$field->convertUnicodeDbSlug()}),
                         'field_format' => $field->format,
                     ];
 
@@ -134,7 +134,7 @@ class AssetsTransformer
                         
                             'id' => $component->id,
                             'pivot_id' => $component->pivot->id,
-                            'name' => $component->name,
+                            'name' => e($component->name),
                             'qty' => $component->pivot->assigned_qty,
                             'price_cost' => $component->purchase_cost,
                             'purchase_total' => $component->purchase_cost * $component->pivot->assigned_qty,

From 78809c0fe7a6d9a74dbfb20b7aad2d2ebff0d12d Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 16 Nov 2021 12:02:45 -0800
Subject: [PATCH 02/39] 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 6d1935fcf6..20cb685485 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v5.3.1',
-  'full_app_version' => 'v5.3.1 - build 6490-g6690a0f1d',
-  'build_version' => '6490',
+  'app_version' => 'v5.3.2',
+  'full_app_version' => 'v5.3.2 - build 6508-g7ce5993f5',
+  'build_version' => '6508',
   'prerelease_version' => '',
-  'hash_version' => 'g6690a0f1d',
-  'full_hash' => 'v5.3.1-19-g6690a0f1d',
+  'hash_version' => 'g7ce5993f5',
+  'full_hash' => 'v5.3.2-15-g7ce5993f5',
   'branch' => 'master',
 );
\ No newline at end of file

From 5fb05d8b1c61bfcd63384d479e2d0aabfe3547fb Mon Sep 17 00:00:00 2001
From: Brady Wetherington <bwetherington@grokability.com>
Date: Wed, 17 Nov 2021 15:29:51 -0800
Subject: [PATCH 03/39] Change the `[END]` directive in `.htaccess` to `[L]`

This allows backwards-compatibility with older Apache versions (which we _used_ to have), and should do the exact same thing.
---
 public/.htaccess | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/.htaccess b/public/.htaccess
index ac2a6fa8e8..a9fec62ba5 100644
--- a/public/.htaccess
+++ b/public/.htaccess
@@ -6,7 +6,7 @@
     RewriteEngine On
 
     # Needed for https://letsencrypt.org/ certificates.
-    RewriteRule ^\.well-known/acme-challenge/ - [END]
+    RewriteRule ^\.well-known/acme-challenge/ - [L]
 
     # Uncomment these two lines to force SSL redirect in Apache
     # RewriteCond %{HTTPS} off

From a85fa14f9c9e0dd2aa2c2692f0fd4854769960f5 Mon Sep 17 00:00:00 2001
From: "Klaus J. Mueller" <kmueller@leitwerk.de>
Date: Mon, 22 Nov 2021 17:58:26 +0100
Subject: [PATCH 04/39] fix #10344 and #9135

---
 .../views/partials/bootstrap-table.blade.php  | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php
index 130bc9c2d3..7bbef128cf 100644
--- a/resources/views/partials/bootstrap-table.blade.php
+++ b/resources/views/partials/bootstrap-table.blade.php
@@ -145,7 +145,7 @@
     function genericRowLinkFormatter(destination) {
         return function (value,row) {
             if (value) {
-                return '<a href="{{ url('/') }}/' + destination + '/' + row.id + '"> ' + value + '</a>';
+                return '<a href="{{ url('/') }}/' + destination + '/' + row.id + '">' + value + '</a>';
             }
         };
     }
@@ -196,7 +196,7 @@
                     var dpolymorphicItemFormatterest = 'fields/';
                 }
 
-                return '<nobr><a href="{{ url('/') }}/' + dpolymorphicItemFormatterest + dest + '/' + value.id + '"> ' + value.name + '</a></span>';
+                return '<nobr><a href="{{ url('/') }}/' + dpolymorphicItemFormatterest + dest + '/' + value.id + '">' + value.name + '</a></span>';
             }
         };
     }
@@ -466,7 +466,7 @@
         if (value) {
             var groups = '';
             for (var index in value.rows) {
-                groups += '<a href="{{ url('/') }}/admin/groups/' + value.rows[index].id + '" class="label label-default"> ' + value.rows[index].name + '</a> ';
+                groups += '<a href="{{ url('/') }}/admin/groups/' + value.rows[index].id + '" class="label label-default">' + value.rows[index].name + '</a> ';
             }
             return groups;
         }
@@ -495,20 +495,20 @@
 
     function deployedLocationFormatter(row, value) {
         if ((row) && (row!=undefined)) {
-            return '<a href="{{ url('/') }}/locations/' + row.id + '"> ' + row.name + '</a>';
+            return '<a href="{{ url('/') }}/locations/' + row.id + '">' + row.name + '</a>';
         } else if (value.rtd_location) {
-            return '<a href="{{ url('/') }}/locations/' + value.rtd_location.id + '" data-toggle="tooltip" title="Default Location"> ' + value.rtd_location.name + '</a>';
+            return '<a href="{{ url('/') }}/locations/' + value.rtd_location.id + '" data-toggle="tooltip" title="Default Location">' + value.rtd_location.name + '</a>';
         }
 
     }
 
     function groupsAdminLinkFormatter(value, row) {
-        return '<a href="{{ url('/') }}/admin/groups/' + row.id + '"> ' + value + '</a>';
+        return '<a href="{{ url('/') }}/admin/groups/' + row.id + '">' + value + '</a>';
     }
 
     function assetTagLinkFormatter(value, row) {
         if ((row.asset) && (row.asset.id)) {
-            return '<a href="{{ url('/') }}/hardware/' + row.asset.id + '"> ' + row.asset.asset_tag + '</a>';
+            return '<a href="{{ url('/') }}/hardware/' + row.asset.id + '">' + row.asset.asset_tag + '</a>';
         }
         return '';
 
@@ -516,14 +516,14 @@
 
     function departmentNameLinkFormatter(value, row) {
         if ((row.assigned_user) && (row.assigned_user.department) && (row.assigned_user.department.name)) {
-            return '<a href="{{ url('/') }}/department/' + row.assigned_user.department.id + '"> ' + row.assigned_user.department.name + '</a>';
+            return '<a href="{{ url('/') }}/department/' + row.assigned_user.department.id + '">' + row.assigned_user.department.name + '</a>';
         }
 
     }
 
     function assetNameLinkFormatter(value, row) {
         if ((row.asset) && (row.asset.name)) {
-            return '<a href="{{ url('/') }}/hardware/' + row.asset.id + '"> ' + row.asset.name + '</a>';
+            return '<a href="{{ url('/') }}/hardware/' + row.asset.id + '">' + row.asset.name + '</a>';
         }
 
     }
@@ -550,31 +550,31 @@
 
     function emailFormatter(value) {
         if (value) {
-            return '<a href="mailto:' + value + '"> ' + value + '</a>';
+            return '<a href="mailto:' + value + '">' + value + '</a>';
         }
     }
 
     function linkFormatter(value) {
         if (value) {
-            return '<a href="' + value + '"> ' + value + '</a>';
+            return '<a href="' + value + '">' + value + '</a>';
         }
     }
 
     function assetCompanyFilterFormatter(value, row) {
         if (value) {
-            return '<a href="{{ url('/') }}/hardware/?company_id=' + row.id + '"> ' + value + '</a>';
+            return '<a href="{{ url('/') }}/hardware/?company_id=' + row.id + '">' + value + '</a>';
         }
     }
 
     function assetCompanyObjFilterFormatter(value, row) {
         if ((row) && (row.company)) {
-            return '<a href="{{ url('/') }}/hardware/?company_id=' + row.company.id + '"> ' + row.company.name + '</a>';
+            return '<a href="{{ url('/') }}/hardware/?company_id=' + row.company.id + '">' + row.company.name + '</a>';
         }
     }
 
     function usersCompanyObjFilterFormatter(value, row) {
         if (value) {
-            return '<a href="{{ url('/') }}/users/?company_id=' + row.id + '"> ' + value + '</a>';
+            return '<a href="{{ url('/') }}/users/?company_id=' + row.id + '">' + value + '</a>';
         } else {
             return value;
         }
@@ -583,13 +583,13 @@
     function employeeNumFormatter(value, row) {
 
         if ((row) && (row.assigned_to) && ((row.assigned_to.employee_number))) {
-            return '<a href="{{ url('/') }}/users/' + row.assigned_to.id + '"> ' + row.assigned_to.employee_number + '</a>';
+            return '<a href="{{ url('/') }}/users/' + row.assigned_to.id + '">' + row.assigned_to.employee_number + '</a>';
         }
     }
 
     function orderNumberObjFilterFormatter(value, row) {
         if (value) {
-            return '<a href="{{ url('/') }}/hardware/?order_number=' + row.order_number + '"> ' + row.order_number + '</a>';
+            return '<a href="{{ url('/') }}/hardware/?order_number=' + row.order_number + '">' + row.order_number + '</a>';
         }
     }
 

From 1ca770895aba7f318399391eb499cd5508651182 Mon Sep 17 00:00:00 2001
From: Ivan Nieto Vivanco <inietov@gmail.com>
Date: Mon, 22 Nov 2021 18:43:21 -0600
Subject: [PATCH 05/39] Apply trim() function when storing Custom Fields names

---
 app/Http/Controllers/CustomFieldsController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/CustomFieldsController.php b/app/Http/Controllers/CustomFieldsController.php
index a8be424841..04819a9b0f 100644
--- a/app/Http/Controllers/CustomFieldsController.php
+++ b/app/Http/Controllers/CustomFieldsController.php
@@ -92,7 +92,7 @@ class CustomFieldsController extends Controller
         $this->authorize('create', CustomField::class);
 
         $field = new CustomField([
-            "name" => $request->get("name"),
+            "name" => trim($request->get("name")),
             "element" => $request->get("element"),
             "help_text" => $request->get("help_text"),
             "field_values" => $request->get("field_values"),
@@ -212,7 +212,7 @@ class CustomFieldsController extends Controller
  
         $this->authorize('update', $field);
 
-        $field->name          = e($request->get("name"));
+        $field->name          = trim(e($request->get("name")));
         $field->element       = e($request->get("element"));
         $field->field_values  = e($request->get("field_values"));
         $field->user_id       = Auth::id();

From ab06c265271f1d02fadf96299c1047a296c1962d Mon Sep 17 00:00:00 2001
From: Adam <adam@aboutcher.co.uk>
Date: Tue, 23 Nov 2021 16:13:38 +0000
Subject: [PATCH 06/39] Rocky Linux Support

Addition to enable Rocky Linux installation.
---
 snipeit.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snipeit.sh b/snipeit.sh
index e94cfe018a..20700463c9 100755
--- a/snipeit.sh
+++ b/snipeit.sh
@@ -301,7 +301,7 @@ echo '
 '
 
 echo ""
-echo "  Welcome to Snipe-IT Inventory Installer for CentOS, Fedora, Debian and Ubuntu!"
+echo "  Welcome to Snipe-IT Inventory Installer for CentOS, Rocky, Fedora, Debian and Ubuntu!"
 echo ""
 shopt -s nocasematch
 case $distro in
@@ -323,7 +323,7 @@ case $distro in
     apache_group=www-data
     apachefile=/etc/apache2/sites-available/$APP_NAME.conf
     ;;
-  *centos*|*redhat*|*ol*|*rhel*)
+  *centos*|*redhat*|*ol*|*rhel*|*rocky*)
     echo "  The installer has detected $distro version $version."
     distro=centos
     apache_group=apache

From d95d3dc2829d19d0685493cbdc134d9355e5fd1f Mon Sep 17 00:00:00 2001
From: Ivan Nieto Vivanco <inietov@gmail.com>
Date: Tue, 23 Nov 2021 17:21:46 -0600
Subject: [PATCH 07/39] Add the call to defaultValue() function in custom
 fields with date format

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

diff --git a/resources/views/models/custom_fields_form.blade.php b/resources/views/models/custom_fields_form.blade.php
index f70d8fba2a..f434238f51 100644
--- a/resources/views/models/custom_fields_form.blade.php
+++ b/resources/views/models/custom_fields_form.blade.php
@@ -48,7 +48,7 @@
 
                         <div class="input-group col-md-4" style="padding-left: 0px;">
                             <div class="input-group date" data-provide="datepicker" data-date-format="yyyy-mm-dd"  data-autoclose="true">
-                                <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="{{ $field->db_column_name() }}" id="{{ $field->db_column_name() }}" value="{{ old($field->db_column_name(),(isset($item) ? \App\Helpers\Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : "")) }}">
+                                <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="{{ $field->db_column_name() }}" id="{{ $field->db_column_name() }}" value="{{ old($field->db_column_name(),(isset($item) ? \App\Helpers\Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : $field->defaultValue($model->id))) }}">
                                 <span class="input-group-addon"><i class="fa fa-calendar" aria-hidden="true"></i></span>
                             </div>
                         </div>

From 55d05eeae31df0f9ab39f9889068fe26a4c723f6 Mon Sep 17 00:00:00 2001
From: Shao Yu-Lung <mis@cendai.com.tw>
Date: Wed, 24 Nov 2021 10:28:10 +0800
Subject: [PATCH 08/39] fix modal-title html tag unpaired.

---
 resources/views/categories/edit.blade.php       | 2 +-
 resources/views/layouts/default.blade.php       | 2 +-
 resources/views/modals/category.blade.php       | 2 +-
 resources/views/modals/kit-accessory.blade.php  | 2 +-
 resources/views/modals/kit-consumable.blade.php | 2 +-
 resources/views/modals/kit-license.blade.php    | 2 +-
 resources/views/modals/kit-model.blade.php      | 2 +-
 resources/views/modals/location.blade.php       | 2 +-
 resources/views/modals/manufacturer.blade.php   | 2 +-
 resources/views/modals/model.blade.php          | 2 +-
 resources/views/modals/statuslabel.blade.php    | 2 +-
 resources/views/modals/supplier.blade.php       | 2 +-
 resources/views/modals/upload-file.blade.php    | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/resources/views/categories/edit.blade.php b/resources/views/categories/edit.blade.php
index 75d8457c97..af90a0cd7e 100755
--- a/resources/views/categories/edit.blade.php
+++ b/resources/views/categories/edit.blade.php
@@ -108,7 +108,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <h2 class="modal-title" id="eulaModalLabel">{{ trans('admin/settings/general.default_eula_text') }}</h4>
+                <h2 class="modal-title" id="eulaModalLabel">{{ trans('admin/settings/general.default_eula_text') }}</h2>
             </div>
             <div class="modal-body">
                 {{ \App\Models\Setting::getDefaultEula() }}
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index 239b6dcf8e..37fdcc2e19 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -844,7 +844,7 @@
             <div class="modal-content">
                 <div class="modal-header">
                     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-                    <h4 class="modal-title" id="myModalLabel">&nbsp;</h4>
+                    <h2 class="modal-title" id="myModalLabel">&nbsp;</h2>
                 </div>
                 <div class="modal-body"></div>
                 <div class="modal-footer">
diff --git a/resources/views/modals/category.blade.php b/resources/views/modals/category.blade.php
index 06fd7c1661..c07b092ace 100644
--- a/resources/views/modals/category.blade.php
+++ b/resources/views/modals/category.blade.php
@@ -4,7 +4,7 @@
         <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                 <span aria-hidden="true">&times;</span></button>
-            <h2 class="modal-title">{{ trans('admin/categories/general.create') }}</h4>
+            <h2 class="modal-title">{{ trans('admin/categories/general.create') }}</h2>
         </div>
         <div class="modal-body">
             <form action="{{ route('api.categories.store') }}" onsubmit="return false">
diff --git a/resources/views/modals/kit-accessory.blade.php b/resources/views/modals/kit-accessory.blade.php
index 6e5fd6807c..7fb6256ed4 100644
--- a/resources/views/modals/kit-accessory.blade.php
+++ b/resources/views/modals/kit-accessory.blade.php
@@ -4,7 +4,7 @@
         <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                 <span aria-hidden="true">&times;</span></button>
-            <h4 class="modal-title">Append accessory{{-- TODO: trans --}}</h4>
+            <h2 class="modal-title">Append accessory{{-- TODO: trans --}}</h2>
         </div>
         <div class="modal-body">
             <form action="{{ route('api.kits.accessories.store', $kitId) }}" onsubmit="return false">
diff --git a/resources/views/modals/kit-consumable.blade.php b/resources/views/modals/kit-consumable.blade.php
index bdf027557b..f1fc779c12 100644
--- a/resources/views/modals/kit-consumable.blade.php
+++ b/resources/views/modals/kit-consumable.blade.php
@@ -4,7 +4,7 @@
         <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                 <span aria-hidden="true">&times;</span></button>
-            <h4 class="modal-title">Append consumable{{-- TODO: trans --}}</h4>
+            <h2 class="modal-title">Append consumable{{-- TODO: trans --}}</h2>
         </div>
         <div class="modal-body">
             <form action="{{ route('api.kits.consumables.store', $kitId) }}" onsubmit="return false">
diff --git a/resources/views/modals/kit-license.blade.php b/resources/views/modals/kit-license.blade.php
index dc2d30cf9a..5df2b5efb3 100644
--- a/resources/views/modals/kit-license.blade.php
+++ b/resources/views/modals/kit-license.blade.php
@@ -4,7 +4,7 @@
         <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                 <span aria-hidden="true">&times;</span></button>
-            <h4 class="modal-title">Append license{{-- TODO: trans --}}</h4>
+            <h2 class="modal-title">Append license{{-- TODO: trans --}}</h2>
         </div>
         <div class="modal-body">
             <form action="{{ route('api.kits.licenses.store', $kitId) }}" onsubmit="return false">
diff --git a/resources/views/modals/kit-model.blade.php b/resources/views/modals/kit-model.blade.php
index d994c61a9a..1df5d08580 100644
--- a/resources/views/modals/kit-model.blade.php
+++ b/resources/views/modals/kit-model.blade.php
@@ -4,7 +4,7 @@
         <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                 <span aria-hidden="true">&times;</span></button>
-            <h4 class="modal-title">Append model{{-- TODO: trans --}}</h4>
+            <h2 class="modal-title">Append model{{-- TODO: trans --}}</h2>
         </div>
         <div class="modal-body">
             <form action="{{ route('api.kits.models.store', $kitId) }}" onsubmit="return false">
diff --git a/resources/views/modals/location.blade.php b/resources/views/modals/location.blade.php
index cf913761d3..112e710249 100644
--- a/resources/views/modals/location.blade.php
+++ b/resources/views/modals/location.blade.php
@@ -3,7 +3,7 @@
     <div class="modal-content">
         <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-            <h2 class="modal-title">{{ trans('admin/locations/table.create')  }}</h4>
+            <h2 class="modal-title">{{ trans('admin/locations/table.create')  }}</h2>
         </div>
         <div class="modal-body">
             <form action="{{ route('api.locations.store') }}" onsubmit="return false">
diff --git a/resources/views/modals/manufacturer.blade.php b/resources/views/modals/manufacturer.blade.php
index 2107073239..60cf8363e4 100644
--- a/resources/views/modals/manufacturer.blade.php
+++ b/resources/views/modals/manufacturer.blade.php
@@ -4,7 +4,7 @@
         <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                 <span aria-hidden="true">&times;</span></button>
-            <h2 class="modal-title">{{ trans('admin/manufacturers/table.create') }}</h4>
+            <h2 class="modal-title">{{ trans('admin/manufacturers/table.create') }}</h2>
         </div>
         <div class="modal-body">
             <form action="{{ route('api.manufacturers.store') }}" onsubmit="return false">
diff --git a/resources/views/modals/model.blade.php b/resources/views/modals/model.blade.php
index d43743dc71..c64a4c737b 100644
--- a/resources/views/modals/model.blade.php
+++ b/resources/views/modals/model.blade.php
@@ -3,7 +3,7 @@
     <div class="modal-content">
         <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-            <h2 class="modal-title">{{ trans('admin/models/table.create') }}</h4>
+            <h2 class="modal-title">{{ trans('admin/models/table.create') }}</h2>
         </div>
         <div class="modal-body">
             <form action="{{ route('api.models.store') }}" onsubmit="return false">
diff --git a/resources/views/modals/statuslabel.blade.php b/resources/views/modals/statuslabel.blade.php
index 21b5ce420e..7e07854197 100644
--- a/resources/views/modals/statuslabel.blade.php
+++ b/resources/views/modals/statuslabel.blade.php
@@ -3,7 +3,7 @@
     <div class="modal-content">
         <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-            <h2 class="modal-title">{{ trans('admin/statuslabels/table.create') }}</h4>
+            <h2 class="modal-title">{{ trans('admin/statuslabels/table.create') }}</h2>
         </div>
         <div class="modal-body">
             <form action="{{ route('api.statuslabels.store') }}" onsubmit="return false">
diff --git a/resources/views/modals/supplier.blade.php b/resources/views/modals/supplier.blade.php
index b1d197c739..0dd10595bf 100644
--- a/resources/views/modals/supplier.blade.php
+++ b/resources/views/modals/supplier.blade.php
@@ -3,7 +3,7 @@
     <div class="modal-content">
         <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-            <h2 class="modal-title">{{ trans('admin/suppliers/table.create') }}</h4>
+            <h2 class="modal-title">{{ trans('admin/suppliers/table.create') }}</h2>
         </div>
         <div class="modal-body">
             <form action="{{ route('api.suppliers.store') }}" onsubmit="return false">
diff --git a/resources/views/modals/upload-file.blade.php b/resources/views/modals/upload-file.blade.php
index 1df39c0ce7..fad310e7e9 100644
--- a/resources/views/modals/upload-file.blade.php
+++ b/resources/views/modals/upload-file.blade.php
@@ -4,7 +4,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <h2 class="modal-title" id="uploadFileModalLabel">Upload File</h4>
+                <h2 class="modal-title" id="uploadFileModalLabel">Upload File</h2>
             </div>
             {{ Form::open([
             'method' => 'POST',

From b937aedc300f6fb3f90499ba670dc45e0fa5f7c2 Mon Sep 17 00:00:00 2001
From: sneaK <16104273+sneak-it@users.noreply.github.com>
Date: Wed, 24 Nov 2021 10:24:05 -0500
Subject: [PATCH 09/39] Add Debian 11 (Bullseye) install script support

---
 snipeit.sh | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/snipeit.sh b/snipeit.sh
index e94cfe018a..97c5441258 100755
--- a/snipeit.sh
+++ b/snipeit.sh
@@ -374,7 +374,39 @@ done
 
 case $distro in
   debian)
-  if [[ "$version" =~ ^10 ]]; then
+    if [[ "$version" =~ ^11 ]]; then
+    # Install for Debian 11.x
+    tzone=$(cat /etc/timezone)
+
+    echo "* Adding PHP repository."
+    log "apt-get install -y apt-transport-https lsb-release ca-certificates"
+    log "wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg"
+    echo "deb https://packages.sury.org/php/ $codename main" > /etc/apt/sources.list.d/php.list
+
+    echo -n "* Updating installed packages."
+    log "apt-get update && apt-get -y upgrade" & pid=$!
+    progress
+
+    echo "* Installing Apache httpd, PHP, MariaDB and other requirements."
+    PACKAGES="mariadb-server mariadb-client apache2 libapache2-mod-php7.4 php7.4 php7.4-mcrypt php7.4-curl php7.4-mysql php7.4-gd php7.4-ldap php7.4-zip php7.4-mbstring php7.4-xml php7.4-bcmath curl git unzip"
+    install_packages
+
+    echo "* Configuring Apache."
+    create_virtualhost
+    log "a2enmod rewrite"
+    log "a2ensite $APP_NAME.conf"
+	rename_default_vhost
+
+    set_hosts
+
+    echo "* Securing MariaDB."
+    /usr/bin/mysql_secure_installation
+
+    install_snipeit
+
+    echo "* Restarting Apache httpd."
+    log "service apache2 restart"
+  elif [[ "$version" =~ ^10 ]]; then
     # Install for Debian 10.x
     tzone=$(cat /etc/timezone)
 

From 830d07f84fb00ab20f618f0b4120a6418293d07b Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 24 Nov 2021 19:19:32 -0800
Subject: [PATCH 10/39] Removed escaping on input save for asset checkout on
 creation

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Controllers/Assets/AssetsController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.php
index 94bfcb0f4c..1dd119ea1c 100755
--- a/app/Http/Controllers/Assets/AssetsController.php
+++ b/app/Http/Controllers/Assets/AssetsController.php
@@ -196,7 +196,7 @@ class AssetsController extends Controller
                 }
 
                 if (isset($target)) {
-                    $asset->checkOut($target, Auth::user(), date('Y-m-d H:i:s'), $request->input('expected_checkin', null), 'Checked out on asset creation', e($request->get('name')), $location);
+                    $asset->checkOut($target, Auth::user(), date('Y-m-d H:i:s'), $request->input('expected_checkin', null), 'Checked out on asset creation', $request->get('name'), $location);
                 }
 
                 $success = true;

From 00fad35c2a6ddc9813d3322da91086eb06cb7406 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 24 Nov 2021 19:54:45 -0800
Subject: [PATCH 11/39] Escape notes in transformCheckedOutAccessory

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Transformers/AccessoriesTransformer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Transformers/AccessoriesTransformer.php b/app/Http/Transformers/AccessoriesTransformer.php
index d40642d875..1bc70f2314 100644
--- a/app/Http/Transformers/AccessoriesTransformer.php
+++ b/app/Http/Transformers/AccessoriesTransformer.php
@@ -82,7 +82,7 @@ class AccessoriesTransformer
                 'first_name'=> e($user->first_name),
                 'last_name'=> e($user->last_name),
                 'employee_number' =>  e($user->employee_num),
-                'checkout_notes' => $user->pivot->note,
+                'checkout_notes' => e($user->pivot->note),
                 'last_checkout' => Helper::getFormattedDateObject($user->pivot->created_at, 'datetime'),
                 'type' => 'user',
                 'available_actions' => ['checkin' => true]

From 8028b39b4363fabb9d935b8c18ca12c277809ef0 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 24 Nov 2021 19:58:43 -0800
Subject: [PATCH 12/39] 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 20cb685485..3374c56e77 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v5.3.2',
-  'full_app_version' => 'v5.3.2 - build 6508-g7ce5993f5',
-  'build_version' => '6508',
+  'app_version' => 'v5.3.3',
+  'full_app_version' => 'v5.3.3 - build 6517-g4afd598df',
+  'build_version' => '6517',
   'prerelease_version' => '',
-  'hash_version' => 'g7ce5993f5',
-  'full_hash' => 'v5.3.2-15-g7ce5993f5',
+  'hash_version' => 'g4afd598df',
+  'full_hash' => 'v5.3.3-8-g4afd598df',
   'branch' => 'master',
 );
\ No newline at end of file

From 80fd49a59e74d7189453c96424c9157a1b511f02 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 24 Nov 2021 20:03:40 -0800
Subject: [PATCH 13/39] Add @leitwerk-ag as a contributor

---
 .all-contributorsrc | 9 +++++++++
 README.md           | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.all-contributorsrc b/.all-contributorsrc
index 248aa535bb..c5bf5d5ce6 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -2468,6 +2468,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "leitwerk-ag",
+      "name": "LEITWERK AG",
+      "avatar_url": "https://avatars.githubusercontent.com/u/24418301?v=4",
+      "profile": "https://www.leitwerk.de/",
+      "contributions": [
+        "code"
+      ]
     }
   ]
 }
diff --git a/README.md b/README.md
index 75069a93b4..a2358447a8 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 ![Build Status](https://app.chipperci.com/projects/0e5f8979-31eb-4ee6-9abf-050b76ab0383/status/master) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/snipe-it/localized.svg)](https://crowdin.com/project/snipe-it) [![Docker Pulls](https://img.shields.io/docker/pulls/snipe/snipe-it.svg)](https://hub.docker.com/r/snipe/snipe-it/) [![Twitter Follow](https://img.shields.io/twitter/follow/snipeitapp.svg?style=social)](https://twitter.com/snipeitapp)  [![Codacy Badge](https://api.codacy.com/project/badge/Grade/553ce52037fc43ea99149785afcfe641)](https://www.codacy.com/app/snipe/snipe-it?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=snipe/snipe-it&amp;utm_campaign=Badge_Grade)
-[![All Contributors](https://img.shields.io/badge/all_contributors-271-orange.svg?style=flat-square)](#contributors) [![Discord](https://badgen.net/badge/icon/discord?icon=discord&label)](https://discord.gg/yZFtShAcKk) [![huntr](https://cdn.huntr.dev/huntr_security_badge_mono.svg)](https://huntr.dev)
+[![All Contributors](https://img.shields.io/badge/all_contributors-272-orange.svg?style=flat-square)](#contributors) [![Discord](https://badgen.net/badge/icon/discord?icon=discord&label)](https://discord.gg/yZFtShAcKk) [![huntr](https://cdn.huntr.dev/huntr_security_badge_mono.svg)](https://huntr.dev)
 
 ## Snipe-IT - Open Source Asset Management System
 
@@ -129,7 +129,7 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken
 | [<img src="https://avatars.githubusercontent.com/u/36065681?v=4" width="110px;"/><br /><sub>David Valin Alonso</sub>](https://github.com/deivishome)<br />[💻](https://github.com/snipe/snipe-it/commits?author=deivishome "Code") | [<img src="https://avatars.githubusercontent.com/u/8290389?v=4" width="110px;"/><br /><sub>andreaci</sub>](https://github.com/andreaci)<br />[💻](https://github.com/snipe/snipe-it/commits?author=andreaci "Code") | [<img src="https://avatars.githubusercontent.com/u/1828542?v=4" width="110px;"/><br /><sub>Jelle Sebreghts</sub>](http://www.jellesebreghts.be)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Jelle-S "Code") | [<img src="https://avatars.githubusercontent.com/u/11180862?v=4" width="110px;"/><br /><sub>Michael Pietsch</sub>](https://github.com/Skywalker-11)<br /> | [<img src="https://avatars.githubusercontent.com/u/22068886?v=4" width="110px;"/><br /><sub>Masudul Haque Shihab</sub>](https://github.com/sh1hab)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sh1hab "Code") | [<img src="https://avatars.githubusercontent.com/u/16099942?v=4" width="110px;"/><br /><sub>Supapong Areeprasertkul</sub>](http://www.freedomdive.com/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=zybersup "Code") | [<img src="https://avatars.githubusercontent.com/u/207358?v=4" width="110px;"/><br /><sub>Peter Sarossy</sub>](https://github.com/psarossy)<br />[💻](https://github.com/snipe/snipe-it/commits?author=psarossy "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/11823649?v=4" width="110px;"/><br /><sub>Renee Margaret McConahy</sub>](https://github.com/nepella)<br />[💻](https://github.com/snipe/snipe-it/commits?author=nepella "Code") | [<img src="https://avatars.githubusercontent.com/u/5553884?v=4" width="110px;"/><br /><sub>JohnnyPicnic</sub>](https://github.com/JohnnyPicnic)<br />[💻](https://github.com/snipe/snipe-it/commits?author=JohnnyPicnic "Code") | [<img src="https://avatars.githubusercontent.com/u/8799594?v=4" width="110px;"/><br /><sub>markbrule</sub>](https://github.com/markbrule)<br />[💻](https://github.com/snipe/snipe-it/commits?author=markbrule "Code") | [<img src="https://avatars.githubusercontent.com/u/1962801?v=4" width="110px;"/><br /><sub>Mike Campbell</sub>](https://github.com/mikecmpbll)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mikecmpbll "Code") | [<img src="https://avatars.githubusercontent.com/u/11973217?v=4" width="110px;"/><br /><sub>tbrconnect</sub>](https://github.com/tbrconnect)<br />[💻](https://github.com/snipe/snipe-it/commits?author=tbrconnect "Code") | [<img src="https://avatars.githubusercontent.com/u/12447225?v=4" width="110px;"/><br /><sub>kcoyo</sub>](https://github.com/kcoyo)<br />[💻](https://github.com/snipe/snipe-it/commits?author=kcoyo "Code") | [<img src="https://avatars.githubusercontent.com/u/494017?v=4" width="110px;"/><br /><sub>Travis Miller</sub>](https://travismiller.com/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=travismiller "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/8735148?v=4" width="110px;"/><br /><sub>Petri Asikainen</sub>](https://github.com/PetriAsi)<br />[💻](https://github.com/snipe/snipe-it/commits?author=PetriAsi "Code") | [<img src="https://avatars.githubusercontent.com/u/11424540?v=4" width="110px;"/><br /><sub>derdeagle</sub>](https://github.com/derdeagle)<br />[💻](https://github.com/snipe/snipe-it/commits?author=derdeagle "Code") | [<img src="https://avatars.githubusercontent.com/u/176950?v=4" width="110px;"/><br /><sub>Mike Frysinger</sub>](https://wh0rd.org/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=vapier "Code") | [<img src="https://avatars.githubusercontent.com/u/22044358?v=4" width="110px;"/><br /><sub>ALPHA</sub>](https://github.com/AL4AL)<br />[💻](https://github.com/snipe/snipe-it/commits?author=AL4AL "Code") | [<img src="https://avatars.githubusercontent.com/u/1042587?v=4" width="110px;"/><br /><sub>FliegenKLATSCH</sub>](https://www.ifern.de)<br />[💻](https://github.com/snipe/snipe-it/commits?author=FliegenKLATSCH "Code") | [<img src="https://avatars.githubusercontent.com/u/442138?v=4" width="110px;"/><br /><sub>Jeremy Price</sub>](https://github.com/jerm)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jerm "Code") | [<img src="https://avatars.githubusercontent.com/u/84392209?v=4" width="110px;"/><br /><sub>Toreg87</sub>](https://github.com/Toreg87)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Toreg87 "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/67638596?v=4" width="110px;"/><br /><sub>Matthew Nickson</sub>](https://github.com/Computroniks)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Computroniks "Code") | [<img src="https://avatars.githubusercontent.com/u/1646397?v=4" width="110px;"/><br /><sub>Jethro Nederhof</sub>](https://jethron.id.au)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jethron "Code") | [<img src="https://avatars.githubusercontent.com/u/23289826?v=4" width="110px;"/><br /><sub>Oskar Stenberg</sub>](https://github.com/01ste02)<br />[💻](https://github.com/snipe/snipe-it/commits?author=01ste02 "Code") | [<img src="https://avatars.githubusercontent.com/u/82208283?v=4" width="110px;"/><br /><sub>Robert-Azelis</sub>](https://github.com/Robert-Azelis)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Robert-Azelis "Code") | [<img src="https://avatars.githubusercontent.com/u/60648387?v=4" width="110px;"/><br /><sub>Alexander William Smith</sub>](https://github.com/alwism)<br />[💻](https://github.com/snipe/snipe-it/commits?author=alwism "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/67638596?v=4" width="110px;"/><br /><sub>Matthew Nickson</sub>](https://github.com/Computroniks)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Computroniks "Code") | [<img src="https://avatars.githubusercontent.com/u/1646397?v=4" width="110px;"/><br /><sub>Jethro Nederhof</sub>](https://jethron.id.au)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jethron "Code") | [<img src="https://avatars.githubusercontent.com/u/23289826?v=4" width="110px;"/><br /><sub>Oskar Stenberg</sub>](https://github.com/01ste02)<br />[💻](https://github.com/snipe/snipe-it/commits?author=01ste02 "Code") | [<img src="https://avatars.githubusercontent.com/u/82208283?v=4" width="110px;"/><br /><sub>Robert-Azelis</sub>](https://github.com/Robert-Azelis)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Robert-Azelis "Code") | [<img src="https://avatars.githubusercontent.com/u/60648387?v=4" width="110px;"/><br /><sub>Alexander William Smith</sub>](https://github.com/alwism)<br />[💻](https://github.com/snipe/snipe-it/commits?author=alwism "Code") | [<img src="https://avatars.githubusercontent.com/u/24418301?v=4" width="110px;"/><br /><sub>LEITWERK AG</sub>](https://www.leitwerk.de/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=leitwerk-ag "Code") |
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!

From 9dc2fa61b8c87ea3927cda0e1aa89d2472bc15e0 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 24 Nov 2021 20:03:52 -0800
Subject: [PATCH 14/39] Add @adamboutcher as a contributor

---
 .all-contributorsrc | 9 +++++++++
 README.md           | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.all-contributorsrc b/.all-contributorsrc
index c5bf5d5ce6..7e2d0b032a 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -2477,6 +2477,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "adamboutcher",
+      "name": "Adam",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1911435?v=4",
+      "profile": "http://www.aboutcher.co.uk",
+      "contributions": [
+        "code"
+      ]
     }
   ]
 }
diff --git a/README.md b/README.md
index a2358447a8..af52494b43 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 ![Build Status](https://app.chipperci.com/projects/0e5f8979-31eb-4ee6-9abf-050b76ab0383/status/master) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/snipe-it/localized.svg)](https://crowdin.com/project/snipe-it) [![Docker Pulls](https://img.shields.io/docker/pulls/snipe/snipe-it.svg)](https://hub.docker.com/r/snipe/snipe-it/) [![Twitter Follow](https://img.shields.io/twitter/follow/snipeitapp.svg?style=social)](https://twitter.com/snipeitapp)  [![Codacy Badge](https://api.codacy.com/project/badge/Grade/553ce52037fc43ea99149785afcfe641)](https://www.codacy.com/app/snipe/snipe-it?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=snipe/snipe-it&amp;utm_campaign=Badge_Grade)
-[![All Contributors](https://img.shields.io/badge/all_contributors-272-orange.svg?style=flat-square)](#contributors) [![Discord](https://badgen.net/badge/icon/discord?icon=discord&label)](https://discord.gg/yZFtShAcKk) [![huntr](https://cdn.huntr.dev/huntr_security_badge_mono.svg)](https://huntr.dev)
+[![All Contributors](https://img.shields.io/badge/all_contributors-273-orange.svg?style=flat-square)](#contributors) [![Discord](https://badgen.net/badge/icon/discord?icon=discord&label)](https://discord.gg/yZFtShAcKk) [![huntr](https://cdn.huntr.dev/huntr_security_badge_mono.svg)](https://huntr.dev)
 
 ## Snipe-IT - Open Source Asset Management System
 
@@ -129,7 +129,7 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken
 | [<img src="https://avatars.githubusercontent.com/u/36065681?v=4" width="110px;"/><br /><sub>David Valin Alonso</sub>](https://github.com/deivishome)<br />[💻](https://github.com/snipe/snipe-it/commits?author=deivishome "Code") | [<img src="https://avatars.githubusercontent.com/u/8290389?v=4" width="110px;"/><br /><sub>andreaci</sub>](https://github.com/andreaci)<br />[💻](https://github.com/snipe/snipe-it/commits?author=andreaci "Code") | [<img src="https://avatars.githubusercontent.com/u/1828542?v=4" width="110px;"/><br /><sub>Jelle Sebreghts</sub>](http://www.jellesebreghts.be)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Jelle-S "Code") | [<img src="https://avatars.githubusercontent.com/u/11180862?v=4" width="110px;"/><br /><sub>Michael Pietsch</sub>](https://github.com/Skywalker-11)<br /> | [<img src="https://avatars.githubusercontent.com/u/22068886?v=4" width="110px;"/><br /><sub>Masudul Haque Shihab</sub>](https://github.com/sh1hab)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sh1hab "Code") | [<img src="https://avatars.githubusercontent.com/u/16099942?v=4" width="110px;"/><br /><sub>Supapong Areeprasertkul</sub>](http://www.freedomdive.com/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=zybersup "Code") | [<img src="https://avatars.githubusercontent.com/u/207358?v=4" width="110px;"/><br /><sub>Peter Sarossy</sub>](https://github.com/psarossy)<br />[💻](https://github.com/snipe/snipe-it/commits?author=psarossy "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/11823649?v=4" width="110px;"/><br /><sub>Renee Margaret McConahy</sub>](https://github.com/nepella)<br />[💻](https://github.com/snipe/snipe-it/commits?author=nepella "Code") | [<img src="https://avatars.githubusercontent.com/u/5553884?v=4" width="110px;"/><br /><sub>JohnnyPicnic</sub>](https://github.com/JohnnyPicnic)<br />[💻](https://github.com/snipe/snipe-it/commits?author=JohnnyPicnic "Code") | [<img src="https://avatars.githubusercontent.com/u/8799594?v=4" width="110px;"/><br /><sub>markbrule</sub>](https://github.com/markbrule)<br />[💻](https://github.com/snipe/snipe-it/commits?author=markbrule "Code") | [<img src="https://avatars.githubusercontent.com/u/1962801?v=4" width="110px;"/><br /><sub>Mike Campbell</sub>](https://github.com/mikecmpbll)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mikecmpbll "Code") | [<img src="https://avatars.githubusercontent.com/u/11973217?v=4" width="110px;"/><br /><sub>tbrconnect</sub>](https://github.com/tbrconnect)<br />[💻](https://github.com/snipe/snipe-it/commits?author=tbrconnect "Code") | [<img src="https://avatars.githubusercontent.com/u/12447225?v=4" width="110px;"/><br /><sub>kcoyo</sub>](https://github.com/kcoyo)<br />[💻](https://github.com/snipe/snipe-it/commits?author=kcoyo "Code") | [<img src="https://avatars.githubusercontent.com/u/494017?v=4" width="110px;"/><br /><sub>Travis Miller</sub>](https://travismiller.com/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=travismiller "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/8735148?v=4" width="110px;"/><br /><sub>Petri Asikainen</sub>](https://github.com/PetriAsi)<br />[💻](https://github.com/snipe/snipe-it/commits?author=PetriAsi "Code") | [<img src="https://avatars.githubusercontent.com/u/11424540?v=4" width="110px;"/><br /><sub>derdeagle</sub>](https://github.com/derdeagle)<br />[💻](https://github.com/snipe/snipe-it/commits?author=derdeagle "Code") | [<img src="https://avatars.githubusercontent.com/u/176950?v=4" width="110px;"/><br /><sub>Mike Frysinger</sub>](https://wh0rd.org/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=vapier "Code") | [<img src="https://avatars.githubusercontent.com/u/22044358?v=4" width="110px;"/><br /><sub>ALPHA</sub>](https://github.com/AL4AL)<br />[💻](https://github.com/snipe/snipe-it/commits?author=AL4AL "Code") | [<img src="https://avatars.githubusercontent.com/u/1042587?v=4" width="110px;"/><br /><sub>FliegenKLATSCH</sub>](https://www.ifern.de)<br />[💻](https://github.com/snipe/snipe-it/commits?author=FliegenKLATSCH "Code") | [<img src="https://avatars.githubusercontent.com/u/442138?v=4" width="110px;"/><br /><sub>Jeremy Price</sub>](https://github.com/jerm)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jerm "Code") | [<img src="https://avatars.githubusercontent.com/u/84392209?v=4" width="110px;"/><br /><sub>Toreg87</sub>](https://github.com/Toreg87)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Toreg87 "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/67638596?v=4" width="110px;"/><br /><sub>Matthew Nickson</sub>](https://github.com/Computroniks)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Computroniks "Code") | [<img src="https://avatars.githubusercontent.com/u/1646397?v=4" width="110px;"/><br /><sub>Jethro Nederhof</sub>](https://jethron.id.au)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jethron "Code") | [<img src="https://avatars.githubusercontent.com/u/23289826?v=4" width="110px;"/><br /><sub>Oskar Stenberg</sub>](https://github.com/01ste02)<br />[💻](https://github.com/snipe/snipe-it/commits?author=01ste02 "Code") | [<img src="https://avatars.githubusercontent.com/u/82208283?v=4" width="110px;"/><br /><sub>Robert-Azelis</sub>](https://github.com/Robert-Azelis)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Robert-Azelis "Code") | [<img src="https://avatars.githubusercontent.com/u/60648387?v=4" width="110px;"/><br /><sub>Alexander William Smith</sub>](https://github.com/alwism)<br />[💻](https://github.com/snipe/snipe-it/commits?author=alwism "Code") | [<img src="https://avatars.githubusercontent.com/u/24418301?v=4" width="110px;"/><br /><sub>LEITWERK AG</sub>](https://www.leitwerk.de/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=leitwerk-ag "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/67638596?v=4" width="110px;"/><br /><sub>Matthew Nickson</sub>](https://github.com/Computroniks)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Computroniks "Code") | [<img src="https://avatars.githubusercontent.com/u/1646397?v=4" width="110px;"/><br /><sub>Jethro Nederhof</sub>](https://jethron.id.au)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jethron "Code") | [<img src="https://avatars.githubusercontent.com/u/23289826?v=4" width="110px;"/><br /><sub>Oskar Stenberg</sub>](https://github.com/01ste02)<br />[💻](https://github.com/snipe/snipe-it/commits?author=01ste02 "Code") | [<img src="https://avatars.githubusercontent.com/u/82208283?v=4" width="110px;"/><br /><sub>Robert-Azelis</sub>](https://github.com/Robert-Azelis)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Robert-Azelis "Code") | [<img src="https://avatars.githubusercontent.com/u/60648387?v=4" width="110px;"/><br /><sub>Alexander William Smith</sub>](https://github.com/alwism)<br />[💻](https://github.com/snipe/snipe-it/commits?author=alwism "Code") | [<img src="https://avatars.githubusercontent.com/u/24418301?v=4" width="110px;"/><br /><sub>LEITWERK AG</sub>](https://www.leitwerk.de/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=leitwerk-ag "Code") | [<img src="https://avatars.githubusercontent.com/u/1911435?v=4" width="110px;"/><br /><sub>Adam</sub>](http://www.aboutcher.co.uk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=adamboutcher "Code") |
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!

From 7360e15d4e676e79173aa443f68b9989846d60e3 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 24 Nov 2021 20:04:05 -0800
Subject: [PATCH 15/39] Add @sneak-it as a contributor

---
 .all-contributorsrc | 9 +++++++++
 README.md           | 3 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/.all-contributorsrc b/.all-contributorsrc
index 7e2d0b032a..1a91f48ec5 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -2486,6 +2486,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "sneak-it",
+      "name": "Ian",
+      "avatar_url": "https://avatars.githubusercontent.com/u/16104273?v=4",
+      "profile": "https://snksrv.com",
+      "contributions": [
+        "code"
+      ]
     }
   ]
 }
diff --git a/README.md b/README.md
index af52494b43..0c722a025d 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 ![Build Status](https://app.chipperci.com/projects/0e5f8979-31eb-4ee6-9abf-050b76ab0383/status/master) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/snipe-it/localized.svg)](https://crowdin.com/project/snipe-it) [![Docker Pulls](https://img.shields.io/docker/pulls/snipe/snipe-it.svg)](https://hub.docker.com/r/snipe/snipe-it/) [![Twitter Follow](https://img.shields.io/twitter/follow/snipeitapp.svg?style=social)](https://twitter.com/snipeitapp)  [![Codacy Badge](https://api.codacy.com/project/badge/Grade/553ce52037fc43ea99149785afcfe641)](https://www.codacy.com/app/snipe/snipe-it?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=snipe/snipe-it&amp;utm_campaign=Badge_Grade)
-[![All Contributors](https://img.shields.io/badge/all_contributors-273-orange.svg?style=flat-square)](#contributors) [![Discord](https://badgen.net/badge/icon/discord?icon=discord&label)](https://discord.gg/yZFtShAcKk) [![huntr](https://cdn.huntr.dev/huntr_security_badge_mono.svg)](https://huntr.dev)
+[![All Contributors](https://img.shields.io/badge/all_contributors-274-orange.svg?style=flat-square)](#contributors) [![Discord](https://badgen.net/badge/icon/discord?icon=discord&label)](https://discord.gg/yZFtShAcKk) [![huntr](https://cdn.huntr.dev/huntr_security_badge_mono.svg)](https://huntr.dev)
 
 ## Snipe-IT - Open Source Asset Management System
 
@@ -130,6 +130,7 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken
 | [<img src="https://avatars.githubusercontent.com/u/11823649?v=4" width="110px;"/><br /><sub>Renee Margaret McConahy</sub>](https://github.com/nepella)<br />[💻](https://github.com/snipe/snipe-it/commits?author=nepella "Code") | [<img src="https://avatars.githubusercontent.com/u/5553884?v=4" width="110px;"/><br /><sub>JohnnyPicnic</sub>](https://github.com/JohnnyPicnic)<br />[💻](https://github.com/snipe/snipe-it/commits?author=JohnnyPicnic "Code") | [<img src="https://avatars.githubusercontent.com/u/8799594?v=4" width="110px;"/><br /><sub>markbrule</sub>](https://github.com/markbrule)<br />[💻](https://github.com/snipe/snipe-it/commits?author=markbrule "Code") | [<img src="https://avatars.githubusercontent.com/u/1962801?v=4" width="110px;"/><br /><sub>Mike Campbell</sub>](https://github.com/mikecmpbll)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mikecmpbll "Code") | [<img src="https://avatars.githubusercontent.com/u/11973217?v=4" width="110px;"/><br /><sub>tbrconnect</sub>](https://github.com/tbrconnect)<br />[💻](https://github.com/snipe/snipe-it/commits?author=tbrconnect "Code") | [<img src="https://avatars.githubusercontent.com/u/12447225?v=4" width="110px;"/><br /><sub>kcoyo</sub>](https://github.com/kcoyo)<br />[💻](https://github.com/snipe/snipe-it/commits?author=kcoyo "Code") | [<img src="https://avatars.githubusercontent.com/u/494017?v=4" width="110px;"/><br /><sub>Travis Miller</sub>](https://travismiller.com/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=travismiller "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/8735148?v=4" width="110px;"/><br /><sub>Petri Asikainen</sub>](https://github.com/PetriAsi)<br />[💻](https://github.com/snipe/snipe-it/commits?author=PetriAsi "Code") | [<img src="https://avatars.githubusercontent.com/u/11424540?v=4" width="110px;"/><br /><sub>derdeagle</sub>](https://github.com/derdeagle)<br />[💻](https://github.com/snipe/snipe-it/commits?author=derdeagle "Code") | [<img src="https://avatars.githubusercontent.com/u/176950?v=4" width="110px;"/><br /><sub>Mike Frysinger</sub>](https://wh0rd.org/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=vapier "Code") | [<img src="https://avatars.githubusercontent.com/u/22044358?v=4" width="110px;"/><br /><sub>ALPHA</sub>](https://github.com/AL4AL)<br />[💻](https://github.com/snipe/snipe-it/commits?author=AL4AL "Code") | [<img src="https://avatars.githubusercontent.com/u/1042587?v=4" width="110px;"/><br /><sub>FliegenKLATSCH</sub>](https://www.ifern.de)<br />[💻](https://github.com/snipe/snipe-it/commits?author=FliegenKLATSCH "Code") | [<img src="https://avatars.githubusercontent.com/u/442138?v=4" width="110px;"/><br /><sub>Jeremy Price</sub>](https://github.com/jerm)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jerm "Code") | [<img src="https://avatars.githubusercontent.com/u/84392209?v=4" width="110px;"/><br /><sub>Toreg87</sub>](https://github.com/Toreg87)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Toreg87 "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/67638596?v=4" width="110px;"/><br /><sub>Matthew Nickson</sub>](https://github.com/Computroniks)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Computroniks "Code") | [<img src="https://avatars.githubusercontent.com/u/1646397?v=4" width="110px;"/><br /><sub>Jethro Nederhof</sub>](https://jethron.id.au)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jethron "Code") | [<img src="https://avatars.githubusercontent.com/u/23289826?v=4" width="110px;"/><br /><sub>Oskar Stenberg</sub>](https://github.com/01ste02)<br />[💻](https://github.com/snipe/snipe-it/commits?author=01ste02 "Code") | [<img src="https://avatars.githubusercontent.com/u/82208283?v=4" width="110px;"/><br /><sub>Robert-Azelis</sub>](https://github.com/Robert-Azelis)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Robert-Azelis "Code") | [<img src="https://avatars.githubusercontent.com/u/60648387?v=4" width="110px;"/><br /><sub>Alexander William Smith</sub>](https://github.com/alwism)<br />[💻](https://github.com/snipe/snipe-it/commits?author=alwism "Code") | [<img src="https://avatars.githubusercontent.com/u/24418301?v=4" width="110px;"/><br /><sub>LEITWERK AG</sub>](https://www.leitwerk.de/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=leitwerk-ag "Code") | [<img src="https://avatars.githubusercontent.com/u/1911435?v=4" width="110px;"/><br /><sub>Adam</sub>](http://www.aboutcher.co.uk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=adamboutcher "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/16104273?v=4" width="110px;"/><br /><sub>Ian</sub>](https://snksrv.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sneak-it "Code") |
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!

From a5793531988d4078389eb50a8e43573dc62297ae Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 24 Nov 2021 20:04:26 -0800
Subject: [PATCH 16/39] Add @bestlong as a contributor

---
 .all-contributorsrc | 9 +++++++++
 README.md           | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.all-contributorsrc b/.all-contributorsrc
index 1a91f48ec5..55c509641f 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -2495,6 +2495,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "bestlong",
+      "name": "Shao Yu-Lung (Allen)",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4023909?v=4",
+      "profile": "http://blog.bestlong.idv.tw/",
+      "contributions": [
+        "code"
+      ]
     }
   ]
 }
diff --git a/README.md b/README.md
index 0c722a025d..c9f64e1030 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 ![Build Status](https://app.chipperci.com/projects/0e5f8979-31eb-4ee6-9abf-050b76ab0383/status/master) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/snipe-it/localized.svg)](https://crowdin.com/project/snipe-it) [![Docker Pulls](https://img.shields.io/docker/pulls/snipe/snipe-it.svg)](https://hub.docker.com/r/snipe/snipe-it/) [![Twitter Follow](https://img.shields.io/twitter/follow/snipeitapp.svg?style=social)](https://twitter.com/snipeitapp)  [![Codacy Badge](https://api.codacy.com/project/badge/Grade/553ce52037fc43ea99149785afcfe641)](https://www.codacy.com/app/snipe/snipe-it?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=snipe/snipe-it&amp;utm_campaign=Badge_Grade)
-[![All Contributors](https://img.shields.io/badge/all_contributors-274-orange.svg?style=flat-square)](#contributors) [![Discord](https://badgen.net/badge/icon/discord?icon=discord&label)](https://discord.gg/yZFtShAcKk) [![huntr](https://cdn.huntr.dev/huntr_security_badge_mono.svg)](https://huntr.dev)
+[![All Contributors](https://img.shields.io/badge/all_contributors-275-orange.svg?style=flat-square)](#contributors) [![Discord](https://badgen.net/badge/icon/discord?icon=discord&label)](https://discord.gg/yZFtShAcKk) [![huntr](https://cdn.huntr.dev/huntr_security_badge_mono.svg)](https://huntr.dev)
 
 ## Snipe-IT - Open Source Asset Management System
 
@@ -130,7 +130,7 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken
 | [<img src="https://avatars.githubusercontent.com/u/11823649?v=4" width="110px;"/><br /><sub>Renee Margaret McConahy</sub>](https://github.com/nepella)<br />[💻](https://github.com/snipe/snipe-it/commits?author=nepella "Code") | [<img src="https://avatars.githubusercontent.com/u/5553884?v=4" width="110px;"/><br /><sub>JohnnyPicnic</sub>](https://github.com/JohnnyPicnic)<br />[💻](https://github.com/snipe/snipe-it/commits?author=JohnnyPicnic "Code") | [<img src="https://avatars.githubusercontent.com/u/8799594?v=4" width="110px;"/><br /><sub>markbrule</sub>](https://github.com/markbrule)<br />[💻](https://github.com/snipe/snipe-it/commits?author=markbrule "Code") | [<img src="https://avatars.githubusercontent.com/u/1962801?v=4" width="110px;"/><br /><sub>Mike Campbell</sub>](https://github.com/mikecmpbll)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mikecmpbll "Code") | [<img src="https://avatars.githubusercontent.com/u/11973217?v=4" width="110px;"/><br /><sub>tbrconnect</sub>](https://github.com/tbrconnect)<br />[💻](https://github.com/snipe/snipe-it/commits?author=tbrconnect "Code") | [<img src="https://avatars.githubusercontent.com/u/12447225?v=4" width="110px;"/><br /><sub>kcoyo</sub>](https://github.com/kcoyo)<br />[💻](https://github.com/snipe/snipe-it/commits?author=kcoyo "Code") | [<img src="https://avatars.githubusercontent.com/u/494017?v=4" width="110px;"/><br /><sub>Travis Miller</sub>](https://travismiller.com/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=travismiller "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/8735148?v=4" width="110px;"/><br /><sub>Petri Asikainen</sub>](https://github.com/PetriAsi)<br />[💻](https://github.com/snipe/snipe-it/commits?author=PetriAsi "Code") | [<img src="https://avatars.githubusercontent.com/u/11424540?v=4" width="110px;"/><br /><sub>derdeagle</sub>](https://github.com/derdeagle)<br />[💻](https://github.com/snipe/snipe-it/commits?author=derdeagle "Code") | [<img src="https://avatars.githubusercontent.com/u/176950?v=4" width="110px;"/><br /><sub>Mike Frysinger</sub>](https://wh0rd.org/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=vapier "Code") | [<img src="https://avatars.githubusercontent.com/u/22044358?v=4" width="110px;"/><br /><sub>ALPHA</sub>](https://github.com/AL4AL)<br />[💻](https://github.com/snipe/snipe-it/commits?author=AL4AL "Code") | [<img src="https://avatars.githubusercontent.com/u/1042587?v=4" width="110px;"/><br /><sub>FliegenKLATSCH</sub>](https://www.ifern.de)<br />[💻](https://github.com/snipe/snipe-it/commits?author=FliegenKLATSCH "Code") | [<img src="https://avatars.githubusercontent.com/u/442138?v=4" width="110px;"/><br /><sub>Jeremy Price</sub>](https://github.com/jerm)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jerm "Code") | [<img src="https://avatars.githubusercontent.com/u/84392209?v=4" width="110px;"/><br /><sub>Toreg87</sub>](https://github.com/Toreg87)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Toreg87 "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/67638596?v=4" width="110px;"/><br /><sub>Matthew Nickson</sub>](https://github.com/Computroniks)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Computroniks "Code") | [<img src="https://avatars.githubusercontent.com/u/1646397?v=4" width="110px;"/><br /><sub>Jethro Nederhof</sub>](https://jethron.id.au)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jethron "Code") | [<img src="https://avatars.githubusercontent.com/u/23289826?v=4" width="110px;"/><br /><sub>Oskar Stenberg</sub>](https://github.com/01ste02)<br />[💻](https://github.com/snipe/snipe-it/commits?author=01ste02 "Code") | [<img src="https://avatars.githubusercontent.com/u/82208283?v=4" width="110px;"/><br /><sub>Robert-Azelis</sub>](https://github.com/Robert-Azelis)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Robert-Azelis "Code") | [<img src="https://avatars.githubusercontent.com/u/60648387?v=4" width="110px;"/><br /><sub>Alexander William Smith</sub>](https://github.com/alwism)<br />[💻](https://github.com/snipe/snipe-it/commits?author=alwism "Code") | [<img src="https://avatars.githubusercontent.com/u/24418301?v=4" width="110px;"/><br /><sub>LEITWERK AG</sub>](https://www.leitwerk.de/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=leitwerk-ag "Code") | [<img src="https://avatars.githubusercontent.com/u/1911435?v=4" width="110px;"/><br /><sub>Adam</sub>](http://www.aboutcher.co.uk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=adamboutcher "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/16104273?v=4" width="110px;"/><br /><sub>Ian</sub>](https://snksrv.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sneak-it "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/16104273?v=4" width="110px;"/><br /><sub>Ian</sub>](https://snksrv.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sneak-it "Code") | [<img src="https://avatars.githubusercontent.com/u/4023909?v=4" width="110px;"/><br /><sub>Shao Yu-Lung (Allen)</sub>](http://blog.bestlong.idv.tw/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=bestlong "Code") |
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!

From 80d36cd72bda8adfa985b19617e62e0cc55ae52c Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 8 Dec 2021 15:53:05 -0800
Subject: [PATCH 17/39] Added slack settings request

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Requests/SlackSettingsRequest.php | 36 ++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 app/Http/Requests/SlackSettingsRequest.php

diff --git a/app/Http/Requests/SlackSettingsRequest.php b/app/Http/Requests/SlackSettingsRequest.php
new file mode 100644
index 0000000000..d838fde462
--- /dev/null
+++ b/app/Http/Requests/SlackSettingsRequest.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Http\Requests;
+
+class SlackSettingsRequest extends Request
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'slack_endpoint' => 'url|required_with:slack_channel|starts_with:https://hooks.slack.com|nullable',
+            'slack_channel'                       => 'required_with:slack_endpoint|starts_with:#|nullable',
+            'slack_botname'                       => 'string|nullable',
+
+        ];
+    }
+
+    public function response(array $errors)
+    {
+        return $this->redirector->back()->withInput()->withErrors($errors, $this->errorBag);
+    }
+}

From cde2bad297557c670658d7110f7d77438944b684 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 8 Dec 2021 15:56:05 -0800
Subject: [PATCH 18/39] Small mods to slack jquery

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/settings/slack.blade.php | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/resources/views/settings/slack.blade.php b/resources/views/settings/slack.blade.php
index ff488ea3f5..22da6f1de5 100644
--- a/resources/views/settings/slack.blade.php
+++ b/resources/views/settings/slack.blade.php
@@ -158,7 +158,6 @@
 
         $('input:text').keyup(fieldcheck); // if *any* text field changes, we recalculate button states
 
-
         $("#slacktest").click(function() {
 
             $("#slacktestrow").removeClass('text-success');
@@ -167,10 +166,12 @@
             $("#slackteststatus").html('');
             $("#slacktesticon").html('<i class="fa fa-spinner spin"></i> Sending Slack test message...');
             $.ajax({
+            
                 url: '{{ route('api.settings.slacktest') }}',
                 type: 'POST',
                 headers: {
                     "X-Requested-With": 'XMLHttpRequest',
+                    "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content'),
                     "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content')
                 },
                 data: {
@@ -182,19 +183,24 @@
 
                 dataType: 'json',
 
+                accepts: {
+                    text: "application/json"
+                },
+
                 success: function (data) {
                     $('#save_slack').removeAttr('disabled');
                     $("#slacktesticon").html('');
                     $("#slacktestrow").addClass('text-success');
                     $("#slackteststatus").addClass('text-success');
-                    $("#slackteststatus").html('<i class="fa fa-check text-success"></i> Success! Check the ' + $('#slack_channel').val() + ' channel for your test message, and be sure to click SAVE below to store your settings.');
+                    $("#slackteststatus").html('<i class="fa fa-check text-success"></i> Success! Check the ' + $('#slack_channel').val() + ' channel for your test message, and be sure to click SAVE below to store your settings.'); 
                 },
 
                 error: function (data) {
 
 
                     if (data.responseJSON) {
-                        var errors = data.responseJSON.message;
+                        var errors = data.responseJSON.errors;
+                        var error_msg = data.responseJSON.message;
                     } else {
                         var errors;
                     }
@@ -204,15 +210,15 @@
                     $('#save_slack').attr("disabled", true);
                     $("#slacktesticon").html('');
                     $("#slackteststatus").addClass('text-danger');
-                    $("#slacktesticon").html('<i class="fa fa-exclamation-triangle text-danger"></i>');
+                    $("#slacktesticon").html('<i class="fa fa-exclamation-triangle text-danger"></i><span class="text-danger">' + error_msg+ '</span>');
 
                     if (data.status == 500) {
                         $('#slackteststatus').html('500 Server Error');
-                    } else if (data.status == 400) {
+                    } else if ((data.status == 400) || (data.status == 422)) {
 
                         if (typeof errors != 'string') {
 
-                            for (i = 0; i < errors.length; i++) {
+                            for (i in errors) {
                                 if (errors[i]) {
                                     error_text += '<li>Error: ' + errors[i];
                                 }

From 8c1cd87831a7fdbf91ce86d1225c7e383fd8eedc Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 8 Dec 2021 15:56:22 -0800
Subject: [PATCH 19/39] Added slacksettingsrequest as use statement

Signed-off-by: snipe <snipe@snipe.net>
---
 .../Controllers/Api/SettingsController.php    | 76 ++++++++++++++-----
 1 file changed, 56 insertions(+), 20 deletions(-)

diff --git a/app/Http/Controllers/Api/SettingsController.php b/app/Http/Controllers/Api/SettingsController.php
index 462c685361..0980b297c6 100644
--- a/app/Http/Controllers/Api/SettingsController.php
+++ b/app/Http/Controllers/Api/SettingsController.php
@@ -17,6 +17,7 @@ use GuzzleHttp\Client;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\Validator;
 use App\Models\Ldap; // forward-port of v4 LDAP model for Sync
+use App\Http\Requests\SlackSettingsRequest;
 
 
 class SettingsController extends Controller
@@ -162,34 +163,69 @@ class SettingsController extends Controller
 
     }
 
-    public function slacktest(Request $request)
+    public function slacktest(SlackSettingsRequest $request)
     {
 
-        $slack = new Client([
-            'base_url' => e($request->input('slack_endpoint')),
-            'defaults' => [
-                'exceptions' => false
-            ]
-        ]);
+        \Log::error(strncmp($request->input('slack_endpoint'), 'https://hooks.slack.com/', 24));
+        \Log::error('Endpoint: '.$request->input('slack_endpoint'));
+        \Log::error('Request: '.print_r($request->all(), true));
+        \Log::error('Rules: '.print_r(Setting::rules(), true));
+
+       
+
+        // if (($request->filled('slack_endpoint')) && ((strncmp($request->input('slack_endpoint'), "https://hooks.slack.com/", 24) !== 0))) {
+        //     return response()->json(['message' => 'Oops! Please check the endpoint URL. Slack endpoints should start with https://hooks.slack.com. Your current endpoint is '.$request->input('slack_endpoint'), ['errors' => 'Invalid slack endpoint.']], 422);
+            
+        // } 
+
+        // if (($request->filled('slack_channel')) && (strpos($request->input('slack_channel'), '#') !== 0)) {
+        //     return response()->json(['message' => 'Oops! Please check the channel name. Slack channels should begin with #.', ['errors' => 'Invalid slack endpoint.']], 422);
+        // } 
 
 
-        $payload = json_encode(
-            [
-                'channel'    => e($request->input('slack_channel')),
-                'text'       => trans('general.slack_test_msg'),
-                'username'    => e($request->input('slack_botname')),
-                'icon_emoji' => ':heart:'
+        // if (!$validator = Validator::make($request->all(), [
+        //     'slack_endpoint'   => 'url"',
+        //     'slack_channel'   => 'required_with:slack_endpoint|starts_with:#|nullable',
+        // ])) {
+
+            \Log::error('Fails validation with '.$request->input('slack_endpoint'));
+            
+
+        // Only attempt the slack request if the validation passes
+        // if (!$request->validate([
+        //     'slack_endpoint'   => 'url|required_with:slack_channel|starts_with:https://hooks.slack.com|nullable',
+        //     'slack_channel'   => 'required_with:slack_endpoint|starts_with:#|nullable',
+        // ])) {
+        //   return response()->json(['message' => $validator->errors()], 422);
+        //} else {
+
+            \Log::error('Passes validation with '.$request->input('slack_endpoint'));
+
+            $slack = new Client([
+                'base_url' => e($request->input('slack_endpoint')),
+                'defaults' => [
+                    'exceptions' => false,
+                ],
             ]);
 
-        try {
-            $slack->post($request->input('slack_endpoint'),['body' => $payload]);
-            return response()->json(['message' => 'Success'], 200);
-        } catch (\Exception $e) {
-            return response()->json(['message' => 'Oops! Please check the channel name and webhook endpoint URL. Slack responded with: '.$e->getMessage()], 400);
-        }
+            $payload = json_encode(
+                [
+                    'channel'    => e($request->input('slack_channel')),
+                    'text'       => trans('general.slack_test_msg'),
+                    'username'    => e($request->input('slack_botname')),
+                    'icon_emoji' => ':heart:',
+                ]);
 
+            try {
+                $slack->post($request->input('slack_endpoint'), ['body' => $payload]);
+                return response()->json(['message' => 'Success'], 200);
+
+            } catch (\Exception $e) {
+                return response()->json(['message' => 'Oops! Please check the channel name and webhook endpoint URL. Slack responded with: '.$e->getMessage()], 400);
+            }
+        
+        //} 
         return response()->json(['message' => 'Something went wrong :( '], 400);
-
     }
 
 

From 8fa690b63527891eda764f9362949a7bc0d2d8eb Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 8 Dec 2021 17:54:15 -0800
Subject: [PATCH 20/39] Reverting form request because it doesn't seem to work
 (????!!)

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Controllers/SettingsController.php | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
index 090883b502..76dfd21fef 100755
--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -22,6 +22,7 @@ use Input;
 use Redirect;
 use Response;
 use App\Helpers\StorageHelper;
+use App\Http\Requests\SlackSettingsRequest;
 
 /**
  * This controller handles all actions related to Settings for
@@ -667,25 +668,12 @@ class SettingsController extends Controller
      *
      * @return View
      */
-    public function postSlack(Request $request)
+    public function postSlack(SlackSettingsRequest $request)
     {
         if (is_null($setting = Setting::getSettings())) {
             return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error'));
         }
 
-        $validatedData = $request->validate([
-            'slack_channel'   => 'regex:/(?<!\w)#\w+/|required_with:slack_endpoint|nullable',
-        ]);
-
-
-        if ($validatedData) {
-
-            $setting->slack_endpoint = $request->input('slack_endpoint');
-            $setting->slack_channel = $request->input('slack_channel');
-            $setting->slack_botname = $request->input('slack_botname');
-
-        }
-
         if ($setting->save()) {
             return redirect()->route('settings.index')
                 ->with('success', trans('admin/settings/message.update.success'));

From 81b66d003973e67d53d316a065ad9770dcb39d50 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 8 Dec 2021 17:54:35 -0800
Subject: [PATCH 21/39] Change validation failure to 422 to make it consistent
 with Laravel's default

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Exceptions/Handler.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index de890d3e4d..7fd552f57d 100644
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -121,6 +121,6 @@ class Handler extends ExceptionHandler
      */
     protected function invalidJson($request, ValidationException $exception)
     {
-        return response()->json(Helper::formatStandardApiResponse('error', null, $exception->errors(), 400));
+        return response()->json(Helper::formatStandardApiResponse('error', null, $exception->errors(), 422));
     }
 }

From ff97b359ad5e36c6c081f8a64df46ffa43f7606b Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 8 Dec 2021 17:58:46 -0800
Subject: [PATCH 22/39] Removed form request on ajax, cleaned up some other
 things

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Controllers/Api/SettingsController.php | 16 +++++++++++++---
 app/Http/Requests/SlackSettingsRequest.php      |  7 ++-----
 app/Models/Setting.php                          |  3 ---
 resources/lang/en/validation.php                |  1 +
 resources/views/settings/slack.blade.php        | 13 +++++++++++--
 5 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/app/Http/Controllers/Api/SettingsController.php b/app/Http/Controllers/Api/SettingsController.php
index 0980b297c6..5f2d57ffd4 100644
--- a/app/Http/Controllers/Api/SettingsController.php
+++ b/app/Http/Controllers/Api/SettingsController.php
@@ -163,16 +163,26 @@ class SettingsController extends Controller
 
     }
 
-    public function slacktest(SlackSettingsRequest $request)
+    public function slacktest(Request $request)
     {
 
         \Log::error(strncmp($request->input('slack_endpoint'), 'https://hooks.slack.com/', 24));
         \Log::error('Endpoint: '.$request->input('slack_endpoint'));
         \Log::error('Request: '.print_r($request->all(), true));
-        \Log::error('Rules: '.print_r(Setting::rules(), true));
+        // \Log::error('Rules: '.print_r(Setting::rules(), true));
 
        
 
+        $validator = Validator::make($request->all(), [
+            'slack_endpoint'                      => 'url|required_with:slack_channel|starts_with:https://hooks.slack.com|nullable',
+            'slack_channel'                       => 'required_with:slack_endpoint|starts_with:#|nullable',
+        ]);
+
+        if ($validator->fails()) {
+            return response()->json(['message' => 'Validation failed', 'errors' => $validator->errors()], 422);
+        }
+
+
         // if (($request->filled('slack_endpoint')) && ((strncmp($request->input('slack_endpoint'), "https://hooks.slack.com/", 24) !== 0))) {
         //     return response()->json(['message' => 'Oops! Please check the endpoint URL. Slack endpoints should start with https://hooks.slack.com. Your current endpoint is '.$request->input('slack_endpoint'), ['errors' => 'Invalid slack endpoint.']], 422);
             
@@ -221,7 +231,7 @@ class SettingsController extends Controller
                 return response()->json(['message' => 'Success'], 200);
 
             } catch (\Exception $e) {
-                return response()->json(['message' => 'Oops! Please check the channel name and webhook endpoint URL. Slack responded with: '.$e->getMessage()], 400);
+                return response()->json(['message' => 'FARTS! Please check the channel name and webhook endpoint URL ('.$request->input('slack_endpoint').'). Slack responded with: '.$e->getMessage()], 400);
             }
         
         //} 
diff --git a/app/Http/Requests/SlackSettingsRequest.php b/app/Http/Requests/SlackSettingsRequest.php
index d838fde462..1f44215198 100644
--- a/app/Http/Requests/SlackSettingsRequest.php
+++ b/app/Http/Requests/SlackSettingsRequest.php
@@ -22,15 +22,12 @@ class SlackSettingsRequest extends Request
     public function rules()
     {
         return [
-            'slack_endpoint' => 'url|required_with:slack_channel|starts_with:https://hooks.slack.com|nullable',
+            'slack_endpoint'                      => 'url|required_with:slack_channel|starts_with:"https://hooks.slack.com"|nullable',
             'slack_channel'                       => 'required_with:slack_endpoint|starts_with:#|nullable',
             'slack_botname'                       => 'string|nullable',
 
         ];
     }
 
-    public function response(array $errors)
-    {
-        return $this->redirector->back()->withInput()->withErrors($errors, $this->errorBag);
-    }
+
 }
diff --git a/app/Models/Setting.php b/app/Models/Setting.php
index 13d7b38bc1..447071e2a9 100755
--- a/app/Models/Setting.php
+++ b/app/Models/Setting.php
@@ -52,10 +52,7 @@ class Setting extends Model
           'admin_cc_email'                      => 'email|nullable',
           'default_currency'                    => 'required',
           'locale'                              => 'required',
-          'slack_endpoint'                      => 'url|required_with:slack_channel|nullable',
           'labels_per_page'                     => 'numeric',
-          'slack_channel'                       => 'regex:/^[\#\@]?\w+/|required_with:slack_endpoint|nullable',
-          'slack_botname'                       => 'string|nullable',
           'labels_width'                        => 'numeric',
           'labels_height'                       => 'numeric',
           'labels_pmargin_left'                 => 'numeric|nullable',
diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php
index 4ece7d41c7..801cfe4931 100644
--- a/resources/lang/en/validation.php
+++ b/resources/lang/en/validation.php
@@ -64,6 +64,7 @@ return array(
         'string'  => 'The :attribute must be at least :min characters.',
         'array'   => 'The :attribute must have at least :min items.',
     ],
+    'starts_with'          => 'The :attribute must start with one of the following: :values.',
     'not_in'               => 'The selected :attribute is invalid.',
     'numeric'              => 'The :attribute must be a number.',
     'present'              => 'The :attribute field must be present.',
diff --git a/resources/views/settings/slack.blade.php b/resources/views/settings/slack.blade.php
index 22da6f1de5..f7bd8b84b6 100644
--- a/resources/views/settings/slack.blade.php
+++ b/resources/views/settings/slack.blade.php
@@ -165,14 +165,23 @@
             $("#slackteststatus").removeClass('text-danger');
             $("#slackteststatus").html('');
             $("#slacktesticon").html('<i class="fa fa-spinner spin"></i> Sending Slack test message...');
-            $.ajax({
+            $.ajax(
+                {
+                // If I comment this back in, I always get a success (200) message
+                // Without it, I get 
+                    //  beforeSend: function (xhr) { 
+                    //  xhr.setRequestHeader("Content-Type","application/json");
+                    // xhr.setRequestHeader("Accept","text/json");
+                    // },
             
+                
                 url: '{{ route('api.settings.slacktest') }}',
                 type: 'POST',
                 headers: {
                     "X-Requested-With": 'XMLHttpRequest',
                     "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content'),
-                    "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content')
+                //    'Accept': 'application/json',
+                //    'Content-Type': 'application/json',
                 },
                 data: {
                     'slack_endpoint': $('#slack_endpoint').val(),

From 86afe6c4b1f378e7f234dcb74c169fa9347d17c0 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 8 Dec 2021 18:03:56 -0800
Subject: [PATCH 23/39] Cleanup slack validation

Signed-off-by: snipe <snipe@snipe.net>
---
 .../Controllers/Api/SettingsController.php    | 39 +------------------
 1 file changed, 2 insertions(+), 37 deletions(-)

diff --git a/app/Http/Controllers/Api/SettingsController.php b/app/Http/Controllers/Api/SettingsController.php
index 5f2d57ffd4..5e4a84ea4b 100644
--- a/app/Http/Controllers/Api/SettingsController.php
+++ b/app/Http/Controllers/Api/SettingsController.php
@@ -166,15 +166,8 @@ class SettingsController extends Controller
     public function slacktest(Request $request)
     {
 
-        \Log::error(strncmp($request->input('slack_endpoint'), 'https://hooks.slack.com/', 24));
-        \Log::error('Endpoint: '.$request->input('slack_endpoint'));
-        \Log::error('Request: '.print_r($request->all(), true));
-        // \Log::error('Rules: '.print_r(Setting::rules(), true));
-
-       
-
         $validator = Validator::make($request->all(), [
-            'slack_endpoint'                      => 'url|required_with:slack_channel|starts_with:https://hooks.slack.com|nullable',
+            'slack_endpoint'                      => 'url|required_with:slack_channel|starts_with:https://hooks.slack.com/|nullable',
             'slack_channel'                       => 'required_with:slack_endpoint|starts_with:#|nullable',
         ]);
 
@@ -182,35 +175,7 @@ class SettingsController extends Controller
             return response()->json(['message' => 'Validation failed', 'errors' => $validator->errors()], 422);
         }
 
-
-        // if (($request->filled('slack_endpoint')) && ((strncmp($request->input('slack_endpoint'), "https://hooks.slack.com/", 24) !== 0))) {
-        //     return response()->json(['message' => 'Oops! Please check the endpoint URL. Slack endpoints should start with https://hooks.slack.com. Your current endpoint is '.$request->input('slack_endpoint'), ['errors' => 'Invalid slack endpoint.']], 422);
-            
-        // } 
-
-        // if (($request->filled('slack_channel')) && (strpos($request->input('slack_channel'), '#') !== 0)) {
-        //     return response()->json(['message' => 'Oops! Please check the channel name. Slack channels should begin with #.', ['errors' => 'Invalid slack endpoint.']], 422);
-        // } 
-
-
-        // if (!$validator = Validator::make($request->all(), [
-        //     'slack_endpoint'   => 'url"',
-        //     'slack_channel'   => 'required_with:slack_endpoint|starts_with:#|nullable',
-        // ])) {
-
-            \Log::error('Fails validation with '.$request->input('slack_endpoint'));
-            
-
-        // Only attempt the slack request if the validation passes
-        // if (!$request->validate([
-        //     'slack_endpoint'   => 'url|required_with:slack_channel|starts_with:https://hooks.slack.com|nullable',
-        //     'slack_channel'   => 'required_with:slack_endpoint|starts_with:#|nullable',
-        // ])) {
-        //   return response()->json(['message' => $validator->errors()], 422);
-        //} else {
-
-            \Log::error('Passes validation with '.$request->input('slack_endpoint'));
-
+        // If validation passes, continue to the curl request
             $slack = new Client([
                 'base_url' => e($request->input('slack_endpoint')),
                 'defaults' => [

From 918e7c8dae4d41935f534901a582ea8488bbf603 Mon Sep 17 00:00:00 2001
From: Haxatron <76475453+Haxatron@users.noreply.github.com>
Date: Thu, 9 Dec 2021 12:57:04 +0800
Subject: [PATCH 24/39] Fix access control -
 https://huntr.dev/bounties/19453ef1-4d77-4cff-b7e8-1bc8f3af0862/

---
 app/Http/Controllers/AssetModelsController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Http/Controllers/AssetModelsController.php b/app/Http/Controllers/AssetModelsController.php
index 29914b40a2..05fd8257d0 100755
--- a/app/Http/Controllers/AssetModelsController.php
+++ b/app/Http/Controllers/AssetModelsController.php
@@ -269,6 +269,7 @@ class AssetModelsController extends Controller
     */
     public function getClone($modelId = null)
     {
+        $this->authorize('view', AssetModel::class);
         // Check if the model exists
         if (is_null($model_to_clone = AssetModel::find($modelId))) {
             return redirect()->route('models.index')->with('error', trans('admin/models/message.does_not_exist'));

From 1699c09758e56f740437674a8d6ba36443399f24 Mon Sep 17 00:00:00 2001
From: Haxatron <76475453+Haxatron@users.noreply.github.com>
Date: Thu, 9 Dec 2021 21:42:18 +0800
Subject: [PATCH 25/39] Update AssetModelsController.php

---
 app/Http/Controllers/AssetModelsController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/AssetModelsController.php b/app/Http/Controllers/AssetModelsController.php
index 05fd8257d0..8d57346079 100755
--- a/app/Http/Controllers/AssetModelsController.php
+++ b/app/Http/Controllers/AssetModelsController.php
@@ -269,7 +269,7 @@ class AssetModelsController extends Controller
     */
     public function getClone($modelId = null)
     {
-        $this->authorize('view', AssetModel::class);
+        $this->authorize('create', AssetModel::class);
         // Check if the model exists
         if (is_null($model_to_clone = AssetModel::find($modelId))) {
             return redirect()->route('models.index')->with('error', trans('admin/models/message.does_not_exist'));

From e1bf3b50f4c8f2d8625b2dfb2bd89d6671189e1d Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 10 Dec 2021 15:09:29 -0800
Subject: [PATCH 26/39] Added model number to accessory report

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/reports/accessories.blade.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resources/views/reports/accessories.blade.php b/resources/views/reports/accessories.blade.php
index c92cad71cc..49db62c7f6 100644
--- a/resources/views/reports/accessories.blade.php
+++ b/resources/views/reports/accessories.blade.php
@@ -36,6 +36,7 @@
                             <tr>
                                 <th class="col-sm-1">{{ trans('admin/companies/table.title') }}</th>
                                 <th class="col-sm-1">{{ trans('admin/accessories/table.title') }}</th>
+                                <th class="col-sm-1">{{ trans('general.model_no') }}</th>
                                 <th class="col-sm-1">{{ trans('admin/accessories/general.total') }}</th>
                                 <th class="col-sm-1">{{ trans('admin/accessories/general.remaining') }}</th>
                             </tr>
@@ -45,6 +46,7 @@
                                 <tr>
                                     <td>{{ is_null($accessory->company) ? '' : $accessory->company->name }}</td>
                                     <td>{{ $accessory->name }}</td>
+                                    <td>{{ $accessory->model_number }}</td>
                                     <td>{{ $accessory->qty }}</td>
                                     <td>{{ $accessory->numRemaining() }}</td>
                                 </tr>

From e20a10a6a178ac66b9345994bf2e3a07f6b7d014 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 10 Dec 2021 15:17:26 -0800
Subject: [PATCH 27/39] Add @Haxatron as a contributor

---
 .all-contributorsrc | 9 +++++++++
 README.md           | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.all-contributorsrc b/.all-contributorsrc
index 55c509641f..e30880abfe 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -2504,6 +2504,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "Haxatron",
+      "name": "Haxatron",
+      "avatar_url": "https://avatars.githubusercontent.com/u/76475453?v=4",
+      "profile": "https://github.com/Haxatron",
+      "contributions": [
+        "code"
+      ]
     }
   ]
 }
diff --git a/README.md b/README.md
index c9f64e1030..ae12b18599 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 ![Build Status](https://app.chipperci.com/projects/0e5f8979-31eb-4ee6-9abf-050b76ab0383/status/master) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/snipe-it/localized.svg)](https://crowdin.com/project/snipe-it) [![Docker Pulls](https://img.shields.io/docker/pulls/snipe/snipe-it.svg)](https://hub.docker.com/r/snipe/snipe-it/) [![Twitter Follow](https://img.shields.io/twitter/follow/snipeitapp.svg?style=social)](https://twitter.com/snipeitapp)  [![Codacy Badge](https://api.codacy.com/project/badge/Grade/553ce52037fc43ea99149785afcfe641)](https://www.codacy.com/app/snipe/snipe-it?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=snipe/snipe-it&amp;utm_campaign=Badge_Grade)
-[![All Contributors](https://img.shields.io/badge/all_contributors-275-orange.svg?style=flat-square)](#contributors) [![Discord](https://badgen.net/badge/icon/discord?icon=discord&label)](https://discord.gg/yZFtShAcKk) [![huntr](https://cdn.huntr.dev/huntr_security_badge_mono.svg)](https://huntr.dev)
+[![All Contributors](https://img.shields.io/badge/all_contributors-276-orange.svg?style=flat-square)](#contributors) [![Discord](https://badgen.net/badge/icon/discord?icon=discord&label)](https://discord.gg/yZFtShAcKk) [![huntr](https://cdn.huntr.dev/huntr_security_badge_mono.svg)](https://huntr.dev)
 
 ## Snipe-IT - Open Source Asset Management System
 
@@ -130,7 +130,7 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken
 | [<img src="https://avatars.githubusercontent.com/u/11823649?v=4" width="110px;"/><br /><sub>Renee Margaret McConahy</sub>](https://github.com/nepella)<br />[💻](https://github.com/snipe/snipe-it/commits?author=nepella "Code") | [<img src="https://avatars.githubusercontent.com/u/5553884?v=4" width="110px;"/><br /><sub>JohnnyPicnic</sub>](https://github.com/JohnnyPicnic)<br />[💻](https://github.com/snipe/snipe-it/commits?author=JohnnyPicnic "Code") | [<img src="https://avatars.githubusercontent.com/u/8799594?v=4" width="110px;"/><br /><sub>markbrule</sub>](https://github.com/markbrule)<br />[💻](https://github.com/snipe/snipe-it/commits?author=markbrule "Code") | [<img src="https://avatars.githubusercontent.com/u/1962801?v=4" width="110px;"/><br /><sub>Mike Campbell</sub>](https://github.com/mikecmpbll)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mikecmpbll "Code") | [<img src="https://avatars.githubusercontent.com/u/11973217?v=4" width="110px;"/><br /><sub>tbrconnect</sub>](https://github.com/tbrconnect)<br />[💻](https://github.com/snipe/snipe-it/commits?author=tbrconnect "Code") | [<img src="https://avatars.githubusercontent.com/u/12447225?v=4" width="110px;"/><br /><sub>kcoyo</sub>](https://github.com/kcoyo)<br />[💻](https://github.com/snipe/snipe-it/commits?author=kcoyo "Code") | [<img src="https://avatars.githubusercontent.com/u/494017?v=4" width="110px;"/><br /><sub>Travis Miller</sub>](https://travismiller.com/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=travismiller "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/8735148?v=4" width="110px;"/><br /><sub>Petri Asikainen</sub>](https://github.com/PetriAsi)<br />[💻](https://github.com/snipe/snipe-it/commits?author=PetriAsi "Code") | [<img src="https://avatars.githubusercontent.com/u/11424540?v=4" width="110px;"/><br /><sub>derdeagle</sub>](https://github.com/derdeagle)<br />[💻](https://github.com/snipe/snipe-it/commits?author=derdeagle "Code") | [<img src="https://avatars.githubusercontent.com/u/176950?v=4" width="110px;"/><br /><sub>Mike Frysinger</sub>](https://wh0rd.org/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=vapier "Code") | [<img src="https://avatars.githubusercontent.com/u/22044358?v=4" width="110px;"/><br /><sub>ALPHA</sub>](https://github.com/AL4AL)<br />[💻](https://github.com/snipe/snipe-it/commits?author=AL4AL "Code") | [<img src="https://avatars.githubusercontent.com/u/1042587?v=4" width="110px;"/><br /><sub>FliegenKLATSCH</sub>](https://www.ifern.de)<br />[💻](https://github.com/snipe/snipe-it/commits?author=FliegenKLATSCH "Code") | [<img src="https://avatars.githubusercontent.com/u/442138?v=4" width="110px;"/><br /><sub>Jeremy Price</sub>](https://github.com/jerm)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jerm "Code") | [<img src="https://avatars.githubusercontent.com/u/84392209?v=4" width="110px;"/><br /><sub>Toreg87</sub>](https://github.com/Toreg87)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Toreg87 "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/67638596?v=4" width="110px;"/><br /><sub>Matthew Nickson</sub>](https://github.com/Computroniks)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Computroniks "Code") | [<img src="https://avatars.githubusercontent.com/u/1646397?v=4" width="110px;"/><br /><sub>Jethro Nederhof</sub>](https://jethron.id.au)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jethron "Code") | [<img src="https://avatars.githubusercontent.com/u/23289826?v=4" width="110px;"/><br /><sub>Oskar Stenberg</sub>](https://github.com/01ste02)<br />[💻](https://github.com/snipe/snipe-it/commits?author=01ste02 "Code") | [<img src="https://avatars.githubusercontent.com/u/82208283?v=4" width="110px;"/><br /><sub>Robert-Azelis</sub>](https://github.com/Robert-Azelis)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Robert-Azelis "Code") | [<img src="https://avatars.githubusercontent.com/u/60648387?v=4" width="110px;"/><br /><sub>Alexander William Smith</sub>](https://github.com/alwism)<br />[💻](https://github.com/snipe/snipe-it/commits?author=alwism "Code") | [<img src="https://avatars.githubusercontent.com/u/24418301?v=4" width="110px;"/><br /><sub>LEITWERK AG</sub>](https://www.leitwerk.de/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=leitwerk-ag "Code") | [<img src="https://avatars.githubusercontent.com/u/1911435?v=4" width="110px;"/><br /><sub>Adam</sub>](http://www.aboutcher.co.uk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=adamboutcher "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/16104273?v=4" width="110px;"/><br /><sub>Ian</sub>](https://snksrv.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sneak-it "Code") | [<img src="https://avatars.githubusercontent.com/u/4023909?v=4" width="110px;"/><br /><sub>Shao Yu-Lung (Allen)</sub>](http://blog.bestlong.idv.tw/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=bestlong "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/16104273?v=4" width="110px;"/><br /><sub>Ian</sub>](https://snksrv.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sneak-it "Code") | [<img src="https://avatars.githubusercontent.com/u/4023909?v=4" width="110px;"/><br /><sub>Shao Yu-Lung (Allen)</sub>](http://blog.bestlong.idv.tw/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=bestlong "Code") | [<img src="https://avatars.githubusercontent.com/u/76475453?v=4" width="110px;"/><br /><sub>Haxatron</sub>](https://github.com/Haxatron)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Haxatron "Code") |
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!

From acfb41f1299799e3ed214014a403e5746bad7b54 Mon Sep 17 00:00:00 2001
From: Brady Wetherington <bwetherington@grokability.com>
Date: Fri, 10 Dec 2021 18:42:56 -0800
Subject: [PATCH 28/39] Remove 'actionlog' from the ::with() clause in the
 asset query API

---
 app/Http/Controllers/Api/AssetsController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php
index a9362188c1..3b37a2875c 100644
--- a/app/Http/Controllers/Api/AssetsController.php
+++ b/app/Http/Controllers/Api/AssetsController.php
@@ -115,8 +115,8 @@ class AssetsController extends Controller
         }
 
         $assets = Company::scopeCompanyables(Asset::select('assets.*'),"company_id","assets")
-            ->with('location', 'assetstatus', 'assetlog', 'company', 'defaultLoc','assignedTo',
-                'model.category', 'model.manufacturer', 'model.fieldset','supplier');
+            ->with('location', 'assetstatus', 'company', 'defaultLoc','assignedTo',
+                'model.category', 'model.manufacturer', 'model.fieldset','supplier'); //it might be tempting to add 'assetlog' here, but don't. It blows up update-heavy users.
 
         
         // These are used by the API to query against specific ID numbers.

From 39b0dc136cf4b1bf7b791848215b919c20aac2c7 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sat, 11 Dec 2021 10:14:35 -0800
Subject: [PATCH 29/39] Added LDAP strings back

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/lang/en/admin/settings/general.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resources/lang/en/admin/settings/general.php b/resources/lang/en/admin/settings/general.php
index 6a6acf7222..fb268f39f0 100644
--- a/resources/lang/en/admin/settings/general.php
+++ b/resources/lang/en/admin/settings/general.php
@@ -65,6 +65,8 @@ return array(
     'ldap_enabled'              => 'LDAP enabled',
     'ldap_integration'          => 'LDAP Integration',
     'ldap_settings'             => 'LDAP Settings',
+    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_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_server'               => 'LDAP Server',

From a419a690d4f12d8d3858414a46e46a0ebfda22fe Mon Sep 17 00:00:00 2001
From: Ivan Nieto Vivanco <inietov@gmail.com>
Date: Sat, 11 Dec 2021 18:01:38 -0600
Subject: [PATCH 30/39] Add a variable to better control the selected user's
 ids

---
 app/Http/Controllers/Users/BulkUsersController.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Users/BulkUsersController.php b/app/Http/Controllers/Users/BulkUsersController.php
index 7bda003802..b7ae6aac0e 100644
--- a/app/Http/Controllers/Users/BulkUsersController.php
+++ b/app/Http/Controllers/Users/BulkUsersController.php
@@ -34,7 +34,8 @@ class BulkUsersController extends Controller
         // Make sure there were users selected
         if (($request->filled('ids')) && (count($request->input('ids')) > 0)) {
             // Get the list of affected users
-            $users = User::whereIn('id', array_keys(request('ids')))
+            $user_raw_array = request('ids');
+            $users = User::whereIn('id', $user_raw_array)
                 ->with('groups', 'assets', 'licenses', 'accessories')->get();
 
             if ($request->input('bulk_actions') == 'edit') {

From a7760b331b10e082f24d9d49acde4d3150ef6baa Mon Sep 17 00:00:00 2001
From: Thomas Misilo <tmisilo@ksu.edu>
Date: Mon, 13 Dec 2021 10:33:32 -0600
Subject: [PATCH 31/39] Automatic Building of Docker Images and Pushing to
 DockerHub

This allows for building and pushing of the Snipe-IT docker images
directly from GitHub to DockerHub.

This will push a "latest" based on the master branch, a
"develop" based on the develop branch, and a v##.##.##
image based on any released version.

`DOCKER_USERNAME` and `DOCKER_ACCESS_TOKEN` do both need
to be added to the repository as secrets.
---
 .github/workflows/docker.yml | 82 ++++++++++++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 .github/workflows/docker.yml

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
new file mode 100644
index 0000000000..5df64f79f8
--- /dev/null
+++ b/.github/workflows/docker.yml
@@ -0,0 +1,82 @@
+# Snipe-IT Docker image build for hub.docker.com
+name: Docker images
+
+# Run this Build for all pushes to 'master' or develop branch, or tagged releases.
+# Also run for PRs to ensure PR doesn't break Docker build process
+on:
+  push:
+    branches:
+      - master
+      - develop
+    tags:
+      - 'v**'
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+  pull_request:
+
+jobs:
+  docker:
+    # Ensure this job never runs on forked repos. It's only executed for 'snipe/snipe-it'
+    if: github.repository == 'snipe/snipe-it'
+    runs-on: ubuntu-latest
+    env:
+      # Define tags to use for Docker images based on Git tags/branches (for docker/metadata-action)
+      # For a new commit on default branch (master), use the literal tag 'latest' on Docker image.
+      # For a new commit on other branches, use the branch name as the tag for Docker image.
+      # For a new tag, copy that tag name as the tag for Docker image.
+      IMAGE_TAGS: |
+        type=raw,value=latest,enable=${{ endsWith(github.ref, github.event.repository.default_branch) }}
+        type=ref,event=branch,enable=${{ !endsWith(github.ref, github.event.repository.default_branch) }}
+        type=ref,event=tag
+      # Define default tag "flavor" for docker/metadata-action per
+      # https://github.com/docker/metadata-action#flavor-input
+      # We turn off 'latest' tag by default.
+      TAGS_FLAVOR: |
+        latest=false
+
+    steps:
+      # https://github.com/actions/checkout
+      - name: Checkout codebase
+        uses: actions/checkout@v2
+
+      # https://github.com/docker/setup-buildx-action
+      - name: Setup Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      # https://github.com/docker/login-action
+      - name: Login to DockerHub
+        # Only login if not a PR, as PRs only trigger a Docker build and not a push
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
+
+      ###############################################
+      # Build/Push the 'snipe/snipe-it' image
+      ###############################################
+      # https://github.com/docker/metadata-action
+      # Get Metadata for docker_build step below
+      - name: Sync metadata (tags, labels) from GitHub to Docker for 'snipe-it' image
+        id: meta_build
+        uses: docker/metadata-action@v3
+        with:
+          images: snipe/snipe-it
+          tags: ${{ env.IMAGE_TAGS }}
+          flavor: ${{ env.TAGS_FLAVOR }}
+
+      # https://github.com/docker/build-push-action
+      - name: Build and push 'snipe-it' image
+        id: docker_build
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./Dockerfile
+          platforms: linux/amd64
+          # For pull requests, we run the Docker build (to ensure no PR changes break the build),
+          # but we ONLY do an image push to DockerHub if it's NOT a PR
+          push: ${{ github.event_name != 'pull_request' }}
+          # Use tags / labels provided by 'docker/metadata-action' above
+          tags: ${{ steps.meta_build.outputs.tags }}
+          labels: ${{ steps.meta_build.outputs.labels }}

From 5e58f60845ea0b23356f643ec4e86603c23f3ad7 Mon Sep 17 00:00:00 2001
From: Thomas Misilo <tmisilo@ksu.edu>
Date: Mon, 13 Dec 2021 10:17:17 -0600
Subject: [PATCH 32/39] Adds an automatic build for Alpine Linux based Image

This Fixes #10339, and allows for automatic building of the Alpine Linux
image, and push to docker-hub.

This will push a "latest-alpine" based on the master branch, a
"develop-alpine" based on the develop branch, and a v##.##.##-alpine
image based on any released version.

`DOCKER_USERNAME` and `DOCKER_ACCESS_TOKEN` do both need
to be added to the repository as secrets.
---
 .github/workflows/docker-alpine.yml | 82 +++++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 .github/workflows/docker-alpine.yml

diff --git a/.github/workflows/docker-alpine.yml b/.github/workflows/docker-alpine.yml
new file mode 100644
index 0000000000..d0acba6fd7
--- /dev/null
+++ b/.github/workflows/docker-alpine.yml
@@ -0,0 +1,82 @@
+# Snipe-IT (Alpine) Docker image build for hub.docker.com
+name: Docker images (Alpine)
+
+# Run this Build for all pushes to 'master' or develop branch, or tagged releases.
+# Also run for PRs to ensure PR doesn't break Docker build process
+on:
+  push:
+    branches:
+      - master
+      - develop
+    tags:
+      - 'v**'
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+  pull_request:
+
+jobs:
+  docker:
+    # Ensure this job never runs on forked repos. It's only executed for 'snipe/snipe-it'
+    if: github.repository == 'snipe/snipe-it'
+    runs-on: ubuntu-latest
+    env:
+      # Define tags to use for Docker images based on Git tags/branches (for docker/metadata-action)
+      # For a new commit on default branch (master), use the literal tag 'latest' on Docker image.
+      # For a new commit on other branches, use the branch name as the tag for Docker image.
+      # For a new tag, copy that tag name as the tag for Docker image.
+      IMAGE_TAGS: |
+        type=raw,value=latest,enable=${{ endsWith(github.ref, github.event.repository.default_branch) }},suffix=-alpine
+        type=ref,event=branch,enable=${{ !endsWith(github.ref, github.event.repository.default_branch) }},suffix=-alpine
+        type=ref,event=tag,suffix=-alpine
+      # Define default tag "flavor" for docker/metadata-action per
+      # https://github.com/docker/metadata-action#flavor-input
+      # We turn off 'latest' tag by default.
+      TAGS_FLAVOR: |
+        latest=false
+
+    steps:
+      # https://github.com/actions/checkout
+      - name: Checkout codebase
+        uses: actions/checkout@v2
+
+      # https://github.com/docker/setup-buildx-action
+      - name: Setup Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      # https://github.com/docker/login-action
+      - name: Login to DockerHub
+        # Only login if not a PR, as PRs only trigger a Docker build and not a push
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
+
+      ###############################################
+      # Build/Push the 'snipe/snipe-it' image
+      ###############################################
+      # https://github.com/docker/metadata-action
+      # Get Metadata for docker_build step below
+      - name: Sync metadata (tags, labels) from GitHub to Docker for 'snipe-it' image
+        id: meta_build
+        uses: docker/metadata-action@v3
+        with:
+          images: snipe/snipe-it
+          tags: ${{ env.IMAGE_TAGS }}
+          flavor: ${{ env.TAGS_FLAVOR }}
+
+      # https://github.com/docker/build-push-action
+      - name: Build and push 'snipe-it' image
+        id: docker_build
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./Dockerfile.alpine
+          platforms: linux/amd64
+          # For pull requests, we run the Docker build (to ensure no PR changes break the build),
+          # but we ONLY do an image push to DockerHub if it's NOT a PR
+          push: ${{ github.event_name != 'pull_request' }}
+          # Use tags / labels provided by 'docker/metadata-action' above
+          tags: ${{ steps.meta_build.outputs.tags }}
+          labels: ${{ steps.meta_build.outputs.labels }}

From e5f4048e9e55396a4bf9f4342b72c9e526cbfcca Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 13 Dec 2021 11:01:02 -0800
Subject: [PATCH 33/39] 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 3374c56e77..5a86cbbeba 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v5.3.3',
-  'full_app_version' => 'v5.3.3 - build 6517-g4afd598df',
-  'build_version' => '6517',
+  'app_version' => 'v5.3.4',
+  'full_app_version' => 'v5.3.4 - build 6550-g39b0dc136',
+  'build_version' => '6550',
   'prerelease_version' => '',
-  'hash_version' => 'g4afd598df',
-  'full_hash' => 'v5.3.3-8-g4afd598df',
+  'hash_version' => 'g39b0dc136',
+  'full_hash' => 'v5.3.4-17-g39b0dc136',
   'branch' => 'master',
 );
\ No newline at end of file

From 1854d7d668867ce5c13e71ac4f71888fdef951fb Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 13 Dec 2021 11:28:01 -0800
Subject: [PATCH 34/39] Updated language strings

Signed-off-by: snipe <snipe@snipe.net>
---
 .../lang/af/admin/categories/general.php      |  1 +
 resources/lang/af/admin/settings/general.php  |  3 +
 resources/lang/af/admin/users/message.php     |  1 +
 resources/lang/af/button.php                  |  1 +
 .../lang/am/admin/categories/general.php      |  1 +
 resources/lang/am/admin/settings/general.php  |  3 +
 resources/lang/am/admin/users/message.php     |  9 +-
 resources/lang/am/button.php                  |  1 +
 .../lang/ar/admin/categories/general.php      |  1 +
 .../lang/ar/admin/depreciations/general.php   |  2 +-
 resources/lang/ar/admin/hardware/general.php  |  4 +-
 resources/lang/ar/admin/models/general.php    |  2 +-
 resources/lang/ar/admin/settings/general.php  |  3 +
 resources/lang/ar/admin/users/message.php     |  1 +
 resources/lang/ar/button.php                  |  1 +
 resources/lang/ar/general.php                 |  2 +-
 .../lang/bg/admin/categories/general.php      |  1 +
 resources/lang/bg/admin/settings/general.php  |  3 +
 resources/lang/bg/admin/users/message.php     |  1 +
 resources/lang/bg/button.php                  |  1 +
 .../lang/ca/admin/categories/general.php      |  1 +
 resources/lang/ca/admin/settings/general.php  |  3 +
 resources/lang/ca/admin/users/message.php     |  9 +-
 resources/lang/ca/button.php                  |  1 +
 .../lang/cs/admin/categories/general.php      |  1 +
 resources/lang/cs/admin/settings/general.php  |  3 +
 resources/lang/cs/admin/users/message.php     |  1 +
 resources/lang/cs/button.php                  |  1 +
 .../lang/cy/admin/categories/general.php      |  1 +
 resources/lang/cy/admin/settings/general.php  |  3 +
 resources/lang/cy/admin/users/message.php     |  1 +
 resources/lang/cy/button.php                  |  1 +
 .../lang/da/admin/categories/general.php      |  1 +
 resources/lang/da/admin/settings/general.php  |  3 +
 resources/lang/da/admin/users/message.php     |  1 +
 resources/lang/da/button.php                  |  1 +
 .../lang/de/admin/categories/general.php      |  1 +
 resources/lang/de/admin/hardware/general.php  |  4 +-
 resources/lang/de/admin/models/general.php    |  4 +-
 resources/lang/de/admin/settings/general.php  |  3 +
 resources/lang/de/admin/users/message.php     |  1 +
 resources/lang/de/button.php                  |  1 +
 resources/lang/de/general.php                 |  2 +-
 resources/lang/de/mail.php                    |  2 +-
 .../lang/el/admin/categories/general.php      |  1 +
 resources/lang/el/admin/settings/general.php  |  3 +
 resources/lang/el/admin/users/message.php     |  1 +
 resources/lang/el/button.php                  |  1 +
 .../lang/en-GB/admin/categories/general.php   |  1 +
 .../lang/en-GB/admin/settings/general.php     |  3 +
 resources/lang/en-GB/admin/users/message.php  |  1 +
 resources/lang/en-GB/button.php               |  1 +
 .../lang/en-ID/admin/categories/general.php   |  1 +
 .../lang/en-ID/admin/hardware/general.php     |  2 +-
 .../lang/en-ID/admin/settings/general.php     |  3 +
 resources/lang/en-ID/admin/users/message.php  |  1 +
 resources/lang/en-ID/button.php               |  1 +
 .../lang/es-CO/admin/categories/general.php   |  1 +
 .../lang/es-CO/admin/depreciations/table.php  |  2 +-
 resources/lang/es-CO/admin/groups/message.php | 18 ++--
 resources/lang/es-CO/admin/groups/table.php   |  4 +-
 resources/lang/es-CO/admin/groups/titles.php  |  6 +-
 .../lang/es-CO/admin/settings/general.php     |  3 +
 resources/lang/es-CO/admin/users/message.php  |  1 +
 resources/lang/es-CO/button.php               |  1 +
 resources/lang/es-CO/general.php              |  2 +-
 resources/lang/es-CO/validation.php           |  8 +-
 .../lang/es-ES/admin/categories/general.php   |  1 +
 .../lang/es-ES/admin/settings/general.php     |  3 +
 resources/lang/es-ES/admin/users/message.php  |  1 +
 resources/lang/es-ES/button.php               |  1 +
 resources/lang/es-ES/general.php              |  2 +-
 .../lang/es-MX/admin/categories/general.php   |  1 +
 .../lang/es-MX/admin/settings/general.php     |  3 +
 resources/lang/es-MX/admin/users/message.php  |  1 +
 resources/lang/es-MX/button.php               |  1 +
 resources/lang/es-MX/general.php              |  2 +-
 .../lang/es-VE/admin/categories/general.php   |  1 +
 .../lang/es-VE/admin/settings/general.php     |  3 +
 resources/lang/es-VE/admin/users/message.php  |  1 +
 resources/lang/es-VE/button.php               |  1 +
 resources/lang/es-VE/general.php              |  2 +-
 .../lang/et/admin/accessories/message.php     |  2 +-
 .../et/admin/asset_maintenances/general.php   |  6 +-
 .../lang/et/admin/categories/general.php      |  1 +
 .../lang/et/admin/custom_fields/general.php   |  2 +-
 .../lang/et/admin/depreciations/general.php   |  2 +-
 resources/lang/et/admin/hardware/general.php  |  4 +-
 resources/lang/et/admin/hardware/table.php    |  2 +-
 resources/lang/et/admin/kits/general.php      |  2 +-
 resources/lang/et/admin/licenses/message.php  |  2 +-
 .../lang/et/admin/manufacturers/message.php   |  4 +-
 resources/lang/et/admin/models/general.php    |  8 +-
 resources/lang/et/admin/settings/general.php  | 23 +++--
 resources/lang/et/admin/users/message.php     |  3 +-
 resources/lang/et/button.php                  |  3 +-
 resources/lang/et/general.php                 | 42 ++++----
 resources/lang/et/mail.php                    | 20 ++--
 resources/lang/et/passwords.php               |  2 +-
 .../lang/fa/admin/categories/general.php      |  1 +
 resources/lang/fa/admin/settings/general.php  |  3 +
 resources/lang/fa/admin/users/message.php     |  1 +
 resources/lang/fa/button.php                  |  5 +-
 resources/lang/fa/general.php                 | 16 +--
 resources/lang/fa/help.php                    |  2 +-
 .../lang/fi/admin/categories/general.php      |  1 +
 resources/lang/fi/admin/hardware/general.php  |  4 +-
 resources/lang/fi/admin/models/general.php    |  2 +-
 resources/lang/fi/admin/settings/general.php  |  3 +
 resources/lang/fi/admin/users/message.php     |  1 +
 resources/lang/fi/button.php                  |  1 +
 resources/lang/fi/general.php                 |  2 +-
 .../lang/fil/admin/categories/general.php     |  1 +
 resources/lang/fil/admin/settings/general.php |  3 +
 resources/lang/fil/admin/users/message.php    |  1 +
 resources/lang/fil/button.php                 |  1 +
 .../lang/fr/admin/categories/general.php      |  1 +
 resources/lang/fr/admin/hardware/general.php  |  4 +-
 resources/lang/fr/admin/models/general.php    |  2 +-
 resources/lang/fr/admin/settings/general.php  |  3 +
 resources/lang/fr/admin/users/message.php     |  1 +
 resources/lang/fr/button.php                  |  1 +
 resources/lang/fr/general.php                 |  2 +-
 .../lang/ga-IE/admin/categories/general.php   |  1 +
 .../lang/ga-IE/admin/settings/general.php     |  3 +
 resources/lang/ga-IE/admin/users/message.php  |  1 +
 resources/lang/ga-IE/button.php               |  1 +
 .../lang/he/admin/categories/general.php      |  1 +
 resources/lang/he/admin/settings/general.php  |  3 +
 resources/lang/he/admin/users/message.php     |  1 +
 resources/lang/he/button.php                  |  1 +
 .../lang/hr/admin/categories/general.php      |  1 +
 resources/lang/hr/admin/settings/general.php  |  3 +
 resources/lang/hr/admin/users/message.php     |  1 +
 resources/lang/hr/button.php                  |  1 +
 .../lang/hu/admin/categories/general.php      |  1 +
 .../lang/hu/admin/depreciations/general.php   |  2 +-
 resources/lang/hu/admin/hardware/general.php  |  4 +-
 resources/lang/hu/admin/models/general.php    |  2 +-
 resources/lang/hu/admin/settings/general.php  | 27 ++---
 resources/lang/hu/admin/users/general.php     |  2 +-
 resources/lang/hu/admin/users/message.php     |  3 +-
 resources/lang/hu/auth/general.php            |  6 +-
 resources/lang/hu/auth/message.php            | 16 +--
 resources/lang/hu/button.php                  |  1 +
 resources/lang/hu/general.php                 | 44 ++++-----
 resources/lang/hu/mail.php                    | 30 +++---
 .../lang/id/admin/categories/general.php      |  1 +
 resources/lang/id/admin/hardware/general.php  |  4 +-
 resources/lang/id/admin/hardware/table.php    |  2 +-
 resources/lang/id/admin/locations/table.php   |  4 +-
 resources/lang/id/admin/settings/general.php  |  3 +
 resources/lang/id/admin/users/general.php     |  2 +-
 resources/lang/id/admin/users/message.php     |  3 +-
 resources/lang/id/button.php                  |  1 +
 .../lang/is/admin/categories/general.php      |  1 +
 resources/lang/is/admin/settings/general.php  |  3 +
 resources/lang/is/admin/users/message.php     |  9 +-
 resources/lang/is/button.php                  |  1 +
 resources/lang/is/general.php                 | 10 +-
 .../lang/it/admin/categories/general.php      |  1 +
 .../lang/it/admin/depreciations/general.php   |  2 +-
 resources/lang/it/admin/hardware/general.php  |  4 +-
 resources/lang/it/admin/models/general.php    |  2 +-
 resources/lang/it/admin/settings/general.php  |  3 +
 resources/lang/it/admin/users/message.php     |  1 +
 resources/lang/it/button.php                  |  1 +
 resources/lang/it/general.php                 |  4 +-
 .../lang/iu/admin/categories/general.php      |  1 +
 resources/lang/iu/admin/settings/general.php  |  3 +
 resources/lang/iu/admin/users/message.php     |  9 +-
 resources/lang/iu/button.php                  |  1 +
 .../lang/ja/admin/categories/general.php      |  1 +
 resources/lang/ja/admin/hardware/general.php  |  4 +-
 resources/lang/ja/admin/models/general.php    |  2 +-
 resources/lang/ja/admin/settings/general.php  |  3 +
 resources/lang/ja/admin/users/message.php     |  1 +
 resources/lang/ja/button.php                  |  1 +
 resources/lang/ja/general.php                 |  2 +-
 .../lang/ko/admin/categories/general.php      |  1 +
 resources/lang/ko/admin/hardware/general.php  |  4 +-
 resources/lang/ko/admin/models/general.php    |  2 +-
 resources/lang/ko/admin/settings/general.php  |  3 +
 resources/lang/ko/admin/users/message.php     |  1 +
 resources/lang/ko/auth/general.php            |  2 +-
 resources/lang/ko/button.php                  |  1 +
 resources/lang/ko/general.php                 |  2 +-
 .../lang/lt/admin/categories/general.php      |  1 +
 resources/lang/lt/admin/settings/general.php  |  3 +
 resources/lang/lt/admin/users/message.php     |  1 +
 resources/lang/lt/button.php                  |  1 +
 .../lang/lv/admin/categories/general.php      |  1 +
 resources/lang/lv/admin/settings/general.php  |  3 +
 resources/lang/lv/admin/users/message.php     |  1 +
 resources/lang/lv/button.php                  |  1 +
 .../lang/mi/admin/categories/general.php      |  1 +
 resources/lang/mi/admin/settings/general.php  |  3 +
 resources/lang/mi/admin/users/message.php     |  1 +
 resources/lang/mi/button.php                  |  1 +
 .../lang/mk/admin/categories/general.php      |  1 +
 resources/lang/mk/admin/settings/general.php  |  3 +
 resources/lang/mk/admin/users/message.php     |  1 +
 resources/lang/mk/button.php                  |  1 +
 .../lang/ml-IN/admin/categories/general.php   |  1 +
 .../lang/ml-IN/admin/settings/general.php     |  3 +
 resources/lang/ml-IN/admin/users/message.php  |  9 +-
 resources/lang/ml-IN/button.php               |  1 +
 .../lang/mn/admin/categories/general.php      |  1 +
 resources/lang/mn/admin/settings/general.php  |  3 +
 resources/lang/mn/admin/users/message.php     |  1 +
 resources/lang/mn/button.php                  |  1 +
 .../lang/ms/admin/accessories/message.php     |  2 +-
 .../ms/admin/asset_maintenances/general.php   |  6 +-
 .../lang/ms/admin/categories/general.php      |  1 +
 .../lang/ms/admin/depreciations/general.php   |  2 +-
 resources/lang/ms/admin/hardware/general.php  |  4 +-
 resources/lang/ms/admin/hardware/table.php    |  2 +-
 resources/lang/ms/admin/kits/general.php      | 22 ++---
 resources/lang/ms/admin/licenses/message.php  |  2 +-
 resources/lang/ms/admin/locations/table.php   |  2 +-
 resources/lang/ms/admin/models/general.php    |  4 +-
 resources/lang/ms/admin/models/message.php    |  6 +-
 resources/lang/ms/admin/settings/general.php  | 99 ++++++++++---------
 .../lang/ms/admin/statuslabels/table.php      |  4 +-
 resources/lang/ms/admin/users/general.php     |  2 +-
 resources/lang/ms/admin/users/message.php     |  1 +
 resources/lang/ms/button.php                  |  3 +-
 .../lang/nl/admin/categories/general.php      |  1 +
 resources/lang/nl/admin/hardware/general.php  |  4 +-
 resources/lang/nl/admin/models/general.php    |  2 +-
 resources/lang/nl/admin/settings/general.php  |  3 +
 resources/lang/nl/admin/users/message.php     |  1 +
 resources/lang/nl/button.php                  |  1 +
 resources/lang/nl/general.php                 |  2 +-
 .../lang/no/admin/categories/general.php      |  1 +
 .../lang/no/admin/depreciations/general.php   |  2 +-
 resources/lang/no/admin/hardware/general.php  |  4 +-
 resources/lang/no/admin/hardware/table.php    |  2 +-
 resources/lang/no/admin/kits/general.php      | 24 ++---
 resources/lang/no/admin/licenses/message.php  |  2 +-
 resources/lang/no/admin/locations/table.php   |  4 +-
 resources/lang/no/admin/models/general.php    |  2 +-
 resources/lang/no/admin/settings/general.php  | 83 ++++++++--------
 resources/lang/no/admin/users/general.php     |  2 +-
 resources/lang/no/admin/users/message.php     |  3 +-
 resources/lang/no/auth/general.php            |  8 +-
 resources/lang/no/auth/message.php            | 16 +--
 resources/lang/no/button.php                  |  3 +-
 resources/lang/no/general.php                 | 58 +++++------
 resources/lang/no/help.php                    | 18 ++--
 resources/lang/no/mail.php                    | 30 +++---
 resources/lang/no/validation.php              |  2 +-
 .../lang/pl/admin/categories/general.php      |  1 +
 resources/lang/pl/admin/hardware/general.php  |  4 +-
 resources/lang/pl/admin/models/general.php    |  2 +-
 resources/lang/pl/admin/settings/general.php  |  3 +
 resources/lang/pl/admin/users/message.php     |  1 +
 resources/lang/pl/button.php                  |  1 +
 resources/lang/pl/general.php                 |  2 +-
 .../lang/pt-BR/admin/categories/general.php   |  1 +
 .../lang/pt-BR/admin/hardware/general.php     |  4 +-
 resources/lang/pt-BR/admin/models/general.php |  2 +-
 .../lang/pt-BR/admin/settings/general.php     |  3 +
 resources/lang/pt-BR/admin/users/message.php  |  1 +
 resources/lang/pt-BR/button.php               |  1 +
 .../lang/pt-PT/admin/accessories/message.php  |  2 +-
 .../admin/asset_maintenances/general.php      |  4 +-
 .../lang/pt-PT/admin/categories/general.php   |  1 +
 .../pt-PT/admin/depreciations/general.php     |  2 +-
 .../lang/pt-PT/admin/hardware/general.php     |  2 +-
 .../lang/pt-PT/admin/settings/general.php     |  3 +
 resources/lang/pt-PT/admin/users/message.php  |  1 +
 resources/lang/pt-PT/auth/general.php         |  8 +-
 resources/lang/pt-PT/auth/message.php         | 16 +--
 resources/lang/pt-PT/button.php               |  3 +-
 resources/lang/pt-PT/mail.php                 |  6 +-
 .../lang/ro/admin/categories/general.php      |  1 +
 resources/lang/ro/admin/settings/general.php  |  3 +
 resources/lang/ro/admin/users/message.php     |  1 +
 resources/lang/ro/button.php                  |  1 +
 resources/lang/ro/general.php                 |  2 +-
 .../lang/ru/admin/categories/general.php      |  1 +
 .../lang/ru/admin/depreciations/general.php   |  2 +-
 resources/lang/ru/admin/hardware/general.php  |  4 +-
 resources/lang/ru/admin/models/general.php    |  2 +-
 resources/lang/ru/admin/settings/general.php  | 17 ++--
 resources/lang/ru/admin/users/message.php     |  3 +-
 resources/lang/ru/auth/general.php            |  2 +-
 resources/lang/ru/button.php                  |  1 +
 resources/lang/ru/general.php                 | 20 ++--
 resources/lang/ru/help.php                    |  2 +-
 resources/lang/ru/mail.php                    |  2 +-
 .../lang/si-LK/admin/categories/general.php   |  1 +
 .../lang/si-LK/admin/settings/general.php     |  3 +
 resources/lang/si-LK/admin/users/message.php  |  9 +-
 resources/lang/si-LK/button.php               |  1 +
 .../lang/sk/admin/categories/general.php      |  1 +
 resources/lang/sk/admin/settings/general.php  |  7 +-
 resources/lang/sk/admin/users/message.php     |  1 +
 resources/lang/sk/button.php                  |  1 +
 resources/lang/sk/general.php                 |  8 +-
 .../lang/sl/admin/accessories/message.php     |  2 +-
 .../sl/admin/asset_maintenances/general.php   |  6 +-
 .../lang/sl/admin/categories/general.php      |  5 +-
 .../lang/sl/admin/custom_fields/general.php   |  2 +-
 .../lang/sl/admin/depreciations/general.php   |  2 +-
 resources/lang/sl/admin/hardware/general.php  |  6 +-
 resources/lang/sl/admin/hardware/table.php    |  2 +-
 resources/lang/sl/admin/kits/general.php      | 24 ++---
 resources/lang/sl/admin/licenses/message.php  |  2 +-
 resources/lang/sl/admin/locations/table.php   |  4 +-
 .../lang/sl/admin/manufacturers/message.php   |  4 +-
 resources/lang/sl/admin/models/general.php    |  4 +-
 resources/lang/sl/admin/settings/general.php  | 17 ++--
 .../lang/sl/admin/statuslabels/table.php      |  4 +-
 resources/lang/sl/admin/users/general.php     |  6 +-
 resources/lang/sl/admin/users/message.php     |  3 +-
 resources/lang/sl/auth/general.php            |  9 +-
 resources/lang/sl/auth/message.php            | 16 +--
 resources/lang/sl/button.php                  |  5 +-
 resources/lang/sl/general.php                 | 77 ++++++++-------
 resources/lang/sl/help.php                    | 18 ++--
 .../lang/sr-CS/admin/categories/general.php   |  1 +
 .../lang/sr-CS/admin/settings/general.php     |  3 +
 resources/lang/sr-CS/admin/users/message.php  |  1 +
 resources/lang/sr-CS/button.php               |  1 +
 .../lang/sv-SE/admin/categories/general.php   |  1 +
 .../lang/sv-SE/admin/settings/general.php     |  3 +
 resources/lang/sv-SE/admin/users/message.php  |  1 +
 resources/lang/sv-SE/button.php               |  1 +
 .../lang/ta/admin/categories/general.php      |  1 +
 resources/lang/ta/admin/settings/general.php  |  3 +
 resources/lang/ta/admin/users/message.php     |  1 +
 resources/lang/ta/button.php                  |  1 +
 .../lang/th/admin/categories/general.php      |  1 +
 .../lang/th/admin/depreciations/general.php   |  2 +-
 resources/lang/th/admin/hardware/general.php  |  2 +-
 resources/lang/th/admin/locations/table.php   |  4 +-
 resources/lang/th/admin/settings/general.php  |  3 +
 resources/lang/th/admin/users/message.php     |  1 +
 resources/lang/th/button.php                  |  1 +
 resources/lang/th/general.php                 | 10 +-
 resources/lang/th/mail.php                    | 24 ++---
 .../lang/tl/admin/categories/general.php      |  1 +
 resources/lang/tl/admin/settings/general.php  |  3 +
 resources/lang/tl/admin/users/message.php     |  9 +-
 resources/lang/tl/button.php                  |  1 +
 .../lang/tr/admin/categories/general.php      |  1 +
 resources/lang/tr/admin/hardware/general.php  |  4 +-
 resources/lang/tr/admin/models/general.php    |  2 +-
 resources/lang/tr/admin/settings/general.php  | 69 ++++++-------
 resources/lang/tr/admin/users/general.php     |  2 +-
 resources/lang/tr/admin/users/message.php     |  3 +-
 resources/lang/tr/auth/general.php            |  6 +-
 resources/lang/tr/auth/message.php            | 16 +--
 resources/lang/tr/button.php                  |  3 +-
 resources/lang/tr/general.php                 |  2 +-
 resources/lang/tr/mail.php                    | 14 +--
 resources/lang/tr/validation.php              |  2 +-
 .../lang/uk/admin/categories/general.php      |  1 +
 resources/lang/uk/admin/settings/general.php  |  3 +
 resources/lang/uk/admin/users/message.php     |  9 +-
 resources/lang/uk/button.php                  |  1 +
 .../lang/ur-PK/admin/categories/general.php   |  1 +
 .../lang/ur-PK/admin/settings/general.php     |  3 +
 resources/lang/ur-PK/admin/users/message.php  |  9 +-
 resources/lang/ur-PK/button.php               |  1 +
 .../lang/vi/admin/categories/general.php      |  1 +
 resources/lang/vi/admin/settings/general.php  |  3 +
 resources/lang/vi/admin/users/message.php     |  1 +
 resources/lang/vi/button.php                  |  1 +
 .../lang/zh-CN/admin/categories/general.php   |  1 +
 .../lang/zh-CN/admin/settings/general.php     |  3 +
 resources/lang/zh-CN/admin/users/message.php  |  1 +
 resources/lang/zh-CN/button.php               |  1 +
 .../lang/zh-HK/admin/categories/general.php   |  1 +
 .../lang/zh-HK/admin/settings/general.php     |  3 +
 resources/lang/zh-HK/admin/users/message.php  |  9 +-
 resources/lang/zh-HK/button.php               |  1 +
 .../lang/zh-TW/admin/categories/general.php   |  1 +
 .../lang/zh-TW/admin/hardware/general.php     |  4 +-
 resources/lang/zh-TW/admin/hardware/table.php |  2 +-
 .../lang/zh-TW/admin/licenses/message.php     |  2 +-
 .../lang/zh-TW/admin/settings/general.php     |  3 +
 resources/lang/zh-TW/admin/users/message.php  |  1 +
 resources/lang/zh-TW/button.php               |  3 +-
 resources/lang/zh-TW/general.php              | 26 ++---
 resources/lang/zh-TW/mail.php                 | 24 ++---
 .../lang/zu/admin/categories/general.php      |  1 +
 resources/lang/zu/admin/settings/general.php  |  3 +
 resources/lang/zu/admin/users/message.php     |  1 +
 resources/lang/zu/button.php                  |  1 +
 392 files changed, 1102 insertions(+), 734 deletions(-)

diff --git a/resources/lang/af/admin/categories/general.php b/resources/lang/af/admin/categories/general.php
index c5182b4c5a..32b68f8cdb 100644
--- a/resources/lang/af/admin/categories/general.php
+++ b/resources/lang/af/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'Opdateer kategorie',
     'use_default_eula'					=> 'Gebruik eerder die <a href="#" data-toggle="modal" data-target="#eulaModal">primary standaard EULA</a>.',
     'use_default_eula_disabled'			=> '<del>Gebruik die primêre standaardverlof in plaas daarvan.</del> Geen primêre standaard EULA is ingestel nie. Voeg asseblief een by Instellings.',
+    'use_default_eula_column'			=> 'Use default EULA',
 
 );
diff --git a/resources/lang/af/admin/settings/general.php b/resources/lang/af/admin/settings/general.php
index aa5d4805a2..dccee4d878 100644
--- a/resources/lang/af/admin/settings/general.php
+++ b/resources/lang/af/admin/settings/general.php
@@ -61,9 +61,12 @@ return array(
     'label_logo'                => 'Label Logo',
     'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
     'laravel'                   => 'Laravel Weergawe',
+    'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Certificate',
     'ldap_enabled'              => 'LDAP aangeskakel',
     'ldap_integration'          => 'LDAP-integrasie',
     'ldap_settings'             => 'LDAP-instellings',
+    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_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_server'               => 'LDAP-bediener',
diff --git a/resources/lang/af/admin/users/message.php b/resources/lang/af/admin/users/message.php
index ea47019c7e..615e88de05 100644
--- a/resources/lang/af/admin/users/message.php
+++ b/resources/lang/af/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
     'user_deleted_warning'      => 'Hierdie gebruiker is verwyder. Jy sal hierdie gebruiker moet herstel om hulle te wysig of nuwe bates toe te ken.',
     'ldap_not_configured'        => 'LDAP-integrasie is nie vir hierdie installasie gekonfigureer nie.',
     'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
+    'password_reset_sent'       => 'A password reset link has been sent to :email!',
 
 
     'success' => array(
diff --git a/resources/lang/af/button.php b/resources/lang/af/button.php
index 58662fb7a8..61a5f0f0c4 100644
--- a/resources/lang/af/button.php
+++ b/resources/lang/af/button.php
@@ -14,4 +14,5 @@ return array(
 	'select_file'				=> 'Kies lêer ...',
     'select_files'				=> 'Select Files...',
     'generate_labels'           => '{1} Generate Label|[2,*] Generate Labels',
+    'send_password_link'       => 'Send Password Reset Link',
 );
diff --git a/resources/lang/am/admin/categories/general.php b/resources/lang/am/admin/categories/general.php
index 7741b7da62..52e936d0b6 100644
--- a/resources/lang/am/admin/categories/general.php
+++ b/resources/lang/am/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'Update Category',
     'use_default_eula'					=> 'Use the <a href="#" data-toggle="modal" data-target="#eulaModal">primary default EULA</a> instead.',
     'use_default_eula_disabled'			=> '<del>Use the primary default EULA instead.</del> No primary default EULA is set. Please add one in Settings.',
+    'use_default_eula_column'			=> 'Use default EULA',
 
 );
diff --git a/resources/lang/am/admin/settings/general.php b/resources/lang/am/admin/settings/general.php
index e15162210e..fb268f39f0 100644
--- a/resources/lang/am/admin/settings/general.php
+++ b/resources/lang/am/admin/settings/general.php
@@ -61,9 +61,12 @@ return array(
     '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',
+    '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_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_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_server'               => 'LDAP Server',
diff --git a/resources/lang/am/admin/users/message.php b/resources/lang/am/admin/users/message.php
index e517cd113b..85d016f04a 100644
--- a/resources/lang/am/admin/users/message.php
+++ b/resources/lang/am/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
     'user_deleted_warning'      => 'This user has been deleted. You will have to restore this user to edit them or assign them new assets.',
     'ldap_not_configured'        => 'LDAP integration has not been configured for this installation.',
     'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
+    'password_reset_sent'       => 'A password reset link has been sent to :email!',
 
 
     'success' => array(
@@ -38,10 +39,10 @@ return array(
         'asset_already_accepted' => 'This asset has already been accepted.',
         'accept_or_decline' => 'You must either accept or decline this asset.',
         'incorrect_user_accepted' => 'The asset you have attempted to accept was not checked out to you.',
-        'ldap_could_not_connect' => 'Could not connect to the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD <br>Error from LDAP Server:',
-        'ldap_could_not_bind' => 'Could not bind to the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD<br>Error from LDAP Server: ',
-        'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD and any Locations that may have additional OUs associated with them. <br>Error from LDAP Server:',
-        'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD and any Locations that may have additional OUs associated with them. <br>Error from LDAP Server:',
+        'ldap_could_not_connect' => 'Could not connect to the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
+        'ldap_could_not_bind' => 'Could not bind to the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server: ',
+        'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
+        'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
         'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ',
     ),
 
diff --git a/resources/lang/am/button.php b/resources/lang/am/button.php
index 2b97223250..27131e5fc6 100644
--- a/resources/lang/am/button.php
+++ b/resources/lang/am/button.php
@@ -14,4 +14,5 @@ return array(
 	'select_file'				=> 'Select File...',
     'select_files'				=> 'Select Files...',
     'generate_labels'           => '{1} Generate Label|[2,*] Generate Labels',
+    'send_password_link'       => 'Send Password Reset Link',
 );
diff --git a/resources/lang/ar/admin/categories/general.php b/resources/lang/ar/admin/categories/general.php
index 45768a64d1..e0be3c26da 100644
--- a/resources/lang/ar/admin/categories/general.php
+++ b/resources/lang/ar/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'تحديث التصنيف',
     'use_default_eula'					=> 'قم باستعمال <a href="#" data-toggle="modal" data-target="#eulaModal">إتفاقية الترخيص الإفتراضية</a>.',
     'use_default_eula_disabled'			=> '<del>استخدام (اتفاقية ترخيص المستخدم) الافتراضية الأساسية بدلا من ذلك.</del> لم يتم تحديد (اتفاقية ترخيص المستخدم) الافتراضية الأساسية. الرجاء إضافتها من الإعدادات.',
+    'use_default_eula_column'			=> 'استخدم EULA الافتراضي',
 
 );
diff --git a/resources/lang/ar/admin/depreciations/general.php b/resources/lang/ar/admin/depreciations/general.php
index d12b69a3a1..71ff1c6018 100644
--- a/resources/lang/ar/admin/depreciations/general.php
+++ b/resources/lang/ar/admin/depreciations/general.php
@@ -8,6 +8,6 @@ return array(
     'depreciation_name'  					=> 'اسم الاستهلاك',
     'number_of_months'  					=> 'عدد الأشهر',
     'update'  					            => 'تحديث الاستهلاك',
-    'depreciation_min'                      => 'Minimum Value after Depreciation'
+    'depreciation_min'                      => 'الحد الأدنى للقيمة بعد الاستهلاك'
 
 );
diff --git a/resources/lang/ar/admin/hardware/general.php b/resources/lang/ar/admin/hardware/general.php
index 8fa9ff21f4..39df32f9b5 100644
--- a/resources/lang/ar/admin/hardware/general.php
+++ b/resources/lang/ar/admin/hardware/general.php
@@ -10,9 +10,9 @@ return array(
     'checkout'  				=> 'اخراج الأصل',
     'clone'  					=> 'استنساخ الأصل',
     'deployable'  				=> 'قابل للتوزيع',
-    'deleted'  					=> 'This asset has been deleted.',
+    'deleted'  					=> 'تم حذف هذا الأصل.',
     'edit'  					=> 'تعديل الأصل',
-    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
+    'model_deleted'  			=> 'تم حذف موديل الأصول هذا. يجب استعادة الموديل قبل أن تتمكن من استعادة الأصل.',
     'requestable'               => 'قابل للطلب',
     'requested'				    => 'تم الطلب',
     'restore'  					=> 'استعادة الأصل',
diff --git a/resources/lang/ar/admin/models/general.php b/resources/lang/ar/admin/models/general.php
index 9377dec83f..94e438651b 100644
--- a/resources/lang/ar/admin/models/general.php
+++ b/resources/lang/ar/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'حول موديلات الأصول',
     'about_models_text'           => 'موديلات الأصول هي طريقة لتجميع الأصول المتطابقة "MBP 2013", "IPhone 6s", الخ.',
-    'deleted'  					        => 'This model has been deleted.',
+    'deleted'  					        => 'تم حذف هذا الموديل.',
     'bulk_delete'               => 'حذف موديلات الاصول بالجملة',
     'bulk_delete_help'               => 'استخدم مربعات الاختيار أدناه لتأكيد حذف موديلات الأصول المحددة. لا يمكن حذف موديلات الأصول التي تحتوي على أصول مرتبطة بها إلى أن يتم ربط الأصول بموديل مختلف.',
     'bulk_delete_warn'          => 'أنت على وشك حذف :model_count من موديلات الأصول.',
diff --git a/resources/lang/ar/admin/settings/general.php b/resources/lang/ar/admin/settings/general.php
index b184814f83..c8d93a3ff0 100644
--- a/resources/lang/ar/admin/settings/general.php
+++ b/resources/lang/ar/admin/settings/general.php
@@ -61,9 +61,12 @@ return array(
     'label_logo'                => 'شعار التسمية',
     'label_logo_size'           => 'الشعارات المربعة تبدو أفضل - سيتم عرضها في أعلى يمين كل ملصق أصل. ',
     'laravel'                   => 'نسخة لارافيل',
+    'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Certificate',
     'ldap_enabled'              => 'تم تمكين لداب',
     'ldap_integration'          => 'دمج لداب',
     'ldap_settings'             => 'إعدادات لداب',
+    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_login_test_help'      => 'أدخل اسم مستخدم وكلمة مرور LDAP من الاسم المميز الأساسي DN الذي حددته أعلاه لاختبار ما إذا كان قد تمت تهيئة معلومات تسجيل الدخول إلى LDAP بشكل صحيح أم لا. يجب حفظ تحديث LDAP الخاص بك أولا.',
     'ldap_login_sync_help'      => 'هذا يختبر فقط أن LDAP يستطيع المزامنة بشكل صحيح. إذا كان استعلام التوثيق الى LDAP الخاص بك غير صحيح، قد لا يزال المستخدمون غير قادرين على تسجيل الدخول. يجب عليك اولا حفظ اي تغييرات في إعدادات LDAP.',
     'ldap_server'               => 'خادم لداب',
diff --git a/resources/lang/ar/admin/users/message.php b/resources/lang/ar/admin/users/message.php
index f6aab5ad60..b2584b145d 100644
--- a/resources/lang/ar/admin/users/message.php
+++ b/resources/lang/ar/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
     'user_deleted_warning'      => 'تم حذف المستخدم. سيكون عليك استعادة هذا المستخدم اذا ارت التعديل عليه او تسليمه اجهزة جديدة.',
     'ldap_not_configured'        => 'لم يتم تكوين دمج لداب لهذا التثبيت.',
     'password_resets_sent'      => 'تم إرسال رابط إعادة تعيين كلمة المرور للمستخدمين المحددين الذين تم تفعيلهم ولديهم عناوين بريد إلكتروني صالحة.',
+    'password_reset_sent'       => 'تم إرسال رابط إعادة تعيين كلمة المرور إلى البريد الإلكتروني!',
 
 
     'success' => array(
diff --git a/resources/lang/ar/button.php b/resources/lang/ar/button.php
index e53c573472..edcf903053 100644
--- a/resources/lang/ar/button.php
+++ b/resources/lang/ar/button.php
@@ -14,4 +14,5 @@ return array(
 	'select_file'				=> 'حدد ملف ...',
     'select_files'				=> 'إختيار ملف...',
     'generate_labels'           => '{1} انشاء تسميات [2,*] توليد تسميات',
+    'send_password_link'       => 'إرسال رابط إعادة تعيين كلمة السر',
 );
diff --git a/resources/lang/ar/general.php b/resources/lang/ar/general.php
index 58a837a5fb..9621ffbc13 100644
--- a/resources/lang/ar/general.php
+++ b/resources/lang/ar/general.php
@@ -176,7 +176,7 @@
     'remove_company'        => 'إزالة جمعية الشركة',
     'reports'				=> 'التقارير',
     'restored'				=> 'المعاد',
-    'restore'				=> 'Restore',
+    'restore'				=> 'إستعادة',
     'requested'				=> 'طلب',
     'request_canceled'      => 'تم إلغاء الطلب',
     'save'  				=> 'حفظ',
diff --git a/resources/lang/bg/admin/categories/general.php b/resources/lang/bg/admin/categories/general.php
index 1de78f6eb0..7a2cc36612 100644
--- a/resources/lang/bg/admin/categories/general.php
+++ b/resources/lang/bg/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'Обновяване на категория',
     'use_default_eula'					=> 'Използване на <a href="#" data-toggle="modal" data-target="#eulaModal">EULA по подразбиране</a>.',
     'use_default_eula_disabled'			=> '<del>Използване на EULA по подразбиране</del> Няма EULA по подразбиране. Добавете я в Настройки.',
+    'use_default_eula_column'			=> 'Use default EULA',
 
 );
diff --git a/resources/lang/bg/admin/settings/general.php b/resources/lang/bg/admin/settings/general.php
index 3dbbfda471..0e5beb99f2 100644
--- a/resources/lang/bg/admin/settings/general.php
+++ b/resources/lang/bg/admin/settings/general.php
@@ -61,9 +61,12 @@ return array(
     'label_logo'                => 'Лого за етикет',
     'label_logo_size'           => 'Квадратните логота изглеждат най-добре - ще бъдат показани в горния десен ъгъл на всеки артикулен етикет. ',
     'laravel'                   => 'Версия на Laravel',
+    'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Certificate',
     'ldap_enabled'              => 'LDAP включен',
     'ldap_integration'          => 'LDAP интеграция',
     'ldap_settings'             => 'LDAP настройки',
+    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_login_test_help'      => 'Въведете валидни LDAP потребител и парола от базовия DN, който указахте по-горе, за да тествате коректната конфигурация. НЕОБХОДИМО Е ДА ЗАПИШЕТЕ LDAP НАСТРОЙКИТЕ ПРЕДИ ТОВА.',
     'ldap_login_sync_help'      => 'Това единствено проверява дали LDAP може да се синхронизира успешно. Ако вашата LDAP заявка за оторизация не е коректна е възможно потребителите да не могат да влязат. НЕОБХОДИМО Е ДА ЗАПИШЕТЕ LDAP НАСТРОЙКИТЕ ПРЕДИ ТОВА.',
     'ldap_server'               => 'LDAP сървър',
diff --git a/resources/lang/bg/admin/users/message.php b/resources/lang/bg/admin/users/message.php
index 81f63f63f3..230b544da6 100644
--- a/resources/lang/bg/admin/users/message.php
+++ b/resources/lang/bg/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
     'user_deleted_warning'      => 'Този потребител е изтрит. За да редактирате данните за него или да му зададете актив, трябва първо да възстановите потребителя.',
     'ldap_not_configured'        => 'Интеграцията с LDAP не е конфигурирана за тази инсталация.',
     'password_resets_sent'      => 'Избраните потребители, които са активирани и имат валиден е-майл адрес им беше изпратен линк за смяна на парола.',
+    'password_reset_sent'       => 'A password reset link has been sent to :email!',
 
 
     'success' => array(
diff --git a/resources/lang/bg/button.php b/resources/lang/bg/button.php
index ef6b2c517b..10996d2c8a 100644
--- a/resources/lang/bg/button.php
+++ b/resources/lang/bg/button.php
@@ -14,4 +14,5 @@ return array(
 	'select_file'				=> 'Изберете файл...',
     'select_files'				=> 'Изберете файлове...',
     'generate_labels'           => '{1} Генерирай Етикет|[2,*] Генерирай Етикети',
+    'send_password_link'       => 'Send Password Reset Link',
 );
diff --git a/resources/lang/ca/admin/categories/general.php b/resources/lang/ca/admin/categories/general.php
index 7741b7da62..52e936d0b6 100644
--- a/resources/lang/ca/admin/categories/general.php
+++ b/resources/lang/ca/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'Update Category',
     'use_default_eula'					=> 'Use the <a href="#" data-toggle="modal" data-target="#eulaModal">primary default EULA</a> instead.',
     'use_default_eula_disabled'			=> '<del>Use the primary default EULA instead.</del> No primary default EULA is set. Please add one in Settings.',
+    'use_default_eula_column'			=> 'Use default EULA',
 
 );
diff --git a/resources/lang/ca/admin/settings/general.php b/resources/lang/ca/admin/settings/general.php
index e15162210e..fb268f39f0 100644
--- a/resources/lang/ca/admin/settings/general.php
+++ b/resources/lang/ca/admin/settings/general.php
@@ -61,9 +61,12 @@ return array(
     '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',
+    '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_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_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_server'               => 'LDAP Server',
diff --git a/resources/lang/ca/admin/users/message.php b/resources/lang/ca/admin/users/message.php
index e517cd113b..85d016f04a 100644
--- a/resources/lang/ca/admin/users/message.php
+++ b/resources/lang/ca/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
     'user_deleted_warning'      => 'This user has been deleted. You will have to restore this user to edit them or assign them new assets.',
     'ldap_not_configured'        => 'LDAP integration has not been configured for this installation.',
     'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
+    'password_reset_sent'       => 'A password reset link has been sent to :email!',
 
 
     'success' => array(
@@ -38,10 +39,10 @@ return array(
         'asset_already_accepted' => 'This asset has already been accepted.',
         'accept_or_decline' => 'You must either accept or decline this asset.',
         'incorrect_user_accepted' => 'The asset you have attempted to accept was not checked out to you.',
-        'ldap_could_not_connect' => 'Could not connect to the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD <br>Error from LDAP Server:',
-        'ldap_could_not_bind' => 'Could not bind to the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD<br>Error from LDAP Server: ',
-        'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD and any Locations that may have additional OUs associated with them. <br>Error from LDAP Server:',
-        'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD and any Locations that may have additional OUs associated with them. <br>Error from LDAP Server:',
+        'ldap_could_not_connect' => 'Could not connect to the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
+        'ldap_could_not_bind' => 'Could not bind to the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server: ',
+        'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
+        'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
         'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ',
     ),
 
diff --git a/resources/lang/ca/button.php b/resources/lang/ca/button.php
index 2b97223250..27131e5fc6 100644
--- a/resources/lang/ca/button.php
+++ b/resources/lang/ca/button.php
@@ -14,4 +14,5 @@ return array(
 	'select_file'				=> 'Select File...',
     'select_files'				=> 'Select Files...',
     'generate_labels'           => '{1} Generate Label|[2,*] Generate Labels',
+    'send_password_link'       => 'Send Password Reset Link',
 );
diff --git a/resources/lang/cs/admin/categories/general.php b/resources/lang/cs/admin/categories/general.php
index ced06fc859..3595e36227 100644
--- a/resources/lang/cs/admin/categories/general.php
+++ b/resources/lang/cs/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'Upravit kategorii',
     'use_default_eula'					=> 'Použijte raději <a href="#" data-toggle="modal" data-target="#eulaModal">primární výchozí EULA</a>.',
     'use_default_eula_disabled'			=> '<del>Použijte raději primární výchozí EULA.</del> Nenalezena primární výchozí EULA. Přidejte ji v Nastaveních prosím.',
+    'use_default_eula_column'			=> 'Use default EULA',
 
 );
diff --git a/resources/lang/cs/admin/settings/general.php b/resources/lang/cs/admin/settings/general.php
index d52f6a60d5..170fe43732 100644
--- a/resources/lang/cs/admin/settings/general.php
+++ b/resources/lang/cs/admin/settings/general.php
@@ -61,9 +61,12 @@ return array(
     'label_logo'                => 'Label Logo',
     'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
     'laravel'                   => 'Verze Laravel',
+    'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Certificate',
     'ldap_enabled'              => 'LDAP povoleno',
     'ldap_integration'          => 'LDAP integrace',
     'ldap_settings'             => 'Nastavení LDAP',
+    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_login_test_help'      => 'Zadejte platné LDAP uživatelské jméno a heslo ze základu rozlišeného názvu který jste určili výše a vyzkoušejte zda je LDAP přihlašování správně nastavené. NEJPRVE JE TŘEBA ULOŽIT ZMĚNĚNÉ NASTAVENÍ LDAP.',
     'ldap_login_sync_help'      => 'Otestujte, že LDAP může správně synchronizovat. Pokud ověřovací LDAP dotaz není správný, uživatelé se nemusí být schopni přihlásit. JE NUTNÉ NEJPRVE NEJDŘÍVE ULOŽIT NASTAVENÍ LDAP POKUD BYLO ZMĚNĚNO.',
     'ldap_server'               => 'LDAP server',
diff --git a/resources/lang/cs/admin/users/message.php b/resources/lang/cs/admin/users/message.php
index eef2263c74..957099bf7f 100644
--- a/resources/lang/cs/admin/users/message.php
+++ b/resources/lang/cs/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
     'user_deleted_warning'      => 'Tento uživatel byl smazán. Budete muset uživatele obnovit, aby jste ho mohli upravil nebo přidělil nové majetky.',
     'ldap_not_configured'        => 'Integrace LDAP nebyla pro tuto instalaci nakonfigurována.',
     'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
+    'password_reset_sent'       => 'A password reset link has been sent to :email!',
 
 
     'success' => array(
diff --git a/resources/lang/cs/button.php b/resources/lang/cs/button.php
index ba04aa86da..f20014209a 100644
--- a/resources/lang/cs/button.php
+++ b/resources/lang/cs/button.php
@@ -14,4 +14,5 @@ return array(
 	'select_file'				=> 'Vybrat soubor...',
     'select_files'				=> 'Vybrat soubory…',
     'generate_labels'           => '{1} Generate Label|[2,*] Generate Labels',
+    'send_password_link'       => 'Send Password Reset Link',
 );
diff --git a/resources/lang/cy/admin/categories/general.php b/resources/lang/cy/admin/categories/general.php
index 8026111dbb..cf7f1935cb 100644
--- a/resources/lang/cy/admin/categories/general.php
+++ b/resources/lang/cy/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'Diweddaru Categori',
     'use_default_eula'					=> 'Defnyddio\'r <a href="#" data-toggle="modal" data-target="#eulaModal">prif CTDT diofyn</a> yn lle.',
     'use_default_eula_disabled'			=> '<del>Defnyddio\'r CTDT diofyn yn lle\'r un presennol.</del>Nid oes prif CTDT diofyn wedi gosod. Ychwanegwch yn ynj gosodiadau os gwelwch yn dda.',
+    'use_default_eula_column'			=> 'Use default EULA',
 
 );
diff --git a/resources/lang/cy/admin/settings/general.php b/resources/lang/cy/admin/settings/general.php
index 9605de2304..9fbfb1c3b8 100644
--- a/resources/lang/cy/admin/settings/general.php
+++ b/resources/lang/cy/admin/settings/general.php
@@ -61,9 +61,12 @@ return array(
     'label_logo'                => 'Label Logo',
     'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
     'laravel'                   => 'Fersiwn Laravel',
+    'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Certificate',
     'ldap_enabled'              => 'LDAP wedi alluogi',
     'ldap_integration'          => 'Integreiddio LDAP',
     'ldap_settings'             => 'Gosodiadau LDAP',
+    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_login_test_help'      => 'Gosodwch cyfrif a chyfrinair LDAP dilys o\'r base DN i profi cysyllted a gweithrediad LDAP. RHAID ARBED Y GOSODIADAU LDAP CYNTAF.',
     'ldap_login_sync_help'      => 'Mae\'r prawf yma yn profi\'r gallu i LDAP gwneud sync. Os ydi\'r gosodiadau LDAP yn anghywir mae\'n bosib ni ellith defnyddwyr mewngofnodi. RHAID ARBED GOSODIADAU LDAP CYNTAF.',
     'ldap_server'               => 'Server LDAP',
diff --git a/resources/lang/cy/admin/users/message.php b/resources/lang/cy/admin/users/message.php
index b64ceb78c8..b39f0977ab 100644
--- a/resources/lang/cy/admin/users/message.php
+++ b/resources/lang/cy/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
     'user_deleted_warning'      => 'Defnyddiwr wedi\'i dileu. Rhaid adfer y defnyddiwr I newid eu manylion neu clustnodi ased iddynt.',
     'ldap_not_configured'        => 'Nid ywr gosodiadau I dilysu trwy LDAP wedi gosod ar y system.',
     'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
+    'password_reset_sent'       => 'A password reset link has been sent to :email!',
 
 
     'success' => array(
diff --git a/resources/lang/cy/button.php b/resources/lang/cy/button.php
index c1797a7d94..1783ae9720 100644
--- a/resources/lang/cy/button.php
+++ b/resources/lang/cy/button.php
@@ -14,4 +14,5 @@ return array(
 	'select_file'				=> 'Dewis ffeil...',
     'select_files'				=> 'Dewis ffeiliau...',
     'generate_labels'           => '{1} Generate Label|[2,*] Generate Labels',
+    'send_password_link'       => 'Send Password Reset Link',
 );
diff --git a/resources/lang/da/admin/categories/general.php b/resources/lang/da/admin/categories/general.php
index 243c99c0ae..377c20db08 100644
--- a/resources/lang/da/admin/categories/general.php
+++ b/resources/lang/da/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'Opdater kategori',
     'use_default_eula'					=> 'Brug den <a href="#" data-toggle="modal" data-target="#eulaModal">primære standard slutbrugerlicens</a> i stedet for.',
     'use_default_eula_disabled'			=> '<del>Brug den primære standard slutbrugerlicens i stedet for.</del> Ingen primær standard slutbrugerlicens er defineret. Tilføj en under indstillinger.',
+    'use_default_eula_column'			=> 'Use default EULA',
 
 );
diff --git a/resources/lang/da/admin/settings/general.php b/resources/lang/da/admin/settings/general.php
index 47bb90da35..2561c80c42 100644
--- a/resources/lang/da/admin/settings/general.php
+++ b/resources/lang/da/admin/settings/general.php
@@ -61,9 +61,12 @@ return array(
     'label_logo'                => 'Etiketlogo',
     'label_logo_size'           => 'Firkantede logoer ser bedst ud - vil blive vist øverst til højre på hver aktiv etiket. ',
     'laravel'                   => 'Laravel Version',
+    'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Certificate',
     'ldap_enabled'              => 'LDAP aktiveret',
     'ldap_integration'          => 'LDAP Integration',
     'ldap_settings'             => 'LDAP-indstillinger',
+    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_login_test_help'      => 'Indtast validt LDAP brugernavn og kodeord fra den basis DN du angav ovenfor for at teste om dit LDAP login er korrekt konfigureret. DU SKAL FØRST OPDATERE og GEMME DINE LDAP INDSTILLINGER.',
     'ldap_login_sync_help'      => 'Dette tester kun om LDAP kan synkronisere korrekt. Hvis din LDAP authentisering ikke er korrekt, er det usikkert om brugere kan logge ind. DU SKAL FØRST OPDATERE OG GEMME DINE LDAP INDSTILLINGER.',
     'ldap_server'               => 'LDAP-server',
diff --git a/resources/lang/da/admin/users/message.php b/resources/lang/da/admin/users/message.php
index 6dd88d3127..e08c67177b 100644
--- a/resources/lang/da/admin/users/message.php
+++ b/resources/lang/da/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
     'user_deleted_warning'      => 'Denne bruger er blevet slettet. Du skal gendanne denne bruger for at redigere dem eller tildele dem nye aktiver.',
     'ldap_not_configured'        => 'LDAP-integration er ikke konfigureret til denne installation.',
     'password_resets_sent'      => 'De valgte brugere, der er aktiveret og har en gyldig e-mail-adresser, har fået tilsendt et link til nulstilling af adgangskode.',
+    'password_reset_sent'       => 'A password reset link has been sent to :email!',
 
 
     'success' => array(
diff --git a/resources/lang/da/button.php b/resources/lang/da/button.php
index f29496bc21..ac9cf74d91 100644
--- a/resources/lang/da/button.php
+++ b/resources/lang/da/button.php
@@ -14,4 +14,5 @@ return array(
 	'select_file'				=> 'Vælg fil ...',
     'select_files'				=> 'Vælg filer...',
     'generate_labels'           => '{1} Generer etiketter [2,*] Generer etiketter',
+    'send_password_link'       => 'Send Password Reset Link',
 );
diff --git a/resources/lang/de/admin/categories/general.php b/resources/lang/de/admin/categories/general.php
index 0b9c00f4cc..6871311983 100644
--- a/resources/lang/de/admin/categories/general.php
+++ b/resources/lang/de/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'Kategorie aktualisieren',
     'use_default_eula'					=> 'Die <a href="#" data-toggle="modal" data-target="#eulaModal">Standard EULA</a> stattdessen verwenden.',
     'use_default_eula_disabled'			=> '<del>Die Standard-EULA verwenden.</del> Es wurde keine Standard-EULA definiert. Bitte fügen Sie eine in den Einstellungen hinzu.',
+    'use_default_eula_column'			=> 'Standard EULA verwenden',
 
 );
diff --git a/resources/lang/de/admin/hardware/general.php b/resources/lang/de/admin/hardware/general.php
index 726a059777..18750fc3c1 100644
--- a/resources/lang/de/admin/hardware/general.php
+++ b/resources/lang/de/admin/hardware/general.php
@@ -10,9 +10,9 @@ return array(
     'checkout'  				=> 'Asset herausgeben',
     'clone'  					=> 'Asset duplizieren',
     'deployable'  				=> 'Einsetzbar',
-    'deleted'  					=> 'This asset has been deleted.',
+    'deleted'  					=> 'Dieses Asset wurde gelöscht.',
     'edit'  					=> 'Asset bearbeiten',
-    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
+    'model_deleted'  			=> 'Dieses Modell für Assets wurde gelöscht. Sie müssen das Modell wiederherstellen, bevor Sie das Asset wiederherstellen können.',
     'requestable'               => 'Anforderbar',
     'requested'				    => 'Angefordert',
     'restore'  					=> 'Asset wiederherstellen',
diff --git a/resources/lang/de/admin/models/general.php b/resources/lang/de/admin/models/general.php
index 1ad5b87f10..0580841319 100644
--- a/resources/lang/de/admin/models/general.php
+++ b/resources/lang/de/admin/models/general.php
@@ -3,9 +3,9 @@
 return array(
     'about_models_title'     => 'Über Asset-Modelle',
     'about_models_text'           => 'Asset-Modelle sind eine Möglichkeit, identische Assets zu gruppieren. "MBP 2013", "IPhone 6 s" usw.',
-    'deleted'  					        => 'This model has been deleted.',
+    'deleted'  					        => 'Dieses Modell wurde gelöscht.',
     'bulk_delete'               => 'Massenlöschen von Asset-Modellen',
-    'bulk_delete_help'               => 'Nutzen Sie die nachfolgenden Kontrollkästchen, um die Löschung der Asset-Modelle zu bestätigen. Asset-Modelle die noch zugewiesene Assets haben können nur dann gelöscht werden, wenn die enthaltenen Assets einem anderem Asset-Modell zugewiesen werden.',
+    'bulk_delete_help'               => 'Nutzen Sie die nachfolgenden Kontrollkästchen, um die Löschung der Asset-Modelle zu bestätigen. Asset-Modelle, die noch zugewiesene Assets haben, können nur dann gelöscht werden, wenn die enthaltenen Assets einem anderen Asset-Modell zugewiesen werden.',
     'bulk_delete_warn'          => 'Sie sind im Begriff :model_count Asset-Modelle zu löschen.',
     'restore'                   => 'Modell wiederherstellen',
     'requestable'               => 'Benutzer können dieses Modell anfordern',
diff --git a/resources/lang/de/admin/settings/general.php b/resources/lang/de/admin/settings/general.php
index 1daec89f2b..641a831c2a 100644
--- a/resources/lang/de/admin/settings/general.php
+++ b/resources/lang/de/admin/settings/general.php
@@ -61,9 +61,12 @@ return array(
     'label_logo'                => 'Label-Logo',
     'label_logo_size'           => 'Quadratische Logos sehen am besten aus und werden rechts oben auf jedem Asset-Label angezeigt. ',
     'laravel'                   => 'Laravel Version',
+    'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Zertifikat',
     'ldap_enabled'              => 'LDAP aktiviert',
     'ldap_integration'          => 'LDAP Integration',
     'ldap_settings'             => 'LDAP Einstellungen',
+    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_login_test_help'      => 'Geben Sie einen gültigen LDAP-Benutzernamen und ein Passwort von der oben angegebenen Basis-DN ein, um zu testen, ob Ihre LDAP-Anmeldung korrekt konfiguriert ist. SIE MÜSSEN IHRE AKTUALISIERTEN LDAP-EINSTELLUNGEN ZUERST SPEICHERN.',
     'ldap_login_sync_help'      => 'Dies testet nur, ob LDAP korrekt synchronisiert werden kann. Wenn Ihre LDAP-Authentifizierungsabfrage nicht korrekt ist, können sich Benutzer möglicherweise nicht anmelden. SIE MÜSSEN IHRE AKTUALISIERTEN LDAP-EINSTELLUNGEN ZUERST SPEICHERN.',
     'ldap_server'               => 'LDAP Server',
diff --git a/resources/lang/de/admin/users/message.php b/resources/lang/de/admin/users/message.php
index 2a87c36b82..df534206fe 100644
--- a/resources/lang/de/admin/users/message.php
+++ b/resources/lang/de/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
     'user_deleted_warning'      => 'Dieser Benutzer wurde gelöscht. Sie müssen ihn wiederherstellen, um ihn zu bearbeiten oder neue Assets zuzuweisen.',
     'ldap_not_configured'        => 'LDAP Integration wurde für diese Installation nicht konfiguriert.',
     'password_resets_sent'      => 'Den ausgewählten Benutzern, die aktiviert sind und eine gültige E-Mail-Adresse haben, wurde ein Link zum Zurücksetzen des Passworts gesendet.',
+    'password_reset_sent'       => 'Der Link zum Zurücksetzen des Passworts wurde an :email gesendet!',
 
 
     'success' => array(
diff --git a/resources/lang/de/button.php b/resources/lang/de/button.php
index 88e31e9f90..cffec4f2b9 100644
--- a/resources/lang/de/button.php
+++ b/resources/lang/de/button.php
@@ -14,4 +14,5 @@ return array(
 	'select_file'				=> 'Datei auswählen...',
     'select_files'				=> 'Dateien auswählen...',
     'generate_labels'           => '{1} Label generieren|[2,*] Labels generieren',
+    'send_password_link'       => 'Link zum Zurücksetzen des Passworts senden',
 );
diff --git a/resources/lang/de/general.php b/resources/lang/de/general.php
index f0515fdd86..49efc43df0 100644
--- a/resources/lang/de/general.php
+++ b/resources/lang/de/general.php
@@ -176,7 +176,7 @@
     'remove_company'        => 'Firmenzuordnung entfernen',
     'reports'				=> 'Berichte',
     'restored'				=> 'wiederhergestellt',
-    'restore'				=> 'Restore',
+    'restore'				=> 'Wiederherstellen',
     'requested'				=> 'Angefragt',
     'request_canceled'      => 'Anfrage abgebrochen',
     'save'  				=> 'Speichern',
diff --git a/resources/lang/de/mail.php b/resources/lang/de/mail.php
index 51a0a07427..ab42f87c2a 100644
--- a/resources/lang/de/mail.php
+++ b/resources/lang/de/mail.php
@@ -22,7 +22,7 @@ return array(
     'Confirm_Accessory_Checkin' => 'Zurücknehmen von Zubehör bestätigen',
     'Confirm_accessory_delivery' => 'Zubehör Herausgabe bestätigen',
     'Confirm_license_delivery' => 'Lizenz Herausgabe bestätigen',
-    'Confirm_asset_delivery' => 'Gegenstands Herausgabe bestätigen',
+    'Confirm_asset_delivery' => 'Bestätigung einer Asset Herausgabe',
     'Confirm_consumable_delivery' => 'Verbrauchsmaterial Herausgabe bestätigen',
     'current_QTY' => 'Aktuelle Menge',
     'Days' => 'Tage',
diff --git a/resources/lang/el/admin/categories/general.php b/resources/lang/el/admin/categories/general.php
index b6780e9e4d..74b080007c 100644
--- a/resources/lang/el/admin/categories/general.php
+++ b/resources/lang/el/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'Ενημέρωση Κατηγορίας',
     'use_default_eula'					=> 'Χρησιμοποιήστε την προεπιλεγμένη <a href="#" data-toggle="modal" data-target="#eulaModal">primary EULA</a>.',
     'use_default_eula_disabled'			=> '<del>Χρησιμοποιήστε την αρχική προεπιλεγμένη άδεια EULA αντί.</del> Δεν έχει οριστεί αρχική προεπιλεγμένη ευχέρεια EULA. Προσθέστε μία από τις Ρυθμίσεις.',
+    'use_default_eula_column'			=> 'Use default EULA',
 
 );
diff --git a/resources/lang/el/admin/settings/general.php b/resources/lang/el/admin/settings/general.php
index cffed4b5fa..855064df1e 100644
--- a/resources/lang/el/admin/settings/general.php
+++ b/resources/lang/el/admin/settings/general.php
@@ -61,9 +61,12 @@ return array(
     'label_logo'                => 'Label Logo',
     'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
     'laravel'                   => 'Έκδοση οδηγού',
+    'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Certificate',
     'ldap_enabled'              => 'Ενεργό LDAP',
     'ldap_integration'          => 'Ενσωμάτωση LDAP',
     'ldap_settings'             => 'Ρυθμίσεις LDAP',
+    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_login_test_help'      => 'Εισαγάγετε ένα έγκυρο όνομα χρήστη και κωδικό πρόσβασης LDAP από τη βάση DN που καθορίσατε παραπάνω για να ελέγξετε εάν η σύνδεσή LDAP έχει ρυθμιστεί σωστά. ΠΡΩΤΑ ΑΠΟΘΗΚΕΥΣΤΕ ΤΙΣ ΡΥΘΜΙΣΕΙΣ ΣΑΣ ΣΤΟ LDAP.',
     'ldap_login_sync_help'      => 'Αυτό ελέγχει μόνο ότι το LDAP μπορεί να συγχρονιστεί σωστά. Εάν το Authentication στο LDAP δεν είναι σωστό, οι χρήστες ενδέχεται να μην μπορούν να συνδεθούν. ΠΡΩΤΑ ΑΠΟΘΗΚΕΥΣΤΕ ΤΙΣ ΡΥΘΜΙΣΕΙΣ ΣΑΣ ΣΤΟ LDAP.',
     'ldap_server'               => 'LDAP Server',
diff --git a/resources/lang/el/admin/users/message.php b/resources/lang/el/admin/users/message.php
index fe0f821c4e..5531497e35 100644
--- a/resources/lang/el/admin/users/message.php
+++ b/resources/lang/el/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
     'user_deleted_warning'      => 'Αυτός ο χρήστης έχει διαγραφεί. Θα πρέπει να επαναφέρετε αυτό το χρήστη για να τον επεξεργαστείτε ή να του εκχωρήσετε νέα πάγια.',
     'ldap_not_configured'        => 'Η ενσωμάτωση LDAP δεν έχει ρυθμιστεί για αυτήν την εγκατάσταση.',
     'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
+    'password_reset_sent'       => 'A password reset link has been sent to :email!',
 
 
     'success' => array(
diff --git a/resources/lang/el/button.php b/resources/lang/el/button.php
index 949a2c097a..c69598e7ef 100644
--- a/resources/lang/el/button.php
+++ b/resources/lang/el/button.php
@@ -14,4 +14,5 @@ return array(
 	'select_file'				=> 'Επιλέξτε Αρχείο ...',
     'select_files'				=> 'Επιλογή αρχείων...',
     'generate_labels'           => '{1} Generate Label|[2,*] Generate Labels',
+    'send_password_link'       => 'Send Password Reset Link',
 );
diff --git a/resources/lang/en-GB/admin/categories/general.php b/resources/lang/en-GB/admin/categories/general.php
index 7741b7da62..52e936d0b6 100644
--- a/resources/lang/en-GB/admin/categories/general.php
+++ b/resources/lang/en-GB/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'Update Category',
     'use_default_eula'					=> 'Use the <a href="#" data-toggle="modal" data-target="#eulaModal">primary default EULA</a> instead.',
     'use_default_eula_disabled'			=> '<del>Use the primary default EULA instead.</del> No primary default EULA is set. Please add one in Settings.',
+    'use_default_eula_column'			=> 'Use default EULA',
 
 );
diff --git a/resources/lang/en-GB/admin/settings/general.php b/resources/lang/en-GB/admin/settings/general.php
index f1ee4504c4..80497c6c64 100644
--- a/resources/lang/en-GB/admin/settings/general.php
+++ b/resources/lang/en-GB/admin/settings/general.php
@@ -61,9 +61,12 @@ return array(
     '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',
+    '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_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_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_server'               => 'LDAP Server',
diff --git a/resources/lang/en-GB/admin/users/message.php b/resources/lang/en-GB/admin/users/message.php
index 65a75b08c2..85d016f04a 100644
--- a/resources/lang/en-GB/admin/users/message.php
+++ b/resources/lang/en-GB/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
     'user_deleted_warning'      => 'This user has been deleted. You will have to restore this user to edit them or assign them new assets.',
     'ldap_not_configured'        => 'LDAP integration has not been configured for this installation.',
     'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
+    'password_reset_sent'       => 'A password reset link has been sent to :email!',
 
 
     'success' => array(
diff --git a/resources/lang/en-GB/button.php b/resources/lang/en-GB/button.php
index 2b97223250..27131e5fc6 100644
--- a/resources/lang/en-GB/button.php
+++ b/resources/lang/en-GB/button.php
@@ -14,4 +14,5 @@ return array(
 	'select_file'				=> 'Select File...',
     'select_files'				=> 'Select Files...',
     'generate_labels'           => '{1} Generate Label|[2,*] Generate Labels',
+    'send_password_link'       => 'Send Password Reset Link',
 );
diff --git a/resources/lang/en-ID/admin/categories/general.php b/resources/lang/en-ID/admin/categories/general.php
index 13df77cf59..0e68d2fa69 100644
--- a/resources/lang/en-ID/admin/categories/general.php
+++ b/resources/lang/en-ID/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'Update Kategori',
     'use_default_eula'					=> 'Gunakan <a href="#" data-toggle="modal" data-target="#eulaModal"> standar primer EULA </a> gantinya.',
     'use_default_eula_disabled'			=> '<del> Gunakan EULA standar utama sebagai gantinya. </ del> Tidak ada standar utama EULA diatur. Silakan menambahkan satu di Settings.',
+    'use_default_eula_column'			=> 'Gunakan kebijakan bawaan',
 
 );
diff --git a/resources/lang/en-ID/admin/hardware/general.php b/resources/lang/en-ID/admin/hardware/general.php
index c5c9623dc0..39c0625add 100644
--- a/resources/lang/en-ID/admin/hardware/general.php
+++ b/resources/lang/en-ID/admin/hardware/general.php
@@ -10,7 +10,7 @@ return array(
     'checkout'  				=> 'Periksa aset',
     'clone'  					=> 'Gandakan aset',
     'deployable'  				=> 'Bisa dicairkan',
-    'deleted'  					=> 'This asset has been deleted.',
+    'deleted'  					=> 'Aset ini telah dihapus.',
     'edit'  					=> 'Edit Asset',
     'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
     'requestable'               => 'Permintaan',
diff --git a/resources/lang/en-ID/admin/settings/general.php b/resources/lang/en-ID/admin/settings/general.php
index 726b0fbbdf..4ccf1b0fa4 100644
--- a/resources/lang/en-ID/admin/settings/general.php
+++ b/resources/lang/en-ID/admin/settings/general.php
@@ -61,9 +61,12 @@ return array(
     'label_logo'                => 'Logo Label',
     'label_logo_size'           => 'Logo berbentuk kotak terlihat bagus - akan ditampilkan pada bagian kanan atas dari setiap label aset. ',
     'laravel'                   => 'Versi Laravel',
+    'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Certificate',
     'ldap_enabled'              => 'Aktifkan LDAP',
     'ldap_integration'          => 'Integrasi LDAP',
     'ldap_settings'             => 'Pengaturan LDAP',
+    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_login_test_help'      => 'Masukkan nama pengguna dan kata sandi LDAP yang sah dari DN dasar yang anda tentukan di atas untuk menguji apakah proses masuk LDAP anda dikonfigurasi dengan benar. ANDA HARUS MENYIMPAN PENGATURAN LDAP YANG ANDA PERBARUI PERTAMA.',
     'ldap_login_sync_help'      => 'Ini hanya tes yang bisa dilacak LDAP dengan benar. Jika pengesahan LDAP anda tidak benar, pengguna mungkin masih belum dapat masuk. ANDA HARUS MENYIMPAN PENGATURAN LDAP YANG ANDA PERBARUI PERTAMA.',
     'ldap_server'               => 'Server LDAP',
diff --git a/resources/lang/en-ID/admin/users/message.php b/resources/lang/en-ID/admin/users/message.php
index a67ce0bdbc..1f1e49c20e 100644
--- a/resources/lang/en-ID/admin/users/message.php
+++ b/resources/lang/en-ID/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
     'user_deleted_warning'      => 'Pengguna ini sudah dihapus. Anda harus mengembalikan pengguna ini untuk menyuntingnya atau memberikannya aset baru.',
     'ldap_not_configured'        => 'Integrasi LDAP sudah tidak dikonfigurasikan untuk instalasi ini.',
     'password_resets_sent'      => 'Pengguna terpilih yang diaktifkan dan memiliki sebuah alamat email yang valid telah dikirimkan sebuah tautan pengaturan ulang kata sandi.',
+    'password_reset_sent'       => 'A password reset link has been sent to :email!',
 
 
     'success' => array(
diff --git a/resources/lang/en-ID/button.php b/resources/lang/en-ID/button.php
index 32dc18c090..04dc22a247 100644
--- a/resources/lang/en-ID/button.php
+++ b/resources/lang/en-ID/button.php
@@ -14,4 +14,5 @@ return array(
 	'select_file'				=> 'Pilih Berkas...',
     'select_files'				=> 'Pilih file...',
     'generate_labels'           => '{1} Generate Label|[2,*] Generate Labels',
+    'send_password_link'       => 'Send Password Reset Link',
 );
diff --git a/resources/lang/es-CO/admin/categories/general.php b/resources/lang/es-CO/admin/categories/general.php
index db7b638e17..90cfb074fb 100644
--- a/resources/lang/es-CO/admin/categories/general.php
+++ b/resources/lang/es-CO/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'Actualizar Categoría',
     'use_default_eula'					=> 'Usa la <a href="#" data-toggle="modal" data-target="#eulaModal">licencia primaria predeterminada</a> en su lugar.',
     'use_default_eula_disabled'			=> '<del>Usa la licencia primaria predeterminada en su lugar.</del> No se ha establecido ninguna licencia primaria predeterminada. Por favor, añade una en las Configuraciones.',
+    'use_default_eula_column'			=> 'Use default EULA',
 
 );
diff --git a/resources/lang/es-CO/admin/depreciations/table.php b/resources/lang/es-CO/admin/depreciations/table.php
index d0e2f193cc..49c5fcb36d 100644
--- a/resources/lang/es-CO/admin/depreciations/table.php
+++ b/resources/lang/es-CO/admin/depreciations/table.php
@@ -4,7 +4,7 @@ return array(
 
     'id'      => 'ID',
     'months'   => 'Meses',
-    'term'   => 'Termina',
+    'term'   => 'Períodos',
     'title'      => 'Nombre ',
 
 );
diff --git a/resources/lang/es-CO/admin/groups/message.php b/resources/lang/es-CO/admin/groups/message.php
index 4b7f99ca54..921da8509c 100644
--- a/resources/lang/es-CO/admin/groups/message.php
+++ b/resources/lang/es-CO/admin/groups/message.php
@@ -3,20 +3,20 @@
 return array(
 
     'group_exists'        => 'El grupo ya existe!',
-    'group_not_found'     => 'El grupo [:id] no existe.',
-    'group_name_required' => 'El campo nombre es obligatorio',
+    'group_not_found'     => 'El grupo[:id] no existe.',
+    'group_name_required' => 'El campo nombre es requerido',
 
     'success' => array(
-        'create' => 'Grupo creado.',
-        'update' => 'Grupo actualizado.',
-        'delete' => 'Grupo eliminado.',
+        'create' => 'El grupo fue creado exitosamente.',
+        'update' => 'El grupo fue actualizado exitosamente.',
+        'delete' => 'El grupo fue eliminado exitosamente.',
     ),
 
     'delete' => array(
-        'confirm'   => 'Seguroq que quieres Eliminar grupo?',
-        'create' => 'Ha habido un problema creando el grupo. Vuelve a intentarlo.',
-        'update' => 'Ha habido un problema actualizando el grupo. Vuelve a intentarlo.',
-        'delete' => 'Ha habido un problema eliminando el grupo. Vuelve a intentarlo.',
+        'confirm'   => '¿Está seguro que desea eliminar este grupo?',
+        'create' => 'Hubo un problema creando el grupo. Por favor intente nuevamente.',
+        'update' => 'Hubo un problema actualizando el grupo. Por favor, intente nuevamente.',
+        'delete' => 'Hubo un problema eliminando el grupo. Por favor, intente nuevamente.',
     ),
 
 );
diff --git a/resources/lang/es-CO/admin/groups/table.php b/resources/lang/es-CO/admin/groups/table.php
index c002d06ba8..1511815185 100644
--- a/resources/lang/es-CO/admin/groups/table.php
+++ b/resources/lang/es-CO/admin/groups/table.php
@@ -2,8 +2,8 @@
 
 return array(
 
-    'id'         => 'ID',
+    'id'         => 'Id',
     'name'       => 'Nombre',
-    'users'      => '# de Usuarios',
+    'users'      => '# de usuarios',
 
 );
diff --git a/resources/lang/es-CO/admin/groups/titles.php b/resources/lang/es-CO/admin/groups/titles.php
index c9d6ca4a6d..c939dfa6b0 100644
--- a/resources/lang/es-CO/admin/groups/titles.php
+++ b/resources/lang/es-CO/admin/groups/titles.php
@@ -4,10 +4,10 @@ return array(
     'about_groups_title'            => 'Acerca de los grupos',
     'about_groups'                  => 'Los Grupos son usados para generar permisos de usuarios.',
     'group_management' 	 	=> 'Gestión de Grupos',
-    'create' 	 	 	    => 'Crear un grupo nuevo',
+    'create' 	 	 	    => 'Crear un Nuevo Grupo',
     'update' 	 		        => 'Editar Grupo',
-    'group_name' 	 		=> 'Nombre de Grupo',
-    'group_admin' 	 		=> 'Admin Grupo',
+    'group_name' 	 		=> 'Nombre del Grupo',
+    'group_admin' 	 		=> 'Administración del Grupo',
     'allow' 	 			=> 'Permitir',
     'deny' 	 				=> 'Denegar',
 
diff --git a/resources/lang/es-CO/admin/settings/general.php b/resources/lang/es-CO/admin/settings/general.php
index 1bf7921155..fc4d83fa50 100644
--- a/resources/lang/es-CO/admin/settings/general.php
+++ b/resources/lang/es-CO/admin/settings/general.php
@@ -61,9 +61,12 @@ return array(
     'label_logo'                => 'Logo de etiqueta',
     'label_logo_size'           => 'Los logos cuadrados se ven mejor - se mostrarán en la parte superior derecha de cada etiqueta de activo. ',
     'laravel'                   => 'Versión de Laravel',
+    'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Certificate',
     'ldap_enabled'              => 'LDAP activado',
     'ldap_integration'          => 'Integración LDAP',
     'ldap_settings'             => 'Ajustes LDAP',
+    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_login_test_help'      => 'Introduce un nombre de usuario LDAP válido y una contraseña de la DN base que especificaste anteriormente para probar si tu inicio de sesión LDAP está configurado correctamente. DEBES GUARDAR TUS CONFIGURACIONES LDAP ACTUALIZADAS PRIMERO.',
     'ldap_login_sync_help'      => 'Esto sólo prueba que LDAP puede sincronizarse correctamente. Si tu solicitud de Autenticación LDAP no es correcta, los usuarios aún no podrían iniciar sesión. DEBES GUARDAR TUS CONFIGURACIONES LDAP ACTUALIZADAS PRIMERO.',
     'ldap_server'               => 'Servidor LDAP',
diff --git a/resources/lang/es-CO/admin/users/message.php b/resources/lang/es-CO/admin/users/message.php
index 56d0931192..c70514b9ae 100644
--- a/resources/lang/es-CO/admin/users/message.php
+++ b/resources/lang/es-CO/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
     'user_deleted_warning'      => 'Este usuario ha sido eliminado. Deberá restaurarlo para editarlo o asignarle nuevos Equipos.',
     'ldap_not_configured'        => 'La integración con LDAP no ha sido configurada para esta instalación.',
     'password_resets_sent'      => 'A los usuarios seleccionados que están activados y tienen una dirección de correo electrónico válida se les ha enviado un enlace de restablecimiento de contraseña.',
+    'password_reset_sent'       => 'A password reset link has been sent to :email!',
 
 
     'success' => array(
diff --git a/resources/lang/es-CO/button.php b/resources/lang/es-CO/button.php
index 7b3b7ca845..11105c3f1e 100644
--- a/resources/lang/es-CO/button.php
+++ b/resources/lang/es-CO/button.php
@@ -14,4 +14,5 @@ return array(
 	'select_file'				=> 'Seleccionar Archivo...',
     'select_files'				=> 'Selecciona Archivos...',
     'generate_labels'           => '{1} Generar Etiqueta|[2,*] Generar Etiquetas',
+    'send_password_link'       => 'Send Password Reset Link',
 );
diff --git a/resources/lang/es-CO/general.php b/resources/lang/es-CO/general.php
index b6f0d3c47d..68b1f02bfd 100644
--- a/resources/lang/es-CO/general.php
+++ b/resources/lang/es-CO/general.php
@@ -176,7 +176,7 @@
     'remove_company'        => 'Eliminar Asociación de compañía',
     'reports'				=> 'Informes',
     'restored'				=> 'restaurado',
-    'restore'				=> 'Restore',
+    'restore'				=> 'Restaurar',
     'requested'				=> 'Solicitado',
     'request_canceled'      => 'Solicitud Cancelada',
     'save'  				=> 'Guardar',
diff --git a/resources/lang/es-CO/validation.php b/resources/lang/es-CO/validation.php
index 6b6dce9561..9e062d9551 100644
--- a/resources/lang/es-CO/validation.php
+++ b/resources/lang/es-CO/validation.php
@@ -13,10 +13,10 @@ return array(
     |
     */
 
-    'accepted'             => ':attribute debe ser aceptado.',
-    'active_url'           => ':attribute no es una URL correcta.',
-    'after'                => ':attribute debe ser posterior a :date.',
-    'after_or_equal'       => 'El atributo: debe ser una fecha posterior o igual a: fecha.',
+    'accepted'             => 'El :attribute debe ser aceptado.',
+    'active_url'           => 'El campo :atribute no es una URL válida.',
+    'after'                => 'El campo :atribute debe ser una fecha posterior a :date.',
+    'after_or_equal'       => 'El campo :atribute debe ser una fecha posterior o igual a :date.',
     'alpha'                => ':attribute solo acepta letras.',
     'alpha_dash'           => ':attribute solo acepta letras, números y guiones.',
     'alpha_num'            => ':attribute solo acepta letras y números.',
diff --git a/resources/lang/es-ES/admin/categories/general.php b/resources/lang/es-ES/admin/categories/general.php
index cee2b85b16..daaf0d19cc 100644
--- a/resources/lang/es-ES/admin/categories/general.php
+++ b/resources/lang/es-ES/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'Actualizar Categoría',
     'use_default_eula'					=> 'En su lugar, use el <a href="#" data-toggle="modal" data-target="#eulaModal">EULA por defecto</a>.',
     'use_default_eula_disabled'			=> '<del>En su lugar, use el EULA por defecto.</del> No esta configurado un EULA por defecto. Por favor agregue uno en Configuración.',
+    'use_default_eula_column'			=> 'Use default EULA',
 
 );
diff --git a/resources/lang/es-ES/admin/settings/general.php b/resources/lang/es-ES/admin/settings/general.php
index 1bf7921155..fc4d83fa50 100644
--- a/resources/lang/es-ES/admin/settings/general.php
+++ b/resources/lang/es-ES/admin/settings/general.php
@@ -61,9 +61,12 @@ return array(
     'label_logo'                => 'Logo de etiqueta',
     'label_logo_size'           => 'Los logos cuadrados se ven mejor - se mostrarán en la parte superior derecha de cada etiqueta de activo. ',
     'laravel'                   => 'Versión de Laravel',
+    'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Certificate',
     'ldap_enabled'              => 'LDAP activado',
     'ldap_integration'          => 'Integración LDAP',
     'ldap_settings'             => 'Ajustes LDAP',
+    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_login_test_help'      => 'Introduce un nombre de usuario LDAP válido y una contraseña de la DN base que especificaste anteriormente para probar si tu inicio de sesión LDAP está configurado correctamente. DEBES GUARDAR TUS CONFIGURACIONES LDAP ACTUALIZADAS PRIMERO.',
     'ldap_login_sync_help'      => 'Esto sólo prueba que LDAP puede sincronizarse correctamente. Si tu solicitud de Autenticación LDAP no es correcta, los usuarios aún no podrían iniciar sesión. DEBES GUARDAR TUS CONFIGURACIONES LDAP ACTUALIZADAS PRIMERO.',
     'ldap_server'               => 'Servidor LDAP',
diff --git a/resources/lang/es-ES/admin/users/message.php b/resources/lang/es-ES/admin/users/message.php
index 56d0931192..c70514b9ae 100644
--- a/resources/lang/es-ES/admin/users/message.php
+++ b/resources/lang/es-ES/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
     'user_deleted_warning'      => 'Este usuario ha sido eliminado. Deberá restaurarlo para editarlo o asignarle nuevos Equipos.',
     'ldap_not_configured'        => 'La integración con LDAP no ha sido configurada para esta instalación.',
     'password_resets_sent'      => 'A los usuarios seleccionados que están activados y tienen una dirección de correo electrónico válida se les ha enviado un enlace de restablecimiento de contraseña.',
+    'password_reset_sent'       => 'A password reset link has been sent to :email!',
 
 
     'success' => array(
diff --git a/resources/lang/es-ES/button.php b/resources/lang/es-ES/button.php
index 7b3b7ca845..11105c3f1e 100644
--- a/resources/lang/es-ES/button.php
+++ b/resources/lang/es-ES/button.php
@@ -14,4 +14,5 @@ return array(
 	'select_file'				=> 'Seleccionar Archivo...',
     'select_files'				=> 'Selecciona Archivos...',
     'generate_labels'           => '{1} Generar Etiqueta|[2,*] Generar Etiquetas',
+    'send_password_link'       => 'Send Password Reset Link',
 );
diff --git a/resources/lang/es-ES/general.php b/resources/lang/es-ES/general.php
index d4fa036d8b..27acaddac0 100644
--- a/resources/lang/es-ES/general.php
+++ b/resources/lang/es-ES/general.php
@@ -176,7 +176,7 @@
     'remove_company'        => 'Eliminar Asociación de compañía',
     'reports'				=> 'Informes',
     'restored'				=> 'restaurado',
-    'restore'				=> 'Restore',
+    'restore'				=> 'Restaurar',
     'requested'				=> 'Solicitado',
     'request_canceled'      => 'Solicitud Cancelada',
     'save'  				=> 'Guardar',
diff --git a/resources/lang/es-MX/admin/categories/general.php b/resources/lang/es-MX/admin/categories/general.php
index 4c7d977ebb..022583a437 100644
--- a/resources/lang/es-MX/admin/categories/general.php
+++ b/resources/lang/es-MX/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'Actualizar Categoría',
     'use_default_eula'					=> 'En su lugar, use el <a href="#" data-toggle="modal" data-target="#eulaModal">EULA por defecto</a>.',
     'use_default_eula_disabled'			=> '<del>En su lugar, use el EULA por defecto.</del> No esta configurado un EULA por defecto. Por favor agregue uno en Configuración.',
+    'use_default_eula_column'			=> 'Use default EULA',
 
 );
diff --git a/resources/lang/es-MX/admin/settings/general.php b/resources/lang/es-MX/admin/settings/general.php
index 52b71df478..49aa4ed2f0 100644
--- a/resources/lang/es-MX/admin/settings/general.php
+++ b/resources/lang/es-MX/admin/settings/general.php
@@ -61,9 +61,12 @@ return array(
     'label_logo'                => 'Logo de etiqueta',
     'label_logo_size'           => 'Los logos cuadrados se ven mejor - se mostrarán en la parte superior derecha de cada etiqueta de activo. ',
     'laravel'                   => 'Versión de Laravel',
+    'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Certificate',
     'ldap_enabled'              => 'LDAP activado',
     'ldap_integration'          => 'Integración LDAP',
     'ldap_settings'             => 'Ajustes LDAP',
+    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_login_test_help'      => 'Introduce un nombre de usuario LDAP válido y una contraseña de la DN base que especificaste anteriormente para probar si tu inicio de sesión LDAP está configurado correctamente. DEBES GUARDAR TUS CONFIGURACIONES LDAP ACTUALIZADAS PRIMERO.',
     'ldap_login_sync_help'      => 'Esto sólo prueba que LDAP puede sincronizarse correctamente. Si tu solicitud de Autenticación LDAP no es correcta, los usuarios aún no podrían iniciar sesión. DEBES GUARDAR TUS CONFIGURACIONES LDAP ACTUALIZADAS PRIMERO.',
     'ldap_server'               => 'Servidor LDAP',
diff --git a/resources/lang/es-MX/admin/users/message.php b/resources/lang/es-MX/admin/users/message.php
index 8cbde9484e..8a1ae74778 100644
--- a/resources/lang/es-MX/admin/users/message.php
+++ b/resources/lang/es-MX/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
     'user_deleted_warning'      => 'Este usuario ha sido eliminado. Deberá restaurarlo para editarlo o asignarle nuevos Equipos.',
     'ldap_not_configured'        => 'La integración con LDAP no ha sido configurada para esta instalación.',
     'password_resets_sent'      => 'Los usuarios seleccionados que están activados y tienen una dirección de correo electrónico válida han sido enviados un enlace de restablecimiento de contraseña.',
+    'password_reset_sent'       => 'A password reset link has been sent to :email!',
 
 
     'success' => array(
diff --git a/resources/lang/es-MX/button.php b/resources/lang/es-MX/button.php
index a840417c24..e965cf5d7d 100644
--- a/resources/lang/es-MX/button.php
+++ b/resources/lang/es-MX/button.php
@@ -14,4 +14,5 @@ return array(
 	'select_file'				=> 'Seleccionar Archivo...',
     'select_files'				=> 'Select Files...',
     'generate_labels'           => '{1} Generar Etiqueta|[2,*] Generar Etiquetas',
+    'send_password_link'       => 'Send Password Reset Link',
 );
diff --git a/resources/lang/es-MX/general.php b/resources/lang/es-MX/general.php
index 693e1a48be..5d02cf43c7 100644
--- a/resources/lang/es-MX/general.php
+++ b/resources/lang/es-MX/general.php
@@ -176,7 +176,7 @@
     'remove_company'        => 'Eliminar Asociación de compañía',
     'reports'				=> 'Informes',
     'restored'				=> 'restaurado',
-    'restore'				=> 'Restore',
+    'restore'				=> 'Restaurar',
     'requested'				=> 'Solicitado',
     'request_canceled'      => 'Solicitud Cancelada',
     'save'  				=> 'Guardar',
diff --git a/resources/lang/es-VE/admin/categories/general.php b/resources/lang/es-VE/admin/categories/general.php
index 8b4798699d..1a66c8c9f6 100644
--- a/resources/lang/es-VE/admin/categories/general.php
+++ b/resources/lang/es-VE/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'Actualizar Categoría',
     'use_default_eula'					=> 'Usa la <a href="#" data-toggle="modal" data-target="#eulaModal">licencia primaria por defecto</a> en su lugar.',
     'use_default_eula_disabled'			=> '<del>Usa la licencia primaria por defecto en su lugar.</del> No se ha establecido una licencia primaria por defecto. Por favor, añade una en las configuraciones.',
+    'use_default_eula_column'			=> 'Use default EULA',
 
 );
diff --git a/resources/lang/es-VE/admin/settings/general.php b/resources/lang/es-VE/admin/settings/general.php
index 6e14bd0fff..8b48752881 100644
--- a/resources/lang/es-VE/admin/settings/general.php
+++ b/resources/lang/es-VE/admin/settings/general.php
@@ -61,9 +61,12 @@ return array(
     'label_logo'                => 'Logo de etiqueta',
     'label_logo_size'           => 'Los logos cuadrados se ven mejor - se mostrarán en la parte superior derecha de cada etiqueta de activo. ',
     'laravel'                   => 'Versión de Lavarel',
+    'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Certificate',
     'ldap_enabled'              => 'LDAP activado',
     'ldap_integration'          => 'Integración LDAP',
     'ldap_settings'             => 'Configuración LDAP',
+    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_login_test_help'      => 'Introduce un usuario y contraseña LDAP válidos desde la base DN que especificaste antes para probar si tu inicio de sesión LDAP está configurado correctamente. DEBES GUARDAR TUS CONFIGURACIONES LDAP ACTUALIZADAS PRIMERO.',
     'ldap_login_sync_help'      => 'Esto solo prueba que LDAP puede sincronizarse correctamente. Si tu solicitud de Autenticación LDAP no es correcta, los usuarios no podrían iniciar sesión. DEBES GUARDAR TUS CONFIGURACIONES LDAP ACTUALIZADAS PRIMERO.',
     'ldap_server'               => 'Servidor LDAP',
diff --git a/resources/lang/es-VE/admin/users/message.php b/resources/lang/es-VE/admin/users/message.php
index b6b99fff2c..cdbed78512 100644
--- a/resources/lang/es-VE/admin/users/message.php
+++ b/resources/lang/es-VE/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
     'user_deleted_warning'      => 'Este usuario ha sido eliminado. Deberás restaurar este usuario para editarlo o asignarle nuevos activos.',
     'ldap_not_configured'        => 'La integración LDAP no ha sido configurada para esta instalación.',
     'password_resets_sent'      => 'A los usuarios seleccionados que están activados y tienen una dirección de correo electrónico válida se les ha enviado un enlace de restablecimiento de contraseña.',
+    'password_reset_sent'       => 'A password reset link has been sent to :email!',
 
 
     'success' => array(
diff --git a/resources/lang/es-VE/button.php b/resources/lang/es-VE/button.php
index 816fe9c45f..23661d5fe5 100644
--- a/resources/lang/es-VE/button.php
+++ b/resources/lang/es-VE/button.php
@@ -14,4 +14,5 @@ return array(
 	'select_file'				=> 'Seleccionar Archivo...',
     'select_files'				=> 'Selecciona Archivos...',
     'generate_labels'           => '{1} Generar Etiqueta|[2,*] Generar Etiquetas',
+    'send_password_link'       => 'Send Password Reset Link',
 );
diff --git a/resources/lang/es-VE/general.php b/resources/lang/es-VE/general.php
index e00eb7b9a3..b396f9d982 100644
--- a/resources/lang/es-VE/general.php
+++ b/resources/lang/es-VE/general.php
@@ -176,7 +176,7 @@
     'remove_company'        => 'Eliminar Asociación de la Compañía',
     'reports'				=> 'Reportes',
     'restored'				=> 'restaurado',
-    'restore'				=> 'Restore',
+    'restore'				=> 'Restaurar',
     'requested'				=> 'Solicitado',
     'request_canceled'      => 'Solicitud Cancelada',
     'save'  				=> 'Guardar',
diff --git a/resources/lang/et/admin/accessories/message.php b/resources/lang/et/admin/accessories/message.php
index 8ecf60c1c5..ac6125c262 100644
--- a/resources/lang/et/admin/accessories/message.php
+++ b/resources/lang/et/admin/accessories/message.php
@@ -2,7 +2,7 @@
 
 return array(
 
-    'does_not_exist' => 'The accessory [:id] does not exist.',
+    'does_not_exist' => 'Lisaseade [:id] ei eksisteeri.',
     'assoc_users'	 => 'See lisavarustus on praegu: kasutajate poolt kontrollitud arvude arv. Palun kontrollige tarvikuid ja proovige uuesti.',
 
     'create' => array(
diff --git a/resources/lang/et/admin/asset_maintenances/general.php b/resources/lang/et/admin/asset_maintenances/general.php
index 94632cd94c..7a79f566db 100644
--- a/resources/lang/et/admin/asset_maintenances/general.php
+++ b/resources/lang/et/admin/asset_maintenances/general.php
@@ -8,7 +8,7 @@
         'repair'             => 'Remont',
         'maintenance'        => 'Hooldus',
         'upgrade'            => 'Uuendage',
-        'calibration'        => 'Calibration',
-        'software_support'   => 'Software Support',
-        'hardware_support'   => 'Hardware Support',
+        'calibration'        => 'Kalibreerimine',
+        'software_support'   => 'Tarkvara tugi',
+        'hardware_support'   => 'Riistvara tugi',
     ];
diff --git a/resources/lang/et/admin/categories/general.php b/resources/lang/et/admin/categories/general.php
index 8395c89601..c02a82436e 100644
--- a/resources/lang/et/admin/categories/general.php
+++ b/resources/lang/et/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'Uuenda kategooriat',
     'use_default_eula'					=> 'Kasuta hoopis <a href="#" data-toggle="modal" data-target="#eulaModal">peamist vaikimisi EULA-t</a>.',
     'use_default_eula_disabled'			=> '<del>Kasuta hoopis peamist vaikimisi EULAt.</del> Peamine vaikumisi EULA puudub. Lisa see seadete alt.',
+    'use_default_eula_column'			=> 'Kasuta vaikimisi EULA',
 
 );
diff --git a/resources/lang/et/admin/custom_fields/general.php b/resources/lang/et/admin/custom_fields/general.php
index bf231eb8b9..59dc0837f0 100644
--- a/resources/lang/et/admin/custom_fields/general.php
+++ b/resources/lang/et/admin/custom_fields/general.php
@@ -28,5 +28,5 @@ return array(
     'create_fieldset'         => 'New Fieldset',
     'create_field'            => 'Uus kohandatud väli',
     'value_encrypted'      	        => 'Selle välja väärtust krüpteeritakse andmebaasis. Dežrooveeritud väärtust saab vaadata ainult administraatoritel',
-    'show_in_email'     => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails.',
+    'show_in_email'     => 'Kas lisame selle välja väärtuse kasutajale väljastatud emailile? Krüpteerituid välju emailis pole näha.',
 );
diff --git a/resources/lang/et/admin/depreciations/general.php b/resources/lang/et/admin/depreciations/general.php
index 7db261f175..9b6e4645d4 100644
--- a/resources/lang/et/admin/depreciations/general.php
+++ b/resources/lang/et/admin/depreciations/general.php
@@ -8,6 +8,6 @@ return array(
     'depreciation_name'  					=> 'Amortisatsiooni nimi',
     'number_of_months'  					=> 'Kuude arv',
     'update'  					            => 'Kulumi ajakohastamine',
-    'depreciation_min'                      => 'Minimum Value after Depreciation'
+    'depreciation_min'                      => 'Miinimum väärtus pärast amortatsiooni'
 
 );
diff --git a/resources/lang/et/admin/hardware/general.php b/resources/lang/et/admin/hardware/general.php
index 1356f926f8..98b85b38e0 100644
--- a/resources/lang/et/admin/hardware/general.php
+++ b/resources/lang/et/admin/hardware/general.php
@@ -10,9 +10,9 @@ return array(
     'checkout'  				=> 'Checkout Asset',
     'clone'  					=> 'Klooni vahend',
     'deployable'  				=> 'Käivitatav',
-    'deleted'  					=> 'This asset has been deleted.',
+    'deleted'  					=> 'See vara on kustutatud.',
     'edit'  					=> 'Muuda vahendit',
-    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
+    'model_deleted'  			=> 'See vara mudel on kustutatud. Enne vara taastamist peab taastama mudeli.',
     'requestable'               => 'Taodeldav',
     'requested'				    => 'Taotletud',
     'restore'  					=> 'Taasta vara',
diff --git a/resources/lang/et/admin/hardware/table.php b/resources/lang/et/admin/hardware/table.php
index 3ae0b1e166..499319d3fe 100644
--- a/resources/lang/et/admin/hardware/table.php
+++ b/resources/lang/et/admin/hardware/table.php
@@ -20,6 +20,6 @@ return array(
     'title'      	=> 'Vara',
     'image'		=> 'Seadme pilt',
     'days_without_acceptance' => 'Päeva ilma vastuvõtmiseta',
-    'monthly_depreciation' => 'Monthly Depreciation'
+    'monthly_depreciation' => 'Igakuine amortatsioon'
 
 );
diff --git a/resources/lang/et/admin/kits/general.php b/resources/lang/et/admin/kits/general.php
index b4f2d90ae1..7f83d3f743 100644
--- a/resources/lang/et/admin/kits/general.php
+++ b/resources/lang/et/admin/kits/general.php
@@ -1,7 +1,7 @@
 <?php
 
 return array(
-    'about_kits_title'                  => 'About Predefined Kits',
+    'about_kits_title'                  => 'Eelnevalt määratud komplektidest',
     '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.',
diff --git a/resources/lang/et/admin/licenses/message.php b/resources/lang/et/admin/licenses/message.php
index 19b00a9144..99d5f81ed1 100644
--- a/resources/lang/et/admin/licenses/message.php
+++ b/resources/lang/et/admin/licenses/message.php
@@ -8,7 +8,7 @@ return array(
     'owner_doesnt_match_asset' => 'Vara, mida proovite selle litsentsiga siduda, kuulub somene-le, välja arvatud rippmenüüs määratud isik.',
     'assoc_users'	 => 'See litsents on kasutaja jaoks praegu välja jäetud ja seda ei saa kustutada. Kontrollige kõigepealt litsentsi ja seejärel proovige uuesti kustutada.',
     'select_asset_or_person' => 'Peate valima vara või kasutaja, kuid mitte mõlemad.',
-    'not_found' => 'License not found',
+    'not_found' => 'Litsentsi ei leitud',
 
 
     'create' => array(
diff --git a/resources/lang/et/admin/manufacturers/message.php b/resources/lang/et/admin/manufacturers/message.php
index 319596b6a1..8a436d7bad 100644
--- a/resources/lang/et/admin/manufacturers/message.php
+++ b/resources/lang/et/admin/manufacturers/message.php
@@ -16,8 +16,8 @@ return array(
     ),
 
     'restore' => array(
-        'error'   => 'Manufacturer was not restored, please try again',
-        'success' => 'Manufacturer restored successfully.'
+        'error'   => 'Tootjad ei taastatud, proovi uuesti',
+        'success' => 'Tootja taastati edukalt.'
     ),
 
     'delete' => array(
diff --git a/resources/lang/et/admin/models/general.php b/resources/lang/et/admin/models/general.php
index 6b13e43e54..8757ce8007 100644
--- a/resources/lang/et/admin/models/general.php
+++ b/resources/lang/et/admin/models/general.php
@@ -3,10 +3,10 @@
 return array(
     'about_models_title'     => 'Mudelitest',
     'about_models_text'           => 'Mudelid on selleks, et vahendeid grupeerida. "MBP 2013", "IPhone 6d", jne.',
-    'deleted'  					        => 'This model has been deleted.',
-    'bulk_delete'               => 'Bulk Delete Asset Models',
+    'deleted'  					        => 'See mudel on kustatud.',
+    'bulk_delete'               => 'Kustuta hulgi vara mudeleid',
     'bulk_delete_help'               => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
-    'bulk_delete_warn'          => 'You are about to delete :model_count asset models.',
+    'bulk_delete_warn'          => 'Sa oled kustutamas :model_count vara mudelit.',
     'restore'                   => 'Taasta mudel',
     'requestable'               => 'Kasutajad võivad seda mudelit tellida',
 	'show_mac_address'			      => 'Näita sellel mudelil MAC aadressi välja',
@@ -14,5 +14,5 @@ return array(
     'view_models'               => 'Vaata mudeleid',
     'fieldset'                  => 'Fieldset',
     'no_custom_field'           => 'Ei ole lisavälju',
-    'add_default_values'        => 'Add default values',
+    'add_default_values'        => 'Lisa vaikimisi väärtus',
 );
diff --git a/resources/lang/et/admin/settings/general.php b/resources/lang/et/admin/settings/general.php
index 924c9e2646..2ede32ca6e 100644
--- a/resources/lang/et/admin/settings/general.php
+++ b/resources/lang/et/admin/settings/general.php
@@ -4,9 +4,9 @@ return array(
     'ad'				        => 'Active Directory',
     'ad_domain'				    => 'Active Directory domeen',
     'ad_domain_help'			=> 'See on mõnikord sama kui teie e-posti domeen, kuid mitte alati.',
-    'ad_append_domain_label'    => 'Append domain name',
-    'ad_append_domain'          => 'Append domain name to username field',
-    'ad_append_domain_help'     => 'User isn\'t required to write "username@domain.local", they can just type "username".' ,
+    'ad_append_domain_label'    => 'Lisa domeeninimi',
+    'ad_append_domain'          => 'Lisa domeeninimi kasutaja lahtrisse',
+    'ad_append_domain_help'     => 'Kasutaja ei pea kirjutama "username@domain.local", nad võivad lihtsalt kirjutada "username".' ,
     'admin_cc_email'            => 'CC e-mail',
     'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
     'is_ad'				        => 'See on Active Directory server',
@@ -14,7 +14,7 @@ return array(
     'alerts_enabled'			=> 'Hoiatused on lubatud',
     'alert_interval'			=> 'Aegumatu häiretaseme künnis (päevades)',
     'alert_inv_threshold'		=> 'Inventari hoiatuslävi',
-    'allow_user_skin'           => 'Allow user skin',
+    'allow_user_skin'           => 'Luba kasutaja teemavaade',
     'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' ,
     'asset_ids'					=> 'Varade ID-d',
     'audit_interval'            => 'Auditi intervall',
@@ -32,8 +32,8 @@ return array(
     'custom_css_help'			=> 'Sisestage kõik kohandatud CSS-i muudatused, mida soovite kasutada. Ärge lisage silte &lt;style&gt;&lt;/style&gt;.',
     'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
     'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
-    'dashboard_message'			=> 'Dashboard Message',
-    'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
+    'dashboard_message'			=> 'Avalehe sõnum',
+    'dashboard_message_help'	=> 'See tekst ilmub avalehele igaühele kellel on õigused vaadata avalehte.',
     'default_currency'  		=> 'Valuuta vaikimisi',
     'default_eula_text'			=> 'EULA vaikimisi',
     'default_language'			=> 'Vaikimisi keel',
@@ -43,14 +43,14 @@ return array(
     'display_eol'               => 'Kuva EOL tabeli vaates',
     'display_qr'                => 'Kuva ruudukoodid',
     'display_alt_barcode'		=> 'Kuvage 1D vöötkood',
-    'email_logo'                => 'Email Logo',
+    'email_logo'                => 'Emaili logo',
     'barcode_type'				=> '2D-triipkoodi tüüp',
     'alt_barcode_type'			=> '1D-vöötkoodi tüüp',
-    'email_logo_size'       => 'Square logos in email look best. ',
+    'email_logo_size'       => 'Kandilised logod paistavad emailis paremini välja. ',
     'eula_settings'				=> 'EULA seaded',
     'eula_markdown'				=> 'EULA võimaldab <a href="https://help.github.com/articles/github-flavored-markdown/">Githubi maitsestatud hinnalisa</a>.',
     'favicon'                   => 'Favicon',
-    'favicon_format'            => 'Accepted filetypes are ico, png, and gif. Other image formats may not work in all browsers.',
+    'favicon_format'            => 'Lubatud failitüübid on ico, png ja gif. Teised failitüübid ei pruugi kõigis lehitsejates töödata.',
     '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.',
@@ -58,12 +58,15 @@ return array(
     'generate_backup'			=> 'Loo varundamine',
     'header_color'              => 'Päise värv',
     'info'                      => 'Need sätted võimaldavad teil kohandada oma installi teatud aspekte.',
-    'label_logo'                => 'Label Logo',
+    'label_logo'                => 'Sildi logo',
     'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
     'laravel'                   => 'Laraveli versioon',
+    'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Certificate',
     'ldap_enabled'              => 'LDAP on lubatud',
     'ldap_integration'          => 'LDAP-i integreerimine',
     'ldap_settings'             => 'LDAP seaded',
+    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_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_server'               => 'LDAP server',
diff --git a/resources/lang/et/admin/users/message.php b/resources/lang/et/admin/users/message.php
index 22427c1df9..5489f5558f 100644
--- a/resources/lang/et/admin/users/message.php
+++ b/resources/lang/et/admin/users/message.php
@@ -12,7 +12,8 @@ return array(
     'insufficient_permissions'  => 'Ebapiisavad õigused.',
     'user_deleted_warning'      => 'See kasutaja on kustutatud. Et kasutajat muuta või talle uusi vahendeid anda, pead ta esmalt taastama.',
     'ldap_not_configured'        => 'LDAP-i integreerimine pole selle installi jaoks konfigureeritud.',
-    'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
+    'password_resets_sent'      => 'Parooli taastamise link on saadetud valitud aktiivsetele kasutajatele kellel on õige emaili aadress.',
+    'password_reset_sent'       => 'Parooli taastamise aadress on saadetud :email!',
 
 
     'success' => array(
diff --git a/resources/lang/et/button.php b/resources/lang/et/button.php
index 9feedb82de..fdc3f305a0 100644
--- a/resources/lang/et/button.php
+++ b/resources/lang/et/button.php
@@ -13,5 +13,6 @@ return array(
     'upload'                    => 'Lae üles',
 	'select_file'				=> 'Vali fail...',
     'select_files'				=> 'Vali failid...',
-    'generate_labels'           => '{1} Generate Label|[2,*] Generate Labels',
+    'generate_labels'           => '{1} Loo silt|[2,*] Loo silt',
+    'send_password_link'       => 'Saada parooli taastamise link',
 );
diff --git a/resources/lang/et/general.php b/resources/lang/et/general.php
index 8673ac9f9c..61d1237d2f 100644
--- a/resources/lang/et/general.php
+++ b/resources/lang/et/general.php
@@ -30,7 +30,7 @@
     'bulkaudit'             => 'Mahuaudit',
     'bulkaudit_status'      => 'Auditi staatus',
     'bulk_checkout'  		=> 'Bulk Checkout',
-    'bystatus'              => 'by Status',
+    'bystatus'              => 'staatuse järgi',
     'cancel'  				=> 'Loobu',
     'categories'			=> 'Kategooriad',
     'category'				=> 'Kategooria',
@@ -40,8 +40,8 @@
     'checkin'  				=> 'Checkin',
     'checkin_from'  		=> 'Checkin alates',
     'checkout'  			=> 'Checkout',
-    'checkouts_count'       => 'Checkouts',
-    'checkins_count'        => 'Checkins',
+    'checkouts_count'       => 'Väljastatud',
+    'checkins_count'        => 'Sisse võetud',
     'user_requests_count'   => 'Taotlused',
     'city'  				=> 'Linn',
 	'click_here'			=> 'Kliki siia',
@@ -58,7 +58,7 @@
     'created'               => 'Üksus on loodud',
     'created_asset'			=> 'loodud vara',
     'created_at' 			=> 'Loodud',
-    'record_created' 		=> 'Record Created',
+    'record_created' 		=> 'Väärtus loodud',
     'updated_at' 			=> 'Viimati muudetud',
     'currency'  			=> '$', // this is deprecated
     'current'  				=> 'Praegune',
@@ -79,7 +79,7 @@
     'depreciation_report'	=> 'Amortisatsiooniaruanne',
     'details'               => 'Üksikasjad',
     'download'				=> 'Lae alla',
-    'download_all'				=> 'Download All',
+    'download_all'				=> 'Laadige kõik alla',
     'depreciation'			=> 'Amortisatsioon',
     'editprofile'  			=> 'Muuda oma profiili',
     'eol'					=> 'EOL',
@@ -90,17 +90,17 @@
     'firstname_lastname_format'	=> 'Eesnimi eesnimi (jane.smith@example.com)',
     'firstname_lastname_underscore_format' => 'Eesnimi Perenimi (eesnimi.perenimi@poleolemas.ee)',
     'lastnamefirstinitial_format' =>  'Perenimi Eesnime lühend (perenimie@poleolemas.ee)',
-    'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
+    'firstintial_dot_lastname_format' => 'Eesnime algustäht Perenimi (j.smith@example.com)',
     'first'					=> 'Esimene',
-    'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
-    'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
+    'firstnamelastname'     => 'Eesnimi Perenimi (janesmith@example.com)',
+    'lastname_firstinitial' => 'Perenimi Eesnimi algustäht (smith_j@example.com)',
     'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
     'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
     'first_name'			=> 'Eesnimi',
     'first_name_format'		=> 'Eesnimi (jane@example.com)',
     'files'                 => 'Failid',
     'file_name'				=> 'Fail',
-    'file_type'             => 'File Type',
+    'file_type'             => 'Faili tüüp',
     'file_uploads'			=> 'Faili üleslaadimine',
     'generate'				=> 'Genereeri',
      'github_markdown'      => 'See väli lubab <a href="https://help.github.com/articles/github-flavored-markdown/">Githubi maitsestatud markdown</a>.',
@@ -112,9 +112,9 @@
     'image'                 => 'Pilt',
     'image_delete'         	=> 'Kustuta pilt',
     'image_upload'         	=> 'Laadi pilt üles',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, and svg. Max upload size allowed is :size.',
+    'image_filetypes_help'  => 'Lubatud faililaiendid on jpg, png, gif ja svg. Suurim lubatud üleslaadimise maht on :size.',
     'import'         	    => 'Impordi',
-    'importing'         	=> 'Importing',
+    'importing'         	=> 'Importimine',
     'importing_help'        => 'You can import assets, accessories, licenses, components, consumables, and users via CSV file. <br><br>The CSV should be comma-delimited and formatted with headers that match the ones in the <a href="https://snipe-it.readme.io/docs/importing" target="_new">sample CSVs in the documentation</a>.',
     'import-history'        => 'Impordi ajalugu',
     'asset_maintenance'        => 'Varade hooldus',
@@ -122,7 +122,7 @@
     'asset_maintenances'       => 'Vara säilimine',
     'item'  				=> 'Kirje',
     'insufficient_permissions' => 'Ei ole piisavalt õigusi!',
-    'kits'       			=> 'Predefined Kits',
+    'kits'       			=> 'Eelnevalt määratud komplektid',
     'language'				=> 'Keel',
     'last'					=> 'Viimane',
     'last_login'            => 'Viimane sisselogimine',
@@ -176,7 +176,7 @@
     'remove_company'        => 'Eemalda ettevõtteühing',
     'reports'				=> 'Aruanded',
     'restored'				=> 'taastatud',
-    'restore'				=> 'Restore',
+    'restore'				=> 'Taasta',
     'requested'				=> 'Taotletud',
     'request_canceled'      => 'Taotlus tühistati',
     'save'  				=> 'Salvesta',
@@ -221,14 +221,14 @@
     'unknown_admin'			=> 'Tundmatu Admin',
     'username_format'		=> 'Kasutajanime formaat',
     'update'                => 'Uuenda',
-    'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
+    'upload_filetypes_help'      => 'Lubatud failileiendid on png, gif, jpg, jpeg, doc, docx, pdf, xls, txt, lic, zip ja rar. Suurim lubatud üleslaadimise maht on :size.',
     'uploaded'              => 'Üles laetud',
     'user'					=> 'Kasutaja',
     'accepted'			    => 'aktsepteeritud',
     'declined'			    => 'tagasi lükatud',
     'unaccepted_asset_report' => 'Mitteaktsepteeritud varad',
     'users'                 => 'Kasutajad',
-    'viewall'				=> 'View All',
+    'viewall'				=> 'Vaata kõiki',
     'viewassets'  			=> 'Vaadake määratud varasid',
     'website'               => 'Koduleht',
     'welcome'				=> 'Tere tulemast, :name',
@@ -237,14 +237,14 @@
     'zip'  					=> 'Postiindeks',
     'noimage'				=> 'Pilti pole üles laaditud või pilti ei leitud.',
     'token_expired'         => 'Teie vormi seanss on aegunud. Palun proovi uuesti.',
-    'login_enabled'         => 'Login Enabled',
+    'login_enabled'         => 'Sisselogimine lubatud',
     'audit_due'             => 'Due for Audit',
     'audit_overdue'         => 'Overdue for Audit',
-    'accept'                => 'Accept :asset',
-    'i_accept'              => 'I accept',
-    'i_decline'             => 'I decline',
+    'accept'                => 'Kinnita :asset',
+    'i_accept'              => 'Ma kinnitan',
+    'i_decline'             => 'Ma keeldun',
     'sign_tos'              => 'Sign below to indicate that you agree to the terms of service:',
     'clear_signature'       => 'Clear Signature',
-    'show_help'             => 'Show help',
-    'hide_help'             => 'Hide help',
+    'show_help'             => 'Näita abi',
+    'hide_help'             => 'Peida abi',
     ];
diff --git a/resources/lang/et/mail.php b/resources/lang/et/mail.php
index ea2e6127a0..dd22184b6c 100644
--- a/resources/lang/et/mail.php
+++ b/resources/lang/et/mail.php
@@ -9,7 +9,7 @@ return array(
     'asset' => 'Vahend:',
     'asset_name' => 'Vahendi nimi:',
     'asset_requested' => 'Vara nõutud',
-    'asset_tag' => 'Asset Tag',
+    'asset_tag' => 'Varade silt',
     'assigned_to' => 'Määratud',
     'best_regards' => 'Parimate soovidega,',
     'canceled' => 'Tühistatud:',
@@ -18,11 +18,11 @@ return array(
     'click_to_confirm' => 'Kinnitamiseks klõpsake järgmisel lingil: veebikonto:',
     'click_on_the_link_accessory' => 'Klõpsake allosas oleval lingil, et kinnitada, et olete lisaseadme kätte saanud.',
     'click_on_the_link_asset' => 'Klõpsake allosas oleval lingil, et kinnitada, et olete vara vastu võtnud.',
-    'Confirm_Asset_Checkin' => 'Asset checkin confirmation',
-    'Confirm_Accessory_Checkin' => 'Accessory checkin confirmation',
-    'Confirm_accessory_delivery' => 'Accessory delivery confirmation',
-    'Confirm_license_delivery' => 'License delivery confirmation',
-    'Confirm_asset_delivery' => 'Asset delivery confirmation',
+    'Confirm_Asset_Checkin' => 'Vara sissevõtmise kinnitus',
+    'Confirm_Accessory_Checkin' => 'Tarvitu sissevõtmise kinnitus',
+    'Confirm_accessory_delivery' => 'Tarvitu tarne kinnitus',
+    'Confirm_license_delivery' => 'Litsentsi tarne kinnitus',
+    'Confirm_asset_delivery' => 'Vara tarne kinnitus',
     'Confirm_consumable_delivery' => 'Consumable delivery confirmation',
     'current_QTY' => 'Praegune QTY',
     'Days' => 'Päeva',
@@ -69,11 +69,11 @@ return array(
     'welcome' => 'Tere tulemast, :name',
     'welcome_to' => 'Teretulemast lehele :web!',
     'your_credentials' => 'Sinu Snipe-IT rekvisiidid',
-    'Accessory_Checkin_Notification' => 'Accessory checked in',
-    'Asset_Checkin_Notification' => 'Asset checked in',
-    'License_Checkin_Notification' => 'License checked in',
+    'Accessory_Checkin_Notification' => 'Tarvikud sisse võetud',
+    'Asset_Checkin_Notification' => 'Vara sissevõetud',
+    'License_Checkin_Notification' => 'Litsents sisse võetud',
     'Expected_Checkin_Report' => 'Expected asset checkin report',
     'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching',
     'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date',
-    'your_assets' => 'View Your Assets'
+    'your_assets' => 'Vaata oma varasi'
 );
diff --git a/resources/lang/et/passwords.php b/resources/lang/et/passwords.php
index e3739fb63c..84a7608c57 100644
--- a/resources/lang/et/passwords.php
+++ b/resources/lang/et/passwords.php
@@ -2,6 +2,6 @@
 
 return [
     'sent'	        => 'Sinu paroolilink on saadetud!',
-    'user'			=> 'No matching active user found with that email.',
+    'user'			=> 'Sellise emailiga aktiivset kasutajat ei leitud.',
 ];
 
diff --git a/resources/lang/fa/admin/categories/general.php b/resources/lang/fa/admin/categories/general.php
index b5e4cf4c44..e35f3df167 100644
--- a/resources/lang/fa/admin/categories/general.php
+++ b/resources/lang/fa/admin/categories/general.php
@@ -20,5 +20,6 @@ return array(
  استفاده کنید',
     'use_default_eula_disabled'			=> 'از پیشفرض اولیه EULA استفاده کنید.<del>هیچ پیشفرضی اولیه ای تنظیم نشده است</del>
 در تنظیمات اضافه کنید.',
+    'use_default_eula_column'			=> 'استفاده توافق نامه پیشفرض',
 
 );
diff --git a/resources/lang/fa/admin/settings/general.php b/resources/lang/fa/admin/settings/general.php
index 3c6fdea0ed..4c4af665c6 100644
--- a/resources/lang/fa/admin/settings/general.php
+++ b/resources/lang/fa/admin/settings/general.php
@@ -61,9 +61,12 @@ return array(
     'label_logo'                => 'Label Logo',
     'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
     'laravel'                   => 'نسخه Laravel',
+    'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Certificate',
     'ldap_enabled'              => 'LDAP فعال شد.',
     'ldap_integration'          => 'ادغام LDAP',
     'ldap_settings'             => 'تنظیمات LDAP',
+    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_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_server'               => 'سرویس دهنده LDAP',
diff --git a/resources/lang/fa/admin/users/message.php b/resources/lang/fa/admin/users/message.php
index 0718cfeaf1..a559d8f603 100644
--- a/resources/lang/fa/admin/users/message.php
+++ b/resources/lang/fa/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
     'user_deleted_warning'      => 'این کاربر حذف شده است.شما باید این کاربر را بازگردانی و آنها را ویرایش و دارایی به آنها اختصاص دهید.',
     'ldap_not_configured'        => 'LDAPبرای این نصب و راه اندازی پیکربندی نشده است.',
     'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
+    'password_reset_sent'       => 'A password reset link has been sent to :email!',
 
 
     'success' => array(
diff --git a/resources/lang/fa/button.php b/resources/lang/fa/button.php
index ccbdd651ba..6598ba09cc 100644
--- a/resources/lang/fa/button.php
+++ b/resources/lang/fa/button.php
@@ -12,6 +12,7 @@ return array(
     'submit'  	                => 'ثبت کردن',
     'upload'                    => 'بارگزاری',
 	'select_file'				=> 'فایل را انتخاب کنید...',
-    'select_files'				=> 'Select Files...',
-    'generate_labels'           => '{1} Generate Label|[2,*] Generate Labels',
+    'select_files'				=> 'انتخاب فایل ها...',
+    'generate_labels'           => '{1} تولید لیبل|[2,*] تولید لیبل ها',
+    'send_password_link'       => 'ارسال لینک بازنشانی کلمه عبور',
 );
diff --git a/resources/lang/fa/general.php b/resources/lang/fa/general.php
index c5cb74f930..22814b2ed1 100644
--- a/resources/lang/fa/general.php
+++ b/resources/lang/fa/general.php
@@ -91,13 +91,13 @@
     'filastname_format'			=> 'اولین نام خانوادگی (jsmith@example.com)',
     'firstname_lastname_format'	=> 'نام خانوادگی (jane.smith@example.com)',
     'firstname_lastname_underscore_format' => 'نام خانوادگی (jane.smith@example.com)',
-    'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
+    'lastnamefirstinitial_format' =>  'فامیل نام میانه (smithj@example.com)',
+    'firstintial_dot_lastname_format' => 'نام میانه فامیل (j.smith@example.com)',
     'first'					=> 'اولین',
-    'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
-    'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
-    'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
-    'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
+    'firstnamelastname'     => 'نام فامیل (janesmith@example.com)',
+    'lastname_firstinitial' => 'فامیل نام میانه (smith_j@example.com)',
+    'firstinitial.lastname' => 'نام میانه فامیل (j.smith@example.com)',
+    'firstnamelastinitial'  => 'نام فامیل میانه (janes@example.com)',
     'first_name'			=> 'نام',
     'first_name_format'		=> 'نام (jane@example.com)',
     'files'                 => 'فایل ها',
@@ -105,7 +105,7 @@
     'file_type'             => 'نوع فايل',
     'file_uploads'			=> 'بارگذاری پرونده',
     'generate'				=> 'تولید',
-     'github_markdown'      => 'This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
+     'github_markdown'      => 'این فیلد اجازه می دهد تا <a href="https://help.github.com/articles/github-flavored-markdown/">گیت هاب به سلیقه خود نشانه گذاری کند. markdown</a>.',
     'groups'				=> 'گروه ها',
     'gravatar_email'        => 'آدرس آواتار ایمیل ',
     'history'  			    => 'پيشينه',
@@ -114,7 +114,7 @@
     'image'                 => 'تصویر',
     'image_delete'         	=> 'عکس های پاک شده',
     'image_upload'         	=> 'آپلود تصویر',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, and svg. Max upload size allowed is :size.',
+    'image_filetypes_help'  => 'نوع فایل های قابل قبول: jpg, webp, png, gif, و svg. حداکثر سایز فایل :size.',
     'import'         	    => 'واردات',
     'importing'         	=> 'در حال وارد کردن',
     'importing_help'        => 'You can import assets, accessories, licenses, components, consumables, and users via CSV file. <br><br>The CSV should be comma-delimited and formatted with headers that match the ones in the <a href="https://snipe-it.readme.io/docs/importing" target="_new">sample CSVs in the documentation</a>.',
diff --git a/resources/lang/fa/help.php b/resources/lang/fa/help.php
index 4cb2354f89..322e92c4d2 100644
--- a/resources/lang/fa/help.php
+++ b/resources/lang/fa/help.php
@@ -13,7 +13,7 @@ return array(
     |
     */
 
-    "more_info_title" => "More Info",
+    "more_info_title" => "اطلاعات بیشتر",
 
     "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 is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.",
 
diff --git a/resources/lang/fi/admin/categories/general.php b/resources/lang/fi/admin/categories/general.php
index d725ffd3ae..e084f24072 100644
--- a/resources/lang/fi/admin/categories/general.php
+++ b/resources/lang/fi/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'Päivitä kategoria',
     'use_default_eula'					=> 'Käytä <a href="#" data-toggle="modal" data-target="#eulaModal"> yleisiä käyttöehtoja</a>.',
     'use_default_eula_disabled'			=> '<del>Käytä yleisiä käyttöehtoja.</del> Yleisiä käyttöehtoja ei ole määritetty. Voit lisätä ne asetuksista.',
+    'use_default_eula_column'			=> 'Käytä yleisiä käyttöehtoja',
 
 );
diff --git a/resources/lang/fi/admin/hardware/general.php b/resources/lang/fi/admin/hardware/general.php
index faf818c272..7f764ff712 100644
--- a/resources/lang/fi/admin/hardware/general.php
+++ b/resources/lang/fi/admin/hardware/general.php
@@ -10,9 +10,9 @@ return array(
     'checkout'  				=> 'Luovuta laite',
     'clone'  					=> 'Monista laite',
     'deployable'  				=> 'Käyttöönotettavissa',
-    'deleted'  					=> 'This asset has been deleted.',
+    'deleted'  					=> 'Tämä laite on poistettu.',
     'edit'  					=> 'Muokkaa laitetta',
-    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
+    'model_deleted'  			=> 'Laitemalli on poistettu. Voit palauttaa laitteen kun olet ensin palauttanut poistetun laitemallin.',
     'requestable'               => 'Pyydettävissä',
     'requested'				    => 'Pyydetty',
     'restore'  					=> 'Palauta laite',
diff --git a/resources/lang/fi/admin/models/general.php b/resources/lang/fi/admin/models/general.php
index 0e8eb6aced..3068e68dcd 100644
--- a/resources/lang/fi/admin/models/general.php
+++ b/resources/lang/fi/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Tietoja laitemalleista',
     'about_models_text'           => 'Laitemalleilla ryhmitellään samankaltaiset laitteet. "Elitebook 820 G3", "IPhone 6s" jne.',
-    'deleted'  					        => 'This model has been deleted.',
+    'deleted'  					        => 'Tämä malli on poistettu.',
     'bulk_delete'               => 'Massapoista laitemalleja',
     'bulk_delete_help'               => 'Käytä alla olevia valintaruutuja vahvistaaksesi laitemallien poistaminen. Laitemalleja, joissa on niihin liittyviä laitteita, ei voida poistaa ennen kuin laitteet on liitetty toiseen malliin.',
     'bulk_delete_warn'          => 'Olet poistamassa :model_count laitemallia.',
diff --git a/resources/lang/fi/admin/settings/general.php b/resources/lang/fi/admin/settings/general.php
index 52e1a5e239..6d28456cbd 100644
--- a/resources/lang/fi/admin/settings/general.php
+++ b/resources/lang/fi/admin/settings/general.php
@@ -61,9 +61,12 @@ return array(
     'label_logo'                => 'Tunnisteen logo',
     'label_logo_size'           => 'Neliönmuotoiset logot näyttävät parhailta - näytetään oikeassa yläkulmassa jokaisen laitetunnisteen kohdalla. ',
     'laravel'                   => 'Laravel-versio',
+    'ldap_client_tls_cert'      => 'LDAP Asiakaspuolen TLS varmenne',
     'ldap_enabled'              => 'LDAP käytössä',
     'ldap_integration'          => 'LDAP integraatio',
     'ldap_settings'             => 'LDAP-asetukset',
+    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_login_test_help'      => 'Syötä toimiva LDAP-käyttäjätunnus ja salasana määrittelemästäsi base DN: stä testataksesi LDAP-kirjautumisen toimivuutta. SINUN TULEE TALLENTAA UUDET LDAP ASETUKSET ENSIN.',
     'ldap_login_sync_help'      => 'Tämä testaa vain LDAP-synkronoinnin toimivuutta. Mikäli LDAP autentikointikysely on virheellinen, käyttäjät eivät voi kirjautua sisään. SINUN TULEE TALLENTAA UUDET ASETUKSET ENSIN.',
     'ldap_server'               => 'LDAP Palvelin',
diff --git a/resources/lang/fi/admin/users/message.php b/resources/lang/fi/admin/users/message.php
index b88b73dccc..f24b9ace4f 100644
--- a/resources/lang/fi/admin/users/message.php
+++ b/resources/lang/fi/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
     'user_deleted_warning'      => 'Käyttäjä on jo poistettu. Mikäli haluat muokata tai luovuttaa laitteita hänelle sinun tulee palauttaa käyttäjä.',
     'ldap_not_configured'        => 'LDAP-integraatiota ei ole määritetty tähän asennukseen.',
     'password_resets_sent'      => 'Salasanan resetointilinkki on lähetetty niille käyttäjille, joille on määritetty voimassa oleva sähköpostiosoite.',
+    'password_reset_sent'       => 'Salasanan palautuslinkki on lähetetty osoitteeseen :email!',
 
 
     'success' => array(
diff --git a/resources/lang/fi/button.php b/resources/lang/fi/button.php
index ca3daeeae5..871169de05 100644
--- a/resources/lang/fi/button.php
+++ b/resources/lang/fi/button.php
@@ -14,4 +14,5 @@ return array(
 	'select_file'				=> 'Valitse tiedosto...',
     'select_files'				=> 'Valitse tiedostot...',
     'generate_labels'           => '{1} Luo tunniste |[2, *] Luo tunnisteet',
+    'send_password_link'       => 'Lähetä salasanan palautuslinkki',
 );
diff --git a/resources/lang/fi/general.php b/resources/lang/fi/general.php
index e5c5ca263b..aad1645118 100644
--- a/resources/lang/fi/general.php
+++ b/resources/lang/fi/general.php
@@ -176,7 +176,7 @@
     'remove_company'        => 'Poista',
     'reports'				=> 'Raportit',
     'restored'				=> 'palautettu',
-    'restore'				=> 'Restore',
+    'restore'				=> 'Palauta',
     'requested'				=> 'Pyydetty',
     'request_canceled'      => 'Pyyntö peruutettu',
     'save'  				=> 'Tallenna',
diff --git a/resources/lang/fil/admin/categories/general.php b/resources/lang/fil/admin/categories/general.php
index 9c76faa691..feaa34339d 100644
--- a/resources/lang/fil/admin/categories/general.php
+++ b/resources/lang/fil/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'I-update ang Katergorya',
     'use_default_eula'					=> 'Sa halip ay gamitin ang <a href="#" data-toggle="modal" data-target="#eulaModal">ang pangunahing default ng EULA</a>.',
     'use_default_eula_disabled'			=> '<del>Sa halip ay gumamit ng pangunahing default na EULA.</del> Walang pangunahing default na EULA na nai-set. Paki-dagdag ng isa sa mga setting.',
+    'use_default_eula_column'			=> 'Use default EULA',
 
 );
diff --git a/resources/lang/fil/admin/settings/general.php b/resources/lang/fil/admin/settings/general.php
index 23c3affe73..d9809a7f91 100644
--- a/resources/lang/fil/admin/settings/general.php
+++ b/resources/lang/fil/admin/settings/general.php
@@ -61,9 +61,12 @@ return array(
     'label_logo'                => 'Label Logo',
     'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
     'laravel'                   => 'Ang Laravel na Bersyon',
+    'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Certificate',
     'ldap_enabled'              => 'Pinagana ang LDAP',
     'ldap_integration'          => 'Ang integrasyon ng LDAP',
     'ldap_settings'             => 'Ang mga setting ng LDAP',
+    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_login_test_help'      => 'Mag-enter ng balidong LDAP username at password mula sa binatayang DN na iyong ibinatay sa itaas upang subukan kung ang iyong LDAP login ay maayos na nai-configure. DAPAT MO MUNANG I-SAVE ANG IYONG UPDATED NA MGA SETTING NG LDAP.',
     'ldap_login_sync_help'      => 'Ito ay susubok lamang sa LDAP na mag-sync nang maayos. Kapag ang iyong LDAP Authentication query ay hindi tama, ang mga gumagamit ay hindi parin makapag-login. DAPAT MO MUNANG I-SAVE ANG IYONG UPDATED NA MGA SETTING NG LDAP.',
     'ldap_server'               => 'Ang Serber ng LDAP',
diff --git a/resources/lang/fil/admin/users/message.php b/resources/lang/fil/admin/users/message.php
index a01dc1f97c..515a850744 100644
--- a/resources/lang/fil/admin/users/message.php
+++ b/resources/lang/fil/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
     'user_deleted_warning'      => 'Ang user na ito ay nai-delete na. Kailangang ibalik ang user na ito upang i-edit o mag-assign ng bagong mga asset.',
     'ldap_not_configured'        => 'Ang integrasyon ng LDAP ay hindi nai-configure sa pag-install na ito.',
     'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
+    'password_reset_sent'       => 'A password reset link has been sent to :email!',
 
 
     'success' => array(
diff --git a/resources/lang/fil/button.php b/resources/lang/fil/button.php
index 98ac40d89f..4645102bd2 100644
--- a/resources/lang/fil/button.php
+++ b/resources/lang/fil/button.php
@@ -14,4 +14,5 @@ return array(
 	'select_file'				=> 'Pumili ng File...',
     'select_files'				=> 'Select Files...',
     'generate_labels'           => '{1} Generate Label|[2,*] Generate Labels',
+    'send_password_link'       => 'Send Password Reset Link',
 );
diff --git a/resources/lang/fr/admin/categories/general.php b/resources/lang/fr/admin/categories/general.php
index 7b7501fd00..08e61e743c 100644
--- a/resources/lang/fr/admin/categories/general.php
+++ b/resources/lang/fr/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'Actualiser Catégorie',
     'use_default_eula'					=> 'Utiliser la <a href="#" data-toggle="modal" data-target="#eulaModal">license primaire par défaut </a> à la place.',
     'use_default_eula_disabled'			=> '<del>Utilisez la licence par défaut à la place.</del> Aucune licence d\'utilisation par défaut trouvée. Ajoutez-en une dans la section "Préférences".',
+    'use_default_eula_column'			=> 'Utilisez les CGU par défaut',
 
 );
diff --git a/resources/lang/fr/admin/hardware/general.php b/resources/lang/fr/admin/hardware/general.php
index 1e33601a81..ebd5c613c7 100644
--- a/resources/lang/fr/admin/hardware/general.php
+++ b/resources/lang/fr/admin/hardware/general.php
@@ -10,9 +10,9 @@ return array(
     'checkout'  				=> 'Commander l\'actif',
     'clone'  					=> 'Cloner le Bien',
     'deployable'  				=> 'Déployable',
-    'deleted'  					=> 'This asset has been deleted.',
+    'deleted'  					=> 'Cet actif a été supprimé.',
     'edit'  					=> 'Editer le Bien',
-    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
+    'model_deleted'  			=> 'Ce modèle d\'actifs a été supprimé. Vous devez restaurer le modèle avant de pouvoir restaurer l\'actif.',
     'requestable'               => 'Réquisitionnable',
     'requested'				    => 'Demandé',
     'restore'  					=> 'Restaurer l\'actif',
diff --git a/resources/lang/fr/admin/models/general.php b/resources/lang/fr/admin/models/general.php
index ca3f0cc9f9..9a4444a9ed 100644
--- a/resources/lang/fr/admin/models/general.php
+++ b/resources/lang/fr/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'A propos des modèles actifs',
     'about_models_text'           => 'Les modèles actifs sont une façon de regrouper les actifs identiques. « MBP 2013", « IPhone 6 s », etc.',
-    'deleted'  					        => 'This model has been deleted.',
+    'deleted'  					        => 'Ce modèle a été supprimé.',
     'bulk_delete'               => 'Suppression en masse des modèles d\'actifs',
     'bulk_delete_help'               => 'Cochez la case ci-dessous pour confirmer la suppression des modèles d\'actifs sélectionnés. Les modèles d\'actifs associés à des actifs ne peuvent pas être supprimés tant que les actifs ne sont pas associés à un modèle différent.',
     'bulk_delete_warn'          => 'Vous êtes sur le points de suppimer :model_count modèles d\'actifs.',
diff --git a/resources/lang/fr/admin/settings/general.php b/resources/lang/fr/admin/settings/general.php
index 9a311b7c50..1fda15acda 100644
--- a/resources/lang/fr/admin/settings/general.php
+++ b/resources/lang/fr/admin/settings/general.php
@@ -61,9 +61,12 @@ return array(
     'label_logo'                => 'Logo du label',
     'label_logo_size'           => 'Les logos, de préférence carrés, sont affichés en haut à droite de chaque étiquette. ',
     'laravel'                   => 'Version de Laravel',
+    'ldap_client_tls_cert'      => 'Certificat TLS côté client pour LDAP',
     'ldap_enabled'              => 'LDAP activé',
     'ldap_integration'          => 'Intégration LDAP',
     'ldap_settings'             => 'Paramètres LDAP',
+    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_login_test_help'      => 'Entrez un nom d\'utilisateur et mot de passe LDAP valide depuis la base DN que vous avez spécifié ci-dessus afin de tester si votre configuration LDAP est correcte. VOUS DEVEZ D\'ABORD ENREGISTRER VOS PARAMÈTRES LDAP MIS À JOUR.',
     'ldap_login_sync_help'      => 'Ceci vérifie uniquement que LDAP se synchronise correctement. Si votre requête d\'authentification LDAP est incorrecte, les utilisateurs peuvent ne pas pouvoir se connecter. VOUS DEVEZ D\'ABORD ENREGISTRER VOS PARAMÈTRES LDAP MIS À JOUR.',
     'ldap_server'               => 'Serveur LDAP',
diff --git a/resources/lang/fr/admin/users/message.php b/resources/lang/fr/admin/users/message.php
index 9734aaaa95..07d91b51d6 100644
--- a/resources/lang/fr/admin/users/message.php
+++ b/resources/lang/fr/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
     'user_deleted_warning'      => 'Cet utilisateur a été supprimé. Vous devez le restaurer pour pouvoir l\'éditer ou lui assigner de nouveaux actifs.',
     'ldap_not_configured'        => 'L\'intégration LDAP n\'a pas été configuré pour cette installation .',
     'password_resets_sent'      => 'Les utilisateurs sélectionnés qui sont activés et ont une adresse e-mail valide ont reçu un lien de réinitialisation du mot de passe.',
+    'password_reset_sent'       => 'Un lien de réinitialisation du mot de passe a été envoyé à :email!',
 
 
     'success' => array(
diff --git a/resources/lang/fr/button.php b/resources/lang/fr/button.php
index 09aff4e822..afb9396abd 100644
--- a/resources/lang/fr/button.php
+++ b/resources/lang/fr/button.php
@@ -14,4 +14,5 @@ return array(
 	'select_file'				=> 'Sélectionner un fichier...',
     'select_files'				=> 'Sélectionnez les fichiers ...',
     'generate_labels'           => '{1} Générer une étiquette|[2,*] Générer des étiquettes',
+    'send_password_link'       => 'Envoyer le lien de réinitialisation du mot de passe',
 );
diff --git a/resources/lang/fr/general.php b/resources/lang/fr/general.php
index 8400460cd6..4785d27d8b 100644
--- a/resources/lang/fr/general.php
+++ b/resources/lang/fr/general.php
@@ -176,7 +176,7 @@
     'remove_company'        => 'Retirer l\'association avec l\'organisation',
     'reports'				=> 'Rapports',
     'restored'				=> 'restauré',
-    'restore'				=> 'Restore',
+    'restore'				=> 'Restaurer',
     'requested'				=> 'Demandé',
     'request_canceled'      => 'Demande annulée',
     'save'  				=> 'Sauvegarder',
diff --git a/resources/lang/ga-IE/admin/categories/general.php b/resources/lang/ga-IE/admin/categories/general.php
index 4b236ebea2..d7743a854e 100644
--- a/resources/lang/ga-IE/admin/categories/general.php
+++ b/resources/lang/ga-IE/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'Catagóir Nuashonraithe',
     'use_default_eula'					=> 'Bain úsáid as an réamhshocraithe <a href="#" data-toggle="modal" data-target="#eulaModal"> réamhshocrú EULA</a> ina ionad.',
     'use_default_eula_disabled'			=> '<del>Cuir an príomh-réamhshocraithe EULA in ionad.</del> Níl aon réamhshocraithe EULA leagtha síos. Cuir ceann amháin i Socruithe le do thoil.',
+    'use_default_eula_column'			=> 'Use default EULA',
 
 );
diff --git a/resources/lang/ga-IE/admin/settings/general.php b/resources/lang/ga-IE/admin/settings/general.php
index 4d5d36a06e..697074ecd1 100644
--- a/resources/lang/ga-IE/admin/settings/general.php
+++ b/resources/lang/ga-IE/admin/settings/general.php
@@ -61,9 +61,12 @@ return array(
     'label_logo'                => 'Label Logo',
     'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
     'laravel'                   => 'Leagan Laravel',
+    'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Certificate',
     'ldap_enabled'              => 'LDAP cumasaithe',
     'ldap_integration'          => 'Comhtháthú LDAP',
     'ldap_settings'             => 'Socruithe LDAP',
+    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_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_server'               => 'Freastalaí LDAP',
diff --git a/resources/lang/ga-IE/admin/users/message.php b/resources/lang/ga-IE/admin/users/message.php
index 4f927a0793..e4e2dcbc07 100644
--- a/resources/lang/ga-IE/admin/users/message.php
+++ b/resources/lang/ga-IE/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
     'user_deleted_warning'      => 'Scriosadh an t-úsáideoir seo. Beidh ort an t-úsáideoir seo a athchóiriú chun iad a eagrú nó sócmhainní nua a shannadh dóibh.',
     'ldap_not_configured'        => 'Níl cumasc LDAP cumraithe don suiteáil seo.',
     'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
+    'password_reset_sent'       => 'A password reset link has been sent to :email!',
 
 
     'success' => array(
diff --git a/resources/lang/ga-IE/button.php b/resources/lang/ga-IE/button.php
index ad7f140b8d..6f70769951 100644
--- a/resources/lang/ga-IE/button.php
+++ b/resources/lang/ga-IE/button.php
@@ -14,4 +14,5 @@ return array(
 	'select_file'				=> 'Roghnaigh Comhad ...',
     'select_files'				=> 'Select Files...',
     'generate_labels'           => '{1} Generate Label|[2,*] Generate Labels',
+    'send_password_link'       => 'Send Password Reset Link',
 );
diff --git a/resources/lang/he/admin/categories/general.php b/resources/lang/he/admin/categories/general.php
index 2a2f292296..faa2ee564d 100644
--- a/resources/lang/he/admin/categories/general.php
+++ b/resources/lang/he/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'עדכון קטגוריה',
     'use_default_eula'					=> 'במקום זאת, השתמש ב- <a href="#" data-toggle="modal" data-target="#eulaModal"> ברירת המחדל הראשית EULA</a>.',
     'use_default_eula_disabled'			=> '<del> השתמש ב- EULA ברירת המחדל הראשוני במקום. </del> לא נקבעה ברירת המחדל הראשית של הסכם הרישיון למשתמש קצה. הוסף אחד בהגדרות.',
+    'use_default_eula_column'			=> 'Use default EULA',
 
 );
diff --git a/resources/lang/he/admin/settings/general.php b/resources/lang/he/admin/settings/general.php
index 353169ede5..22b6072f4c 100644
--- a/resources/lang/he/admin/settings/general.php
+++ b/resources/lang/he/admin/settings/general.php
@@ -61,9 +61,12 @@ return array(
     'label_logo'                => 'Label Logo',
     'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
     'laravel'                   => 'גירסת Laravel',
+    'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Certificate',
     'ldap_enabled'              => 'LDAP מופעל',
     'ldap_integration'          => 'שילוב LDAP',
     'ldap_settings'             => 'הגדרות LDAP',
+    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_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_server'               => 'שרת LDAP',
diff --git a/resources/lang/he/admin/users/message.php b/resources/lang/he/admin/users/message.php
index 4bda60b4fc..3c8b885a5c 100644
--- a/resources/lang/he/admin/users/message.php
+++ b/resources/lang/he/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
     'user_deleted_warning'      => 'משתמש זה נמחק. יהיה עליך לשחזר משתמש זה כדי לערוך אותם או להקצות להם נכסים חדשים.',
     'ldap_not_configured'        => 'שילוב LDAP לא הוגדר עבור התקנה זו.',
     'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
+    'password_reset_sent'       => 'A password reset link has been sent to :email!',
 
 
     'success' => array(
diff --git a/resources/lang/he/button.php b/resources/lang/he/button.php
index 4669b476f4..a7411165d3 100644
--- a/resources/lang/he/button.php
+++ b/resources/lang/he/button.php
@@ -14,4 +14,5 @@ return array(
 	'select_file'				=> 'בחר קובץ...',
     'select_files'				=> 'בחר קבצים...',
     'generate_labels'           => '{1} Generate Label|[2,*] Generate Labels',
+    'send_password_link'       => 'Send Password Reset Link',
 );
diff --git a/resources/lang/hr/admin/categories/general.php b/resources/lang/hr/admin/categories/general.php
index 6277e2c8dd..a288204797 100644
--- a/resources/lang/hr/admin/categories/general.php
+++ b/resources/lang/hr/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'Kategorija ažuriranja',
     'use_default_eula'					=> 'Umjesto toga upotrijebite <a href="#" data-toggle="modal" data-target="#eulaModal">primarnu postavku EULA</a>.',
     'use_default_eula_disabled'			=> '<del>Uporedi primarnu zadanu EULA.</del> Nije postavljena primarna zadana EULA. Dodajte jednu u Postavke.',
+    'use_default_eula_column'			=> 'Use default EULA',
 
 );
diff --git a/resources/lang/hr/admin/settings/general.php b/resources/lang/hr/admin/settings/general.php
index ecff18b8c2..ac6bd2cf4d 100644
--- a/resources/lang/hr/admin/settings/general.php
+++ b/resources/lang/hr/admin/settings/general.php
@@ -61,9 +61,12 @@ return array(
     'label_logo'                => 'Label Logo',
     'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
     'laravel'                   => 'Inačica Laravela',
+    'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Certificate',
     'ldap_enabled'              => 'LDAP je omogućen',
     'ldap_integration'          => 'LDAP integracija',
     'ldap_settings'             => 'LDAP postavke',
+    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_login_test_help'      => 'Unesite valjano korisničko ime i lozinku LDAP-a iz osnovnog DN-a koji ste prethodno naveli da biste provjerili je li vaša LDAP prijava ispravno konfigurirana. MORATE NAJPRIJE SPREMITI SVOJE AŽURIRANE LDAP POSTAVKE.',
     'ldap_login_sync_help'      => 'Ovo samo testira da se LDAP može ispravno sinkronizirati. Ako vaš upit za LDAP autentikaciju nije ispravan, korisnici se i dalje možda neće moći prijaviti. MORATE NAJPRIJE SPREMITI SVOJE AŽURIRANE LDAP POSTAVKE.',
     'ldap_server'               => 'LDAP poslužitelj',
diff --git a/resources/lang/hr/admin/users/message.php b/resources/lang/hr/admin/users/message.php
index c5d093ba55..db7afafa7f 100644
--- a/resources/lang/hr/admin/users/message.php
+++ b/resources/lang/hr/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
     'user_deleted_warning'      => 'Ovaj je korisnik izbrisan. Morat ćete vratiti tog korisnika da biste ih uredili ili dodijelili novu imovinu.',
     'ldap_not_configured'        => 'LDAP integracija nije konfigurirana za ovu instalaciju.',
     'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
+    'password_reset_sent'       => 'A password reset link has been sent to :email!',
 
 
     'success' => array(
diff --git a/resources/lang/hr/button.php b/resources/lang/hr/button.php
index 839f1decc8..177983337e 100644
--- a/resources/lang/hr/button.php
+++ b/resources/lang/hr/button.php
@@ -14,4 +14,5 @@ return array(
 	'select_file'				=> 'Odaberite datoteku ...',
     'select_files'				=> 'Odaberite datoteke...',
     'generate_labels'           => '{1} Generate Label|[2,*] Generate Labels',
+    'send_password_link'       => 'Send Password Reset Link',
 );
diff --git a/resources/lang/hu/admin/categories/general.php b/resources/lang/hu/admin/categories/general.php
index eecd2c3d2a..fc5f794be3 100644
--- a/resources/lang/hu/admin/categories/general.php
+++ b/resources/lang/hu/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'Kategória módosítása',
     'use_default_eula'					=> 'Használja inkább az <a href="#" data-toggle="modal" data-target="#eulaModal">alapértelmezett EULA</a>-t.',
     'use_default_eula_disabled'			=> '<del>Használja inkább az alapértelmezett EULA-t.</del> Nincs alapértelmezett EULA beállítva. Kérem adjon hozzá egyet a Beállításokban.',
+    'use_default_eula_column'			=> 'Alap szoftver licenc használata',
 
 );
diff --git a/resources/lang/hu/admin/depreciations/general.php b/resources/lang/hu/admin/depreciations/general.php
index e7cb50e191..b34dc2125e 100644
--- a/resources/lang/hu/admin/depreciations/general.php
+++ b/resources/lang/hu/admin/depreciations/general.php
@@ -8,6 +8,6 @@ return array(
     'depreciation_name'  					=> 'Értékcsökkenés neve',
     'number_of_months'  					=> 'Hónapok száma',
     'update'  					            => 'Értékcsökkenés frissítése',
-    'depreciation_min'                      => 'Minimum Value after Depreciation'
+    'depreciation_min'                      => 'Minimum érték értékcsökkenés után'
 
 );
diff --git a/resources/lang/hu/admin/hardware/general.php b/resources/lang/hu/admin/hardware/general.php
index 466b9aee14..417e547750 100644
--- a/resources/lang/hu/admin/hardware/general.php
+++ b/resources/lang/hu/admin/hardware/general.php
@@ -10,9 +10,9 @@ return array(
     'checkout'  				=> 'Checkout Asset',
     'clone'  					=> 'Eszköz klónozása',
     'deployable'  				=> 'Kiadható',
-    'deleted'  					=> 'This asset has been deleted.',
+    'deleted'  					=> 'Az eszköz törölve lett.',
     'edit'  					=> 'Eszköz módosítása',
-    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
+    'model_deleted'  			=> 'Ennek az eszköznek a modellje törölve lett. Elösszőr a modellt vissza kell állítani, utánna lehet csak az eszközt visszaállítani.',
     'requestable'               => 'lehívási',
     'requested'				    => 'Kérve',
     'restore'  					=> 'Visszaállítás eszköz',
diff --git a/resources/lang/hu/admin/models/general.php b/resources/lang/hu/admin/models/general.php
index 7789c5ad37..d9607a70e5 100644
--- a/resources/lang/hu/admin/models/general.php
+++ b/resources/lang/hu/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Az Asset Models-ról',
     'about_models_text'           => 'Az eszköz-modellek lehetővé teszik az azonos eszközök csoportosítását. "MBP 2013", "IPhone 6s" stb.',
-    'deleted'  					        => 'This model has been deleted.',
+    'deleted'  					        => 'Ez a modell törölve lett.',
     'bulk_delete'               => 'Eszköz modellek csoportos törlése',
     'bulk_delete_help'               => 'Az alábbi jelölőnégyzetek segítségével, kérem, erősítse meg, hogy valóban törölni szeretné a kiválasztott eszköz modelleket! Azok az eszköz modellek, melyeknek vannak hozzárendelt eszközei, egészen addig nem törölhetőek, amíg ezeket az eszközöket egy másik modellhez nem rendeli.',
     'bulk_delete_warn'          => 'Törlődni fog :model_count eszköz modell.',
diff --git a/resources/lang/hu/admin/settings/general.php b/resources/lang/hu/admin/settings/general.php
index f18f5da9dd..32d75a320c 100644
--- a/resources/lang/hu/admin/settings/general.php
+++ b/resources/lang/hu/admin/settings/general.php
@@ -6,7 +6,7 @@ return array(
     'ad_domain_help'			=> 'Ez néha megegyezik az e-mail domainjével, de nem mindig.',
     'ad_append_domain_label'    => 'Append domain name',
     'ad_append_domain'          => 'Append domain name to username field',
-    'ad_append_domain_help'     => 'User isn\'t required to write "username@domain.local", they can just type "username".' ,
+    'ad_append_domain_help'     => 'A felhasználóknak nem szükséges beírni az egész címet "username@domain.local", elég csak a felhasználónevüket "username".' ,
     'admin_cc_email'            => 'Email másolat',
     'admin_cc_email_help'       => 'Ha azt szeretné, hogy a kiadáskor/visszavételkor a felhasználóknak küldött levél másolata egy másik címre is elmenjen, akkor írja be a címet ide. Ellenkező esetben hagyja szabadon a mezőt.',
     'is_ad'				        => 'Ez egy Active Directory szerver',
@@ -14,8 +14,8 @@ return array(
     'alerts_enabled'			=> 'Riasztás engedélyezve',
     'alert_interval'			=> 'A figyelmeztetések lejárata küszöbérték (napokban)',
     'alert_inv_threshold'		=> 'Leltár riasztási küszöb',
-    'allow_user_skin'           => 'Allow user skin',
-    'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' ,
+    'allow_user_skin'           => 'Felhasználók saját kinézetüknek engedélyezése',
+    'allow_user_skin_help_text' => 'Pipáld be ezt a dobozt ha szeretnéd, hogy a felhasználok felülírhassák az alap oldal kinézetét egy másikkal.' ,
     'asset_ids'					=> 'Eszköz ID',
     'audit_interval'            => 'Audit időtartam',
     'audit_interval_help'       => 'Ha rendszeres fizikai ellenőrzést igényel az eszközökkel, adja meg az intervallumot hónapokban.',
@@ -27,7 +27,7 @@ return array(
     'backups'					=> 'Biztonsági mentések',
     'barcode_settings'			=> 'Vonalkód beállítások',
     'confirm_purge'			    => 'Nyugtázza a tisztítást',
-    'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone and will PERMANENTLY delete all soft-deleted items and users. (You should make a backup first, just to be safe.)',
+    'confirm_purge_help'		=> 'Írd be a "DELETE" szót a lenti dobozba ha azt szeretnéd, hogy minden adat kitörlödjön. Ez a művelet nem visszaállítható és VÉGLEGESEN töröl minden eszközt és felhasználót. (Csinálj elötte egy biztonsági mentést, biztos ami biztos.)',
     'custom_css'				=> 'Egyéni CSS',
     'custom_css_help'			=> 'Adjon meg olyan egyedi CSS felülírást, amelyet használni szeretne. Ne tüntesse fel a &lt;style&gt;&lt;/style&gt; címkéket.',
     'custom_forgot_pass_url'	=> 'Egyéni jelszó visszaállítási URL',
@@ -43,14 +43,14 @@ return array(
     'display_eol'               => 'Táblázat nézetben az EOL megjelenítése',
     'display_qr'                => 'Kijelző négyzetek',
     'display_alt_barcode'		=> '1D vonalkód megjelenítése',
-    'email_logo'                => 'Email Logo',
+    'email_logo'                => 'Email-ben szereplő logo',
     'barcode_type'				=> '2D vonalkód típusa',
     'alt_barcode_type'			=> '1D vonalkód típusa',
-    'email_logo_size'       => 'Square logos in email look best. ',
+    'email_logo_size'       => 'Négyzet alakú logok jobban néznek ki. ',
     'eula_settings'				=> 'EULA beállítások',
     'eula_markdown'				=> 'Ez az EULA lehetővé teszi <a href="https://help.github.com/articles/github-flavored-markdown/">Github ízesített markdown</a>-et.',
     'favicon'                   => 'Favicon',
-    'favicon_format'            => 'Accepted filetypes are ico, png, and gif. Other image formats may not work in all browsers.',
+    'favicon_format'            => 'Az elfogadott fájltípusok: ico, png és gif. A többi képformátum lehet, hogy nem működik minden böngészőben.',
     'favicon_size'          => 'A favicon egy 16x16 pixeles kép kell legyen.',
     '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.',
@@ -58,12 +58,15 @@ return array(
     'generate_backup'			=> 'Háttér létrehozása',
     'header_color'              => 'Fejléc színe',
     'info'                      => 'Ezek a beállítások lehetővé teszik a telepítés egyes szempontjainak testreszabását.',
-    'label_logo'                => 'Label Logo',
-    'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
+    'label_logo'                => 'Címkéken szereplő logo',
+    'label_logo_size'           => 'Négyzet alakú logok jobban néznek ki - ez a logo fog megjelenni minden címke jobb felső sarkában. ',
     'laravel'                   => 'Laravel verzió',
+    'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Certificate',
     'ldap_enabled'              => 'LDAP bekapcsolva',
     'ldap_integration'          => 'LDAP integráció',
     'ldap_settings'             => 'LDAP beállítások',
+    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_login_test_help'      => 'Adjon meg egy érvényes LDAP felhasználónevet és jelszót a fenti alapszintű DN-ből, hogy ellenőrizze, hogy az LDAP-bejelentkezés megfelelően van-e beállítva. EL KELL MENTENIE A MÓDOSÍTOTT LDAP BEÁLLÍTÁSOKAT ELŐBB.',
     'ldap_login_sync_help'      => 'Ez csak azt teszteli, hogy az LDAP helyesen szinkronizálható. Ha az LDAP hitelesítési lekérdezése nem megfelelő, a felhasználók még mindig nem tudnak bejelentkezni. EL KELL MENTENIE A MÓDOSÍTOTT LDAP BEÁLLÍTÁSOKAT ELŐBB.',
     'ldap_server'               => 'LDAP szerver',
@@ -120,7 +123,7 @@ return array(
     'pwd_secure_complexity'     => 'Jelszó komplexitás',
     'pwd_secure_complexity_help' => 'Válassza ki a jelszavak összetettségi szabályait, amelyeket érvényesíteni kíván.',
     'pwd_secure_min'            => 'Jelszó minimális karakterek',
-    'pwd_secure_min_help'       => 'Minimum permitted value is 8',
+    'pwd_secure_min_help'       => 'A legkisebb megengedett érték 8',
     'pwd_secure_uncommon'       => 'A közös jelszavak megakadályozása',
     'pwd_secure_uncommon_help'  => 'Ez megakadályozza a felhasználók számára, hogy közös jelszavakat használjanak fel a leggyakrabban előforduló 10 000 jelszóból.',
     'qr_help'                   => 'Először engedélyezze a QR kódokat, hogy ezt beállítsa',
@@ -131,7 +134,7 @@ return array(
     'saml_sp_acs_url'           => 'Assertion Consumer Service (ACS) URL',
     'saml_sp_sls_url'           => 'Single Logout Service (SLS) URL',
     'saml_sp_x509cert'          => 'Public Certificate',
-    'saml_sp_metadata_url'      => 'Metadata URL',
+    'saml_sp_metadata_url'      => 'Metaadatok hívatkozása',
     'saml_idp_metadata'         => 'SAML IdP Metaadat',
     'saml_idp_metadata_help'    => 'You can specify the IdP metadata using a URL or XML file.',
     'saml_attr_mapping_username' => 'Attribute Mapping - Username',
@@ -170,7 +173,7 @@ return array(
     'update'                    => 'Frissítési beállítások',
     'value'                     => 'Érték',
     'brand'                     => 'Branding',
-    'web_brand'                 => 'Web Branding Type',
+    'web_brand'                 => 'Weboldalon megjelenő branding típusa',
     'about_settings_title'      => 'A Beállítások részről',
     'about_settings_text'       => 'Ezek a beállítások lehetővé teszik a telepítés egyes szempontjainak testreszabását.',
     'labels_per_page'           => 'Címkék oldalanként',
diff --git a/resources/lang/hu/admin/users/general.php b/resources/lang/hu/admin/users/general.php
index 0ebaab6cfe..5521cd548c 100644
--- a/resources/lang/hu/admin/users/general.php
+++ b/resources/lang/hu/admin/users/general.php
@@ -19,7 +19,7 @@ return array(
     'ldap_config_text'  => 'Az LDAP konfigurációs beállításai megtalálhatók az Adminisztrálás> Beállítások menüben. Az (opcionális) kiválasztott hely minden importált felhasználó számára be lesz állítva.',
     'print_assigned'    => 'Az összes hozzárendelt nyomtatása',
     'software_user'     => 'Szoftver ellenőrzése: név',
-    'send_email_help'   => 'You must provide an email address for this user to send them credentials. Emailing credentials can only be done on user creation. Passwords are stored in a one-way hash and cannot be retrieved once saved.',
+    'send_email_help'   => 'Meg kell adnod egy email címet ehhez a felhasználóhoz, hogy a hitelesítő adatok elküldve legyenek számára. Hitelesítő adatok csak a felhasználó készítésekor kerülnek elküldésre. A jelszavak hashelve kerülnek mentésre így nem lehet őket megszerezni miután elmentödtek.',
     'view_user'         => 'Felhasználó megtekintése: név',
     'usercsv'           => 'CSV fájl',
     'two_factor_admin_optin_help' => 'A jelenlegi adminisztrációs beállításai lehetővé teszik a kétütemű hitelesítés szelektív végrehajtását.',
diff --git a/resources/lang/hu/admin/users/message.php b/resources/lang/hu/admin/users/message.php
index f0e94a13e0..580934fbce 100644
--- a/resources/lang/hu/admin/users/message.php
+++ b/resources/lang/hu/admin/users/message.php
@@ -12,7 +12,8 @@ return array(
     'insufficient_permissions'  => 'Nem megfelelő engedélyek.',
     'user_deleted_warning'      => 'Ezt a felhasználót törölték. Ezt a felhasználót vissza kell állítania, hogy szerkeszteni tudja őket, vagy hozzárendelhessen új eszközökhöz.',
     'ldap_not_configured'        => 'Az LDAP integráció nem lett konfigurálva ehhez a telepítéshez.',
-    'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
+    'password_resets_sent'      => 'A kiválasztott felhasználók számára, akik aktívak és van nekik érvényes email cím, elküldésre került egy jelszó visszaállítási link.',
+    'password_reset_sent'       => 'A jelszó visszaállítási link elküldésre került a :email címre!',
 
 
     'success' => array(
diff --git a/resources/lang/hu/auth/general.php b/resources/lang/hu/auth/general.php
index 50fe9cf4cf..861bc11478 100644
--- a/resources/lang/hu/auth/general.php
+++ b/resources/lang/hu/auth/general.php
@@ -8,9 +8,9 @@ return [
     'login'                         => 'Belépés',
     'login_prompt'                  => 'Kérem, lépjen be',
     'forgot_password'               => 'Elfelejtettem a jelszavam',
-    'ldap_reset_password'           => 'Please click here to reset your LDAP password',
+    'ldap_reset_password'           => 'Kattintson ide, hogy visszaállítsad az LDAP jelszód',
     'remember_me'                   => 'Emlékezzen rám',
-    'username_help_top'                 => 'Enter your <strong>username</strong> to be emailed a password reset link.',
-    'username_help_bottom'          => 'Your username and email address <em>may</em> be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator. <br><br><strong>Usernames without an associated email address will not be emailed a password reset link.</strong> ',
+    'username_help_top'                 => 'Írd be a te <strong>felhasználónevedet</strong>, hogy a jelszó visszaállítási link elküldésre kerüljön az email címedre.',
+    'username_help_bottom'          => 'A felhasználóneved és az email címed <em>talán</em> azonos, talán nem, ez függ a beállításoktól. Ha nem emlékszel a felhasználónevedre, vedd fel a kapcsolatot az adminiszrátorral. <br><br><strong>Email nélküli felhasználónevek nem fognak jelszó visszaállítási linket kapni.</strong> ',
     ];
 
diff --git a/resources/lang/hu/auth/message.php b/resources/lang/hu/auth/message.php
index 22940fe493..e01dfdfd69 100644
--- a/resources/lang/hu/auth/message.php
+++ b/resources/lang/hu/auth/message.php
@@ -7,13 +7,13 @@ return array(
     'account_not_activated'  => 'Ez a felhasználó nincs aktiválva.',
     'account_suspended'      => 'Ez a felhasználói fiók fel van függesztve.',
     'account_banned'         => 'Ez a felhasználó ki van tiltva.',
-    'throttle'               => 'Too many failed login attempts. Please try again in :minutes minutes.',
+    'throttle'               => 'Túl sok sikertelen bejelentkezési próbálkozás. Próbáld újra :minutes perc múlva.',
 
     'two_factor' => array(
-        'already_enrolled'      => 'Your device is already enrolled.',
-        'success'               => 'You have successfully logged in.',
-        'code_required'         => 'Two-factor code is required.',
-        'invalid_code'          => 'Two-factor code is invalid.',
+        'already_enrolled'      => 'Az eszközöd már regisztrálva van.',
+        'success'               => 'Sikeresen bejelentkeztél.',
+        'code_required'         => 'Kétlépcsős azonosító kód szükséges.',
+        'invalid_code'          => 'A kétlépcsős azonosító kód érvénytelen.',
     ),
 
     'signin' => array(
@@ -22,8 +22,8 @@ return array(
     ),
 
     'logout' => array(
-        'error'   => 'There was a problem while trying to log you out, please try again.',
-        'success' => 'You have successfully logged out.',
+        'error'   => 'Probléma merült fel a kijelentkezésed közben, próbáld meg újra.',
+        'success' => 'Sikeresen kijelentkeztél.',
     ),
 
     'signup' => array(
@@ -33,7 +33,7 @@ return array(
 
     'forgot-password' => array(
         'error'   => 'A jelszó visszaállító kód kiküldése közben probléma lépett fel, kérjük próbálja újra.',
-        'success' => 'If that email address exists in our system, a password recovery email has been sent.',
+        'success' => 'Ha az adott email cím létezik a rendszerünkben, abban az esetben elküldtük a jelszó visszaállító linket az adott email címre.',
     ),
 
     'forgot-password-confirm' => array(
diff --git a/resources/lang/hu/button.php b/resources/lang/hu/button.php
index 1d6f4522a0..60b57d74fd 100644
--- a/resources/lang/hu/button.php
+++ b/resources/lang/hu/button.php
@@ -14,4 +14,5 @@ return array(
 	'select_file'				=> 'Válaszd ki a fájlt...',
     'select_files'				=> 'Fájl kiválasztása...',
     'generate_labels'           => '{1} Címke generálása|[2,*] Címkék generálása',
+    'send_password_link'       => 'Jelszó visszaállítási link küldése',
 );
diff --git a/resources/lang/hu/general.php b/resources/lang/hu/general.php
index 9b67fe4108..f9a7598ba2 100644
--- a/resources/lang/hu/general.php
+++ b/resources/lang/hu/general.php
@@ -58,7 +58,7 @@
     'created'               => 'Elem létrehozva',
     'created_asset'			=> 'létrehozott eszköz',
     'created_at' 			=> 'Létrehozva',
-    'record_created' 		=> 'Record Created',
+    'record_created' 		=> 'Rekord létrehozva',
     'updated_at' 			=> 'Frissítve:',
     'currency'  			=> 'HUF', // this is deprecated
     'current'  				=> 'Aktuális',
@@ -90,12 +90,12 @@
     'firstname_lastname_format'	=> 'Utónév (jane.smith@example.com)',
     'firstname_lastname_underscore_format' => 'Keresztnév Vezetéknév (jakab_gipsz@example.com)',
     'lastnamefirstinitial_format' =>  'Utónév Keresztnév kezdőbetű (kovacsb@example.com)',
-    'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
+    'firstintial_dot_lastname_format' => 'Keresztnév első betűje majd vezetéknév (j.smith@example.com)',
     'first'					=> 'Első',
-    'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
-    'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
-    'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
-    'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
+    'firstnamelastname'     => 'Keresztnév majd vezetéknév (janesmith@example.com)',
+    'lastname_firstinitial' => 'Vezetéknév majd keresztnév kezdőbetűje (smith_j@example.com)',
+    'firstinitial.lastname' => 'Keresztnév kezdőbetűje majd vezetéknév (j.smith@example.com)',
+    'firstnamelastinitial'  => 'Keresztnév majd vezetéknév kezdőbetűje (janes@example.com)',
     'first_name'			=> 'Keresztnév',
     'first_name_format'		=> 'Keresztnév (jane@example.com)',
     'files'                 => 'Fájlok',
@@ -112,17 +112,17 @@
     'image'                 => 'Kép',
     'image_delete'         	=> 'Kép törlése',
     'image_upload'         	=> 'Kép feltöltése',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, and svg. Max upload size allowed is :size.',
+    'image_filetypes_help'  => 'Az elfogadott fájltípusok jpg, webp, png, gif és svg. A maximális feltöltési méret a következő: size.',
     'import'         	    => 'Importálás',
     'importing'         	=> 'Importálás',
-    'importing_help'        => 'You can import assets, accessories, licenses, components, consumables, and users via CSV file. <br><br>The CSV should be comma-delimited and formatted with headers that match the ones in the <a href="https://snipe-it.readme.io/docs/importing" target="_new">sample CSVs in the documentation</a>.',
+    'importing_help'        => 'Eszközöket, tartozékokat, szoftverlicenceket, alkatrészeket, fogyóeszközöket és felhasználókat importálhat CSV fájl segítségével. <br><br>A CSV-ben az értékeket kettőspontal kell elválasztani és minden fejlécnévnek meg kell egyeznie az <a href="https://snipe-it.readme.io/docs/importing" target="_new">alap CSV dokumentációban szereplőkkel.</a>.',
     'import-history'        => 'Import történet',
     'asset_maintenance'        => 'Eszköz karbantartás',
     'asset_maintenance_report' => 'Eszköz Karbantartás Riport',
     'asset_maintenances'       => 'Eszköz karbantartások',
     'item'  				=> 'Tétel',
     'insufficient_permissions' => 'Elégtelen engedély!',
-    'kits'       			=> 'Predefined Kits',
+    'kits'       			=> 'Előre definiált csomagok',
     'language'				=> 'Nyelv',
     'last'					=> 'Legutóbbi',
     'last_login'            => 'Utolsó bejelentkezés',
@@ -133,11 +133,11 @@
     'licenses'				=> 'Licencek',
     'list_all'				=> 'Listázd mind',
     'loading'				=> 'Betöltés',
-    'lock_passwords'        => 'This field value will not be saved in a demo installation.',
+    'lock_passwords'        => 'Ez az érték nem fog elmentődni a demo telepítésekor.',
     'feature_disabled'      => 'Ez a funkció le van tiltva a demo telepítéshez.',
     'location'              => 'Helyszín',
     'locations'				=> 'Helyek',
-    'logo_size'				=> 'Square logos look best with Logo + Text. Logo maximum display size is 50px high x 500px wide.  ',
+    'logo_size'				=> 'Négyzet alakú logok néznek ki a legjobban Logo+Szöveg ként. A Logo maximum megjeleníthető mérete 50px magas x 50px széles.  ',
     'logout'				=> 'Kijelentkezés',
     'lookup_by_tag'     => 'Keresés az Asset Tag segítségével',
     'maintenances'          => 'Karbantartások',
@@ -176,7 +176,7 @@
     'remove_company'        => 'Vállati kapcsolat megszüntetése',
     'reports'				=> 'Jelentések',
     'restored'				=> 'visszaállítva',
-    'restore'				=> 'Restore',
+    'restore'				=> 'Visszaállítás',
     'requested'				=> 'Kérve',
     'request_canceled'      => 'A kérelem törölve',
     'save'  				=> 'Mentés',
@@ -200,7 +200,7 @@
     'sign_in'				=> 'Bejelentkezés',
     'signature'             => 'Aláírás',
     'skin'       			=> 'Kinézet',
-    'slack_test_msg'        => 'Oh hai! Looks like your Slack integration with Snipe-IT is working!',
+    'slack_test_msg'        => 'Oh szia! Úgy látszik a te Slack integrálásod a Snipe-IT el sikeres volt!',
     'some_features_disabled' => 'DEMO MODE: Néhány funkció le van tiltva a telepítéshez.',
     'site_name'				=> 'Hely neve',
     'state'  				=> 'Megye',
@@ -221,7 +221,7 @@
     'unknown_admin'			=> 'Ismeretlen Admin',
     'username_format'		=> 'Felhasználónév formátum',
     'update'                => 'Frissités',
-    'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
+    'upload_filetypes_help'      => 'Az engedélyezett fájltípusok: png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf és rar. A feltöltés maximum mérete :size.',
     'uploaded'              => 'Feltöltve',
     'user'					=> 'Felhasználó',
     'accepted'			    => 'elfogadva',
@@ -237,14 +237,14 @@
     'zip'  					=> 'Irányítószám',
     'noimage'				=> 'Nincs kép feltöltve vagy a kép nem található.',
     'token_expired'         => 'Az ürlap session lejárt. próbálkozz újra.',
-    'login_enabled'         => 'Login Enabled',
-    'audit_due'             => 'Due for Audit',
-    'audit_overdue'         => 'Overdue for Audit',
-    'accept'                => 'Accept :asset',
+    'login_enabled'         => 'Belépés engedélyezése',
+    'audit_due'             => 'Esedékes ellenőrzés',
+    'audit_overdue'         => 'Elévült az ellenőrzés',
+    'accept'                => ':asset elfogadva',
     'i_accept'              => 'Elfogadom',
     'i_decline'             => 'Elutasítom',
-    'sign_tos'              => 'Sign below to indicate that you agree to the terms of service:',
-    'clear_signature'       => 'Clear Signature',
-    'show_help'             => 'Show help',
-    'hide_help'             => 'Hide help',
+    'sign_tos'              => 'A lenti aláírásoddal jelzed, hogy elfogadod a szolgáltatási feltételeket:',
+    'clear_signature'       => 'Aláírás törlése',
+    'show_help'             => 'Segítség megjelenítése',
+    'hide_help'             => 'Segítség elrejtése',
     ];
diff --git a/resources/lang/hu/mail.php b/resources/lang/hu/mail.php
index 5e96646716..fe8faf0321 100644
--- a/resources/lang/hu/mail.php
+++ b/resources/lang/hu/mail.php
@@ -9,7 +9,7 @@ return array(
     'asset' => 'Eszköz:',
     'asset_name' => 'Eszköz neve:',
     'asset_requested' => 'Asset requested',
-    'asset_tag' => 'Asset Tag',
+    'asset_tag' => 'Eszköz azonosító',
     'assigned_to' => 'Hozzárendelve',
     'best_regards' => 'Üdvözlettel,',
     'canceled' => 'Megszakítva:',
@@ -18,12 +18,12 @@ return array(
     'click_to_confirm' => 'Kérjük, kattintson az alábbi linkre a weboldal megerősítéséhez: web account:',
     'click_on_the_link_accessory' => 'Az alján lévő linkre kattintva ellenőrizheti, hogy megkapta-e a tartozékot.',
     'click_on_the_link_asset' => 'Kérjük, kattintson az alul lévő linkre annak megerősítéséhez, hogy megkapták az eszközt.',
-    'Confirm_Asset_Checkin' => 'Asset checkin confirmation',
-    'Confirm_Accessory_Checkin' => 'Accessory checkin confirmation',
-    'Confirm_accessory_delivery' => 'Accessory delivery confirmation',
-    'Confirm_license_delivery' => 'License delivery confirmation',
-    'Confirm_asset_delivery' => 'Asset delivery confirmation',
-    'Confirm_consumable_delivery' => 'Consumable delivery confirmation',
+    'Confirm_Asset_Checkin' => 'Eszköz visszavételének megerősítése',
+    'Confirm_Accessory_Checkin' => 'Tartozék visszavételének megerősítése',
+    'Confirm_accessory_delivery' => 'Tartozék átvételének megerősítése',
+    'Confirm_license_delivery' => 'Licensz átvételének megerősítése',
+    'Confirm_asset_delivery' => 'Eszköz átvételének megerősítése',
+    'Confirm_consumable_delivery' => 'Fogyóeszköz átvételének megerősítése',
     'current_QTY' => 'Jelenlegi QTY',
     'Days' => 'Nap',
     'days' => 'Nap',
@@ -63,17 +63,17 @@ return array(
     'license_expiring_alert' => ':count licensz lejár :thershold nap múlva.|:count licensz lejár :thershold nap múlva.',
     'to_reset' => 'A webes jelszó visszaállításához töltsd ki ezt az űrlapot:',
     'type' => 'típus',
-    'upcoming-audits' => 'There is :count asset that is coming up for audit within :threshold days.|There are :count assets that are coming up for audit within :threshold days.',
+    'upcoming-audits' => 'Várhatóan :count eszközt kell ellenőrízni a következő :threshold napon belül.|Várhatóan :count eszközt kell ellenőrízni a következő :threshold napon belül.',
     'user' => 'Felhasználó',
     'username' => 'Felhasználónév',
     'welcome' => 'Üdvözöljük: név',
     'welcome_to' => 'Üdvözöljük a weboldalon!',
     'your_credentials' => 'A Snipe-IT hitelesítő adatai',
-    'Accessory_Checkin_Notification' => 'Accessory checked in',
-    'Asset_Checkin_Notification' => 'Asset checked in',
-    'License_Checkin_Notification' => 'License checked in',
-    'Expected_Checkin_Report' => 'Expected asset checkin report',
-    'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching',
-    'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date',
-    'your_assets' => 'View Your Assets'
+    'Accessory_Checkin_Notification' => 'Tartozék kiadva',
+    'Asset_Checkin_Notification' => 'Eszköz kiadva',
+    'License_Checkin_Notification' => 'Licensz kiadva',
+    'Expected_Checkin_Report' => 'Várható eszköz kiadásának jelentése',
+    'Expected_Checkin_Notification' => 'Emlékeztető: :name kiadásának idejéhez közelít',
+    'Expected_Checkin_Date' => 'Az eszközt amelyet kiadtak neked, hamarosan visszavételre kerül a :date napon',
+    'your_assets' => 'Eszközeidnek megtekíntése'
 );
diff --git a/resources/lang/id/admin/categories/general.php b/resources/lang/id/admin/categories/general.php
index 9435eca107..395c9ec8e7 100644
--- a/resources/lang/id/admin/categories/general.php
+++ b/resources/lang/id/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'Perbarui kategori',
     'use_default_eula'					=> 'Gunakan <a href="#" data-toggle="modal" data-target="#eulaModal"> pilihan utama</a> sebagai gantinya.',
     'use_default_eula_disabled'			=> '<del>Gunakan pilihan EULA utama sebagai gantinya.</del> Tidak ada pilihan utama yang diatur. Silahkan tambahkan di Pengaturan.',
+    'use_default_eula_column'			=> 'Gunakan aturan baku',
 
 );
diff --git a/resources/lang/id/admin/hardware/general.php b/resources/lang/id/admin/hardware/general.php
index 167226f436..282cc6841b 100644
--- a/resources/lang/id/admin/hardware/general.php
+++ b/resources/lang/id/admin/hardware/general.php
@@ -10,9 +10,9 @@ return array(
     'checkout'  				=> 'Aset Checkout',
     'clone'  					=> 'Klon Aset',
     'deployable'  				=> 'Dapat digunakan',
-    'deleted'  					=> 'This asset has been deleted.',
+    'deleted'  					=> 'Aset ini telah dihapus.',
     'edit'  					=> 'Sunting Aset',
-    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
+    'model_deleted'  			=> 'Model Aset ini telah dihapus. Anda harus memulihkan model aset tersebut sebelum Anda dapat memulihkan Aset.',
     'requestable'               => 'Dapat diminta',
     'requested'				    => 'Telah diminta',
     'restore'  					=> 'Mengembalikan aset',
diff --git a/resources/lang/id/admin/hardware/table.php b/resources/lang/id/admin/hardware/table.php
index 9468063741..b10bef1f6b 100644
--- a/resources/lang/id/admin/hardware/table.php
+++ b/resources/lang/id/admin/hardware/table.php
@@ -20,6 +20,6 @@ return array(
     'title'      	=> 'Aset ',
     'image'		=> 'Gambar Perangkat',
     'days_without_acceptance' => 'Tanda Terima',
-    'monthly_depreciation' => 'Monthly Depreciation'
+    'monthly_depreciation' => 'Penyusutan Bulanan'
 
 );
diff --git a/resources/lang/id/admin/locations/table.php b/resources/lang/id/admin/locations/table.php
index 262a115baa..0f764339fd 100644
--- a/resources/lang/id/admin/locations/table.php
+++ b/resources/lang/id/admin/locations/table.php
@@ -11,8 +11,8 @@ return array(
     'country'                   => 'Negara',
     'create'                    => 'Membuat Lokasi',
     'update'                    => 'Perbarui Lokasi',
-    'print_assigned'            => 'Print Assigned',
-    'print_all_assigned'        => 'Print All Assigned',
+    'print_assigned'            => 'Cetak Semua Ditugaskan',
+    'print_all_assigned'        => 'Cetak Semua Ditugaskan',
     'name'                      => 'Nama lokasi',
     'address'                   => 'Alamat',
     'zip'                       => 'Kode Pos',
diff --git a/resources/lang/id/admin/settings/general.php b/resources/lang/id/admin/settings/general.php
index 7212c9a0e1..2d1422945f 100644
--- a/resources/lang/id/admin/settings/general.php
+++ b/resources/lang/id/admin/settings/general.php
@@ -61,9 +61,12 @@ return array(
     'label_logo'                => 'Label Logo',
     'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
     'laravel'                   => 'Versi Laravel',
+    'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Certificate',
     'ldap_enabled'              => 'Aktifkan LDAP',
     'ldap_integration'          => 'Integrasi LDAP',
     'ldap_settings'             => 'Konfigurasi LDAP',
+    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_login_test_help'      => 'Masukkan nama pengguna dan kata sandi LDAP yang valid dari DN dasar yang Anda tentukan di atas untuk menguji apakah pengaturan login LDAP Anda telah dikonfigurasi dengan benar. PERTAMA-TAMA ANDA HARUS MENYIMPAN PENGATURAN LDAP ANDA.',
     'ldap_login_sync_help'      => 'Ini hanya menguji bahwa LDAP dapat tersinkronisasi dengan benar. Jika kueri Otentikasi LDAP Anda tidak benar, pengguna mungkin masih belum dapat masuk. PERTAMA-TAMA ANDA HARUS MENYIMPAN PENGATURAN LDAP ANDA.',
     'ldap_server'               => 'LDAP Server',
diff --git a/resources/lang/id/admin/users/general.php b/resources/lang/id/admin/users/general.php
index 6ed7bfe601..506640c412 100644
--- a/resources/lang/id/admin/users/general.php
+++ b/resources/lang/id/admin/users/general.php
@@ -19,7 +19,7 @@ return array(
     'ldap_config_text'  => 'Konfigurasi LDAP terdapat di Admin > Pengaturan. Jika lokasi di pilih, maka akan di impor untuk semua pengguna.',
     'print_assigned'    => 'Cetak Semua Ditugaskan',
     'software_user'     => 'Perangkat lunak pada :name',
-    'send_email_help'   => 'You must provide an email address for this user to send them credentials. Emailing credentials can only be done on user creation. Passwords are stored in a one-way hash and cannot be retrieved once saved.',
+    'send_email_help'   => 'Anda harus memberikan alamat email pengguna ini untuk mengirimkan kredensial kepada mereka. Pengiriman email kredensial hanya dapat dilakukan pada pembuatan user. Kata sandi disimpan dalam hash satu arah dan tidak dapat diambil setelah disimpan.',
     'view_user'         => 'Lihat pengguna: name',
     'usercsv'           => 'Berkas CSV',
     'two_factor_admin_optin_help' => 'Pengaturan admin Anda saat ini memungkinkan penegakan dua faktor otentikasi selektif.',
diff --git a/resources/lang/id/admin/users/message.php b/resources/lang/id/admin/users/message.php
index 543a8439fa..47e268c8d2 100644
--- a/resources/lang/id/admin/users/message.php
+++ b/resources/lang/id/admin/users/message.php
@@ -12,7 +12,8 @@ return array(
     'insufficient_permissions'  => 'Tidak ada hak akses.',
     'user_deleted_warning'      => 'Pengguna ini telah di hapus. Anda harus kembalikan dahulu pengguna ini jika ingin menyunting atau di berikan hak kelola aset.',
     'ldap_not_configured'        => 'Integrasi LDAP belum dikonfigurasi untuk instalasi ini.',
-    'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
+    'password_resets_sent'      => 'Pengguna terpilih yang diaktifkan dan memiliki alamat email yang valid telah dikirimi tautan pengaturan ulang kata sandi.',
+    'password_reset_sent'       => 'Tautan reset kata sandi telah dikirim ke :email!',
 
 
     'success' => array(
diff --git a/resources/lang/id/button.php b/resources/lang/id/button.php
index 5eef160166..23fc851d33 100644
--- a/resources/lang/id/button.php
+++ b/resources/lang/id/button.php
@@ -14,4 +14,5 @@ return array(
 	'select_file'				=> 'Pilih file...',
     'select_files'				=> 'Pilih File...',
     'generate_labels'           => '{1} Generate Label|[2,*] Generate Labels',
+    'send_password_link'       => 'Send Password Reset Link',
 );
diff --git a/resources/lang/is/admin/categories/general.php b/resources/lang/is/admin/categories/general.php
index 1c033e0173..4346646edb 100644
--- a/resources/lang/is/admin/categories/general.php
+++ b/resources/lang/is/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'Breyta vöruflokk',
     'use_default_eula'					=> 'Notaðu frekar <a href="#" data-toggle="modal" data-target="#eulaModal">',
     'use_default_eula_disabled'			=> '<del>Notaðu frekar sjálfgefna notendaskilmálana.</del>Sjálfgefnu notendaskilmálarnir eru ekki í notkun. Vinsamlegast bættu einhverjum notendaskilmálum við í undir "Stillingar"',
+    'use_default_eula_column'			=> 'Use default EULA',
 
 );
diff --git a/resources/lang/is/admin/settings/general.php b/resources/lang/is/admin/settings/general.php
index ca50e5e323..c354451579 100644
--- a/resources/lang/is/admin/settings/general.php
+++ b/resources/lang/is/admin/settings/general.php
@@ -61,9 +61,12 @@ return array(
     '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',
+    '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_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_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_server'               => 'LDAP Server',
diff --git a/resources/lang/is/admin/users/message.php b/resources/lang/is/admin/users/message.php
index 027ec5bb58..b4f0d17a0a 100644
--- a/resources/lang/is/admin/users/message.php
+++ b/resources/lang/is/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
     'user_deleted_warning'      => 'This user has been deleted. You will have to restore this user to edit them or assign them new assets.',
     'ldap_not_configured'        => 'LDAP integration has not been configured for this installation.',
     'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
+    'password_reset_sent'       => 'A password reset link has been sent to :email!',
 
 
     'success' => array(
@@ -38,10 +39,10 @@ return array(
         'asset_already_accepted' => 'Þessi eign hefur þegar verið samþykkt.',
         'accept_or_decline' => 'Þú verður annað hvort að samþykkja eða hafna þessari eign.',
         'incorrect_user_accepted' => 'Eigninni sem þú reyndir að samþykkja var ekki ráðstafað til þín.',
-        'ldap_could_not_connect' => 'Could not connect to the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD <br>Error from LDAP Server:',
-        'ldap_could_not_bind' => 'Could not bind to the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD<br>Error from LDAP Server: ',
-        'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD and any Locations that may have additional OUs associated with them. <br>Error from LDAP Server:',
-        'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD and any Locations that may have additional OUs associated with them. <br>Error from LDAP Server:',
+        'ldap_could_not_connect' => 'Could not connect to the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
+        'ldap_could_not_bind' => 'Could not bind to the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server: ',
+        'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
+        'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
         'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ',
     ),
 
diff --git a/resources/lang/is/button.php b/resources/lang/is/button.php
index bf78c2b2b7..6eda50eb19 100644
--- a/resources/lang/is/button.php
+++ b/resources/lang/is/button.php
@@ -14,4 +14,5 @@ return array(
 	'select_file'				=> 'Velja skrá...',
     'select_files'				=> 'Velja skrár...',
     'generate_labels'           => 'Útbúa límmiða',
+    'send_password_link'       => 'Send Password Reset Link',
 );
diff --git a/resources/lang/is/general.php b/resources/lang/is/general.php
index a9a54c5968..895370c00c 100644
--- a/resources/lang/is/general.php
+++ b/resources/lang/is/general.php
@@ -10,15 +10,15 @@
     'address'				=> 'Heimilisfang',
     'admin'					=> 'Kerfisstjóri',
     'administrator'			=> 'Kerfisstjóri',
-    'add_seats'             => 'Added seats',
+    'add_seats'             => 'Viðbætt leyfi',
     'all_assets'			=> 'Allar eignir',
     'all'       			=> 'Allt',
     'archived'              => 'Geymt',
-    'asset_models'			=> 'Asset Models',
+    'asset_models'			=> 'Tegundir',
     'asset_model'			=> 'Tegund',
     'asset'					=> 'Eign',
     'asset_report'          => 'Eignaskýrsla',
-    'asset_tag'				=> 'Asset Tag',
+    'asset_tag'				=> 'Eignar merki',
     'assets_available'		=> 'tiltækar eignir',
     'audit'				    => 'Úttekt',
     'audit_report'			=> 'Úttektarsaga',
@@ -30,7 +30,7 @@
     'bulkaudit'             => 'Bulk Audit',
     'bulkaudit_status'      => 'Staða úttektar',
     'bulk_checkout'  		=> 'Bulk Checkout',
-    'bystatus'              => 'by Status',
+    'bystatus'              => 'eftir stöðu',
     'cancel'  				=> 'Hætta við',
     'categories'			=> 'Vöruflokkar',
     'category'				=> 'Vöruflokkur',
@@ -54,7 +54,7 @@
     'consumable'			=> 'Consumable',
     'consumables'			=> 'Rekstrarvörur',
     'country'  				=> 'Land',
-    'create'				=> 'Create New',
+    'create'				=> 'Stofna nýtt',
     'created'               => 'Item Created',
     'created_asset'			=> 'skráði eign',
     'created_at' 			=> 'Created at',
diff --git a/resources/lang/it/admin/categories/general.php b/resources/lang/it/admin/categories/general.php
index c587ea7693..69ec879a83 100644
--- a/resources/lang/it/admin/categories/general.php
+++ b/resources/lang/it/admin/categories/general.php
@@ -19,5 +19,6 @@ return array(
     'use_default_eula'					=> '
 Usa <a href="#" data-toggle="modal" data-target="#eulaModal">L\'EULA predefinita</a> invece.',
     'use_default_eula_disabled'			=> '<del>Usa L\'EULA predefinita.</del> Nessuna EULA predefinita è in uso. Per favore aggiungine una nei Settaggi.',
+    'use_default_eula_column'			=> 'Utilizza EULA predefinita',
 
 );
diff --git a/resources/lang/it/admin/depreciations/general.php b/resources/lang/it/admin/depreciations/general.php
index dba7114e5c..4626905c54 100644
--- a/resources/lang/it/admin/depreciations/general.php
+++ b/resources/lang/it/admin/depreciations/general.php
@@ -8,6 +8,6 @@ return array(
     'depreciation_name'  					=> 'Nome Obsolescenza',
     'number_of_months'  					=> 'Numero di Mesi',
     'update'  					            => 'Aggiorna l\'ammortamento',
-    'depreciation_min'                      => 'Valore minimo di svalutazione'
+    'depreciation_min'                      => 'Valore minimo dopo ammortamento'
 
 );
diff --git a/resources/lang/it/admin/hardware/general.php b/resources/lang/it/admin/hardware/general.php
index c91b16f871..6650cf90ac 100644
--- a/resources/lang/it/admin/hardware/general.php
+++ b/resources/lang/it/admin/hardware/general.php
@@ -10,9 +10,9 @@ return array(
     'checkout'  				=> 'Asset Checkout',
     'clone'  					=> 'Copia Asset',
     'deployable'  				=> 'Distribuibile',
-    'deleted'  					=> 'This asset has been deleted.',
+    'deleted'  					=> 'Questo bene è stato eliminato.',
     'edit'  					=> 'Modifica Asset',
-    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
+    'model_deleted'  			=> 'Questo modello di asset è stato eliminato. Devi ripristinare il modello prima di poter ripristinare il bene.',
     'requestable'               => 'Disponibile',
     'requested'				    => 'richiesto',
     'restore'  					=> 'Ripristina Asset',
diff --git a/resources/lang/it/admin/models/general.php b/resources/lang/it/admin/models/general.php
index a5fb2db5d9..83f296c6db 100644
--- a/resources/lang/it/admin/models/general.php
+++ b/resources/lang/it/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Informazioni sui modelli di Asset',
     'about_models_text'           => 'I modelli sono un modo per raggruppare Asset identici. "MBP 2016", "IPhone 6s", etc.',
-    'deleted'  					        => 'This model has been deleted.',
+    'deleted'  					        => 'Questo modello è stato eliminato.',
     'bulk_delete'               => 'Eliminazione di massa di modelli Asset',
     'bulk_delete_help'               => 'Utilizza le caselle di controllo in basso per confermare la cancellazione dei modelli di asset selezionati. I modelli di asset con asset ad essi associati non possono essere eliminati finché le risorse non sono associate a un modello diverso.',
     'bulk_delete_warn'          => 'Stai per cancellare :asset_count assets.',
diff --git a/resources/lang/it/admin/settings/general.php b/resources/lang/it/admin/settings/general.php
index b6bf4b32bf..8fee1d8df1 100644
--- a/resources/lang/it/admin/settings/general.php
+++ b/resources/lang/it/admin/settings/general.php
@@ -61,9 +61,12 @@ return array(
     'label_logo'                => 'Logo Etichetta',
     'label_logo_size'           => 'I loghi quadrati hanno un aspetto migliore - verranno visualizzati in alto a destra di ogni etichetta dell\'asset. ',
     'laravel'                   => 'Laravel Version',
+    'ldap_client_tls_cert'      => 'Certificato TLS Client LDAP',
     'ldap_enabled'              => 'LDAP abilitato',
     'ldap_integration'          => 'Integrazione LDAP',
     'ldap_settings'             => 'Impostazioni LDAP',
+    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_login_test_help'      => 'Immettere un nome utente e una password LDAP validi dal DN di base specificato in precedenza per verificare se il login LDAP è configurato correttamente. DEVI SALVARE LE IMPOSTAZIONI LDAP AGGIORNATE PRIMA.',
     'ldap_login_sync_help'      => 'Questo verifica solamente che LDAP possa sincronizzare correttamente. Se la tua query di autenticazione LDAP non è corretta, gli utenti potrebbero non essere ancora in grado di accedere. DEVI SALVARE LE IMPOSTAZIONI LDAP PRIMA DI EFFETTUARE QUESTO TEST.',
     'ldap_server'               => 'Server LDAP',
diff --git a/resources/lang/it/admin/users/message.php b/resources/lang/it/admin/users/message.php
index 6c04cd5372..19f9a771a2 100644
--- a/resources/lang/it/admin/users/message.php
+++ b/resources/lang/it/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
     'user_deleted_warning'      => 'Questo utente è stato eliminato. Si dovrà ripristinare questo utente per modificare o assegnare nuovi beni.',
     'ldap_not_configured'        => 'L\'integrazione con LDAP non è stata configurata per questa installazione.',
     'password_resets_sent'      => 'È stato inviato un link agli utenti selezionati che sono attivati e hanno un indirizzo email valido, per reimpostare la password.',
+    'password_reset_sent'       => 'Un link per reimpostare la password è stato inviato a :email!',
 
 
     'success' => array(
diff --git a/resources/lang/it/button.php b/resources/lang/it/button.php
index a0be68411b..e264205a68 100644
--- a/resources/lang/it/button.php
+++ b/resources/lang/it/button.php
@@ -14,4 +14,5 @@ return array(
 	'select_file'				=> 'Seleziona il file...',
     'select_files'				=> 'Seleziona i file...',
     'generate_labels'           => '{1} Genera Etichetta|[2,*] Genera Etichette',
+    'send_password_link'       => 'Invia Link di Reset Password',
 );
diff --git a/resources/lang/it/general.php b/resources/lang/it/general.php
index d073796309..abc27295a3 100644
--- a/resources/lang/it/general.php
+++ b/resources/lang/it/general.php
@@ -11,7 +11,7 @@
     'admin'					=> 'Amministratore',
     'administrator'			=> 'Amministratore',
     'add_seats'             => 'Aggiunti posti',
-    'all_assets'			=> 'Tutti i Beni',
+    'all_assets'			=> 'tutti i beni',
     'all'       			=> 'Tutti i',
     'archived'              => 'Archiviato',
     'asset_models'			=> 'Modello Bene',
@@ -176,7 +176,7 @@
     'remove_company'        => 'Rimuovi associazioni azienda',
     'reports'				=> 'Reports',
     'restored'				=> 'ripristinato',
-    'restore'				=> 'Restore',
+    'restore'				=> 'Ripristina',
     'requested'				=> 'Richiesto',
     'request_canceled'      => 'Richiesta annullata',
     'save'  				=> 'Salva',
diff --git a/resources/lang/iu/admin/categories/general.php b/resources/lang/iu/admin/categories/general.php
index 7741b7da62..52e936d0b6 100644
--- a/resources/lang/iu/admin/categories/general.php
+++ b/resources/lang/iu/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'Update Category',
     'use_default_eula'					=> 'Use the <a href="#" data-toggle="modal" data-target="#eulaModal">primary default EULA</a> instead.',
     'use_default_eula_disabled'			=> '<del>Use the primary default EULA instead.</del> No primary default EULA is set. Please add one in Settings.',
+    'use_default_eula_column'			=> 'Use default EULA',
 
 );
diff --git a/resources/lang/iu/admin/settings/general.php b/resources/lang/iu/admin/settings/general.php
index e15162210e..fb268f39f0 100644
--- a/resources/lang/iu/admin/settings/general.php
+++ b/resources/lang/iu/admin/settings/general.php
@@ -61,9 +61,12 @@ return array(
     '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',
+    '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_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_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_server'               => 'LDAP Server',
diff --git a/resources/lang/iu/admin/users/message.php b/resources/lang/iu/admin/users/message.php
index e517cd113b..85d016f04a 100644
--- a/resources/lang/iu/admin/users/message.php
+++ b/resources/lang/iu/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
     'user_deleted_warning'      => 'This user has been deleted. You will have to restore this user to edit them or assign them new assets.',
     'ldap_not_configured'        => 'LDAP integration has not been configured for this installation.',
     'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
+    'password_reset_sent'       => 'A password reset link has been sent to :email!',
 
 
     'success' => array(
@@ -38,10 +39,10 @@ return array(
         'asset_already_accepted' => 'This asset has already been accepted.',
         'accept_or_decline' => 'You must either accept or decline this asset.',
         'incorrect_user_accepted' => 'The asset you have attempted to accept was not checked out to you.',
-        'ldap_could_not_connect' => 'Could not connect to the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD <br>Error from LDAP Server:',
-        'ldap_could_not_bind' => 'Could not bind to the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD<br>Error from LDAP Server: ',
-        'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD and any Locations that may have additional OUs associated with them. <br>Error from LDAP Server:',
-        'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD and any Locations that may have additional OUs associated with them. <br>Error from LDAP Server:',
+        'ldap_could_not_connect' => 'Could not connect to the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
+        'ldap_could_not_bind' => 'Could not bind to the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server: ',
+        'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
+        'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
         'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ',
     ),
 
diff --git a/resources/lang/iu/button.php b/resources/lang/iu/button.php
index 2b97223250..27131e5fc6 100644
--- a/resources/lang/iu/button.php
+++ b/resources/lang/iu/button.php
@@ -14,4 +14,5 @@ return array(
 	'select_file'				=> 'Select File...',
     'select_files'				=> 'Select Files...',
     'generate_labels'           => '{1} Generate Label|[2,*] Generate Labels',
+    'send_password_link'       => 'Send Password Reset Link',
 );
diff --git a/resources/lang/ja/admin/categories/general.php b/resources/lang/ja/admin/categories/general.php
index 4106148343..91c65ee5ab 100644
--- a/resources/lang/ja/admin/categories/general.php
+++ b/resources/lang/ja/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'カテゴリーの更新',
     'use_default_eula'					=> '<a href="#" data-toggle="modal" data-target="#eulaModal">初期設定EULA</a> を代わりに利用する。',
     'use_default_eula_disabled'			=> '<del>初期設定EULAを代わりに利用する。</del> 初期設定EULAが設定されていません。最低一つは追加してください。',
+    'use_default_eula_column'			=> 'デフォルトのEULAを使用する',
 
 );
diff --git a/resources/lang/ja/admin/hardware/general.php b/resources/lang/ja/admin/hardware/general.php
index 24d5cdcb95..669c7cb0aa 100644
--- a/resources/lang/ja/admin/hardware/general.php
+++ b/resources/lang/ja/admin/hardware/general.php
@@ -10,9 +10,9 @@ return array(
     'checkout'  				=> '資産をチェックアウト',
     'clone'  					=> '資産を複製',
     'deployable'  				=> '配備可能',
-    'deleted'  					=> 'This asset has been deleted.',
+    'deleted'  					=> 'この資産は削除されました。',
     'edit'  					=> '資産を編集',
-    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
+    'model_deleted'  			=> 'この資産モデルは削除されました。資産を復元する前に、モデルを復元する必要があります。',
     'requestable'               => '要求可能',
     'requested'				    => '要求済',
     'restore'  					=> '資産を復元',
diff --git a/resources/lang/ja/admin/models/general.php b/resources/lang/ja/admin/models/general.php
index bca084ef89..fec4ff4c35 100644
--- a/resources/lang/ja/admin/models/general.php
+++ b/resources/lang/ja/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => '資産モデルについて',
     'about_models_text'           => '資産モデルは、同一資産をグループ化する方法です。(例:「MBP 2013」、「IPhone 6」など)',
-    'deleted'  					        => 'This model has been deleted.',
+    'deleted'  					        => 'モデルは削除されました。',
     'bulk_delete'               => '資産モデルの一括削除',
     'bulk_delete_help'               => '下のチェックボックスを使用して、選択した資産モデルの削除を確認します。資産が関連付けられている資産モデルは、資産が別のモデルに関連付けられるまで削除できません。',
     'bulk_delete_warn'          => ':model_count 件の資産モデルを削除しようとしています。',
diff --git a/resources/lang/ja/admin/settings/general.php b/resources/lang/ja/admin/settings/general.php
index 9075ebc846..27e787a048 100644
--- a/resources/lang/ja/admin/settings/general.php
+++ b/resources/lang/ja/admin/settings/general.php
@@ -61,9 +61,12 @@ return array(
     'label_logo'                => 'ラベルのロゴ',
     'label_logo_size'           => 'ロゴは各アセットラベルの右上に表示されます。形は正方形が最良です。 ',
     'laravel'                   => 'Laravelバージョン',
+    'ldap_client_tls_cert'      => 'LDAPクライアントサイドTLS証明書',
     'ldap_enabled'              => 'LDAP 対応',
     'ldap_integration'          => 'LDAP 統合',
     'ldap_settings'             => 'LDAP 設定',
+    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_login_test_help'      => 'LDAPログインが正しく構成されているかどうかをテストするために、上で指定したベースDNから有効なLDAPユーザー名とパスワードを入力して下さい。その前に必ず更新後のLDAP設定を保存しておいてください。',
     'ldap_login_sync_help'      => 'これは、LDAPが正しく同期できることをテストするだけです。 LDAP認証クエリが正しくない場合、ユーザーはまだログインできない場合があります。その前に必ず更新後のLDAP設定を保存しておいてください。',
     'ldap_server'               => 'LDAP サーバ',
diff --git a/resources/lang/ja/admin/users/message.php b/resources/lang/ja/admin/users/message.php
index be19c742f8..a255965c57 100644
--- a/resources/lang/ja/admin/users/message.php
+++ b/resources/lang/ja/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
     'user_deleted_warning'      => '利用者が削除されました。これらを編集するにはユーザーを復旧するか、新しい資産を割り当てなければなりません。',
     'ldap_not_configured'        => 'LDAPの統合は、インストール時に設定されません。',
     'password_resets_sent'      => '有効なメールアドレスを持っている選択されたユーザーにパスワードリセットのリンクが送信されました。',
+    'password_reset_sent'       => 'パスワードリセットのURLが:emailに送信されました。',
 
 
     'success' => array(
diff --git a/resources/lang/ja/button.php b/resources/lang/ja/button.php
index 6fc82180e8..e3191bf95a 100644
--- a/resources/lang/ja/button.php
+++ b/resources/lang/ja/button.php
@@ -14,4 +14,5 @@ return array(
 	'select_file'				=> 'ファイルを選択...',
     'select_files'				=> 'ファイルを選択...',
     'generate_labels'           => '{1} ラベル生成|[2,*] 複数ラベル生成',
+    'send_password_link'       => 'パスワードリセットのメールを送信',
 );
diff --git a/resources/lang/ja/general.php b/resources/lang/ja/general.php
index 6e5e0eeb6e..9b751f54b9 100644
--- a/resources/lang/ja/general.php
+++ b/resources/lang/ja/general.php
@@ -176,7 +176,7 @@
     'remove_company'        => '会社の団体を取り除く',
     'reports'				=> 'レポート',
     'restored'				=> '復元',
-    'restore'				=> 'Restore',
+    'restore'				=> '復元',
     'requested'				=> '要求済',
     'request_canceled'      => 'リクエストキャンセル',
     'save'  				=> '保存',
diff --git a/resources/lang/ko/admin/categories/general.php b/resources/lang/ko/admin/categories/general.php
index a4f2c45236..f679486e6b 100644
--- a/resources/lang/ko/admin/categories/general.php
+++ b/resources/lang/ko/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> '분류 갱신',
     'use_default_eula'					=> '대체  <a href="#" data-toggle="modal" data-target="#eulaModal">기본 사용권 계약서</a>를 사용합니다.',
     'use_default_eula_disabled'			=> '<del>대체 기본 사용권 계약서를 사용합니다.</del> 기본 사용권 계약서가 정의되지 않았습니다. 설정에서 하나를 추가해 주세요.',
+    'use_default_eula_column'			=> 'Use default EULA',
 
 );
diff --git a/resources/lang/ko/admin/hardware/general.php b/resources/lang/ko/admin/hardware/general.php
index c1fc1dd7da..53defefa88 100644
--- a/resources/lang/ko/admin/hardware/general.php
+++ b/resources/lang/ko/admin/hardware/general.php
@@ -10,9 +10,9 @@ return array(
     'checkout'  				=> '반출 자산',
     'clone'  					=> '자산 복제',
     'deployable'  				=> '사용가능',
-    'deleted'  					=> 'This asset has been deleted.',
+    'deleted'  					=> '자산이 삭제되었습니다.',
     'edit'  					=> '자산 수정',
-    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
+    'model_deleted'  			=> '모델이 삭제되었습니다. 자산을 복원하기 전에 모델을 복원해야 합니다.',
     'requestable'               => '요청가능',
     'requested'				    => '요청됨',
     'restore'  					=> '자산 복원',
diff --git a/resources/lang/ko/admin/models/general.php b/resources/lang/ko/admin/models/general.php
index 4c99d54d31..bc10d14034 100644
--- a/resources/lang/ko/admin/models/general.php
+++ b/resources/lang/ko/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => '자산 모델이란',
     'about_models_text'           => '자산 모델은 동일한 자산들을 그룹화 하는 방법입니다. "MBP 2013", "IPhone 6들", 등등.',
-    'deleted'  					        => 'This model has been deleted.',
+    'deleted'  					        => '모델이 삭제되었습니다.',
     'bulk_delete'               => '자산 모델 대량 삭제',
     'bulk_delete_help'               => '선택한 자산 모델의 삭제를 확인하려면 아래 체크박스를 사용하십시오. 자산에 연결된 자산 모델은 자산이 다른 모델과 연결될 때까지 삭제할 수 없습니다.',
     'bulk_delete_warn'          => '다음을 삭제하려 합니다:model_count asset models.',
diff --git a/resources/lang/ko/admin/settings/general.php b/resources/lang/ko/admin/settings/general.php
index 56bd26b7c8..3203f00547 100644
--- a/resources/lang/ko/admin/settings/general.php
+++ b/resources/lang/ko/admin/settings/general.php
@@ -61,9 +61,12 @@ return array(
     'label_logo'                => 'Label Logo',
     'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
     'laravel'                   => 'Laravel 버전',
+    'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Certificate',
     'ldap_enabled'              => 'LDAP 활성',
     'ldap_integration'          => 'LDAP 연동',
     'ldap_settings'             => 'LDAP 설정',
+    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_login_test_help'      => '위에서 지정한 기본 DN의 유효한 LDAP 사용자 이름 및 비밀번호를 입력하여 LDAP 로그인이 올바르게 구성되었는지 테스트하십시오. 반드시 업데이트 된 LDAP 설정을 먼저 저장해야합니다.',
     'ldap_login_sync_help'      => '이것은 LDAP가 올바르게 동기화 될 수 있는지 테스트합니다. LDAP 인증 질의어가 올바르지 않으면 사용자가 여전히 로그인하지 못할 수 있습니다. 반드시 업데이트 된 LDAP 설정을 먼저 저장해야합니다.',
     'ldap_server'               => 'LDAP 서버',
diff --git a/resources/lang/ko/admin/users/message.php b/resources/lang/ko/admin/users/message.php
index ba5cb50901..dcaed2a1e3 100644
--- a/resources/lang/ko/admin/users/message.php
+++ b/resources/lang/ko/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
     'user_deleted_warning'      => '이 사용자는 삭제되었습니다. 그것들을 수정하려면 이 사용자를 복원하던가 새 자산들을 생성하세요.',
     'ldap_not_configured'        => '이 설치의 LDAP 통합이 구성이 되지 않았습니다.',
     'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
+    'password_reset_sent'       => 'A password reset link has been sent to :email!',
 
 
     'success' => array(
diff --git a/resources/lang/ko/auth/general.php b/resources/lang/ko/auth/general.php
index 83c071332c..b040aa8b4a 100644
--- a/resources/lang/ko/auth/general.php
+++ b/resources/lang/ko/auth/general.php
@@ -11,6 +11,6 @@ return [
     'ldap_reset_password'           => 'Please click here to reset your LDAP password',
     'remember_me'                   => '자동 로그인',
     'username_help_top'                 => 'Enter your <strong>username</strong> to be emailed a password reset link.',
-    'username_help_bottom'          => 'Your username and email address <em>may</em> be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator. <br><br><strong>Usernames without an associated email address will not be emailed a password reset link.</strong> ',
+    'username_help_bottom'          => '사용자 계정과  이메일 주소는 구성에 따라 동일할 수 있지만 동일하지 않을 수 있습니다. 사용자 계정을 기억할 수 없는 경우 관리자에게 문의하십시오. 연결된 이메일 주소가 없는 사용자 계정은 암호 재설정 링크가 이메일로 전송되지 않습니다.',
     ];
 
diff --git a/resources/lang/ko/button.php b/resources/lang/ko/button.php
index 6cab69abd8..5a3a714fda 100644
--- a/resources/lang/ko/button.php
+++ b/resources/lang/ko/button.php
@@ -14,4 +14,5 @@ return array(
 	'select_file'				=> '파일 선택...',
     'select_files'				=> '파일 선택...',
     'generate_labels'           => '{1} Generate Label|[2,*] Generate Labels',
+    'send_password_link'       => 'Send Password Reset Link',
 );
diff --git a/resources/lang/ko/general.php b/resources/lang/ko/general.php
index f1de7beb74..3c897a80e9 100644
--- a/resources/lang/ko/general.php
+++ b/resources/lang/ko/general.php
@@ -176,7 +176,7 @@
     'remove_company'        => '공급자 연결 제거',
     'reports'				=> '보고서',
     'restored'				=> '복원됨',
-    'restore'				=> 'Restore',
+    'restore'				=> '복원',
     'requested'				=> '요청됨',
     'request_canceled'      => '요청 취소',
     'save'  				=> '저장',
diff --git a/resources/lang/lt/admin/categories/general.php b/resources/lang/lt/admin/categories/general.php
index ca3d944ef1..4af3ede6df 100644
--- a/resources/lang/lt/admin/categories/general.php
+++ b/resources/lang/lt/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'Atnaujinti kategoriją',
     'use_default_eula'					=> 'Naudoti <a href="#" data-toggle="modal" data-target="#eulaModal"> pirminę numatytąją EULA</a>.',
     'use_default_eula_disabled'			=> '<del>Naudoti pirminė numatytąją EULA</del> Nėra pirminės numatytosios EULA. Prašome pridėkite ją nustatymuose.',
+    'use_default_eula_column'			=> 'Use default EULA',
 
 );
diff --git a/resources/lang/lt/admin/settings/general.php b/resources/lang/lt/admin/settings/general.php
index 7eb9c1ac72..db7dff8fcf 100644
--- a/resources/lang/lt/admin/settings/general.php
+++ b/resources/lang/lt/admin/settings/general.php
@@ -61,9 +61,12 @@ return array(
     'label_logo'                => 'Label Logo',
     'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
     'laravel'                   => 'Laravel versija',
+    'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Certificate',
     'ldap_enabled'              => 'LDAP įjungtas',
     'ldap_integration'          => 'LDAP integracija',
     'ldap_settings'             => 'LDAP nustatymai',
+    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_login_test_help'      => 'Prašome įvesti tinkamą LDAP vartotojo vardą ir slaptažodį iš bazės DN. Jūs privalote patikrinti ar LDAP prisijungimas sukonfigūruotas tinkamai. PIRMIAUSIA JŪS PRIVALOTE IŠSAUGOTI LDAP NUSTATYMUS.',
     'ldap_login_sync_help'      => 'Tai patikrina ar LDAP sinchronizacija teisinga. Jeigu Jūsų LADAP autentifikacijos užkalusa nėra teisinga, vartotojai gali negalėti prisijungti. PIRMIAUSIA JŪS PRIVALOTE IŠSAUGOTI LDAP NUSTATYMUS.',
     'ldap_server'               => 'LDAP serveris',
diff --git a/resources/lang/lt/admin/users/message.php b/resources/lang/lt/admin/users/message.php
index 82a7e5b415..3d8598a526 100644
--- a/resources/lang/lt/admin/users/message.php
+++ b/resources/lang/lt/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
     'user_deleted_warning'      => 'Šis naudotojas ištrintas. Jūs turėsite atkurti naudotoją norėdami redaguoto ar priskirti jam naują įrangą.',
     'ldap_not_configured'        => 'LDAP integracija nebuvo sukonfikuruota šiam diegimui.',
     'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
+    'password_reset_sent'       => 'A password reset link has been sent to :email!',
 
 
     'success' => array(
diff --git a/resources/lang/lt/button.php b/resources/lang/lt/button.php
index 9da53b5f8c..dd093b4c72 100644
--- a/resources/lang/lt/button.php
+++ b/resources/lang/lt/button.php
@@ -14,4 +14,5 @@ return array(
 	'select_file'				=> 'Pasirinkite failą ...',
     'select_files'				=> 'Pasirinkite failą...',
     'generate_labels'           => '{1} Generate Label|[2,*] Generate Labels',
+    'send_password_link'       => 'Send Password Reset Link',
 );
diff --git a/resources/lang/lv/admin/categories/general.php b/resources/lang/lv/admin/categories/general.php
index f923bec2e6..3c1695fb57 100644
--- a/resources/lang/lv/admin/categories/general.php
+++ b/resources/lang/lv/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'Atjaunināt kategoriju',
     'use_default_eula'					=> 'Tā vietā izmantojiet <a href="#" data-toggle="modal" data-target="#eulaModal">pirmo noklusējuma EULA</a>.',
     'use_default_eula_disabled'			=> '<del>Izmantojiet galveno noklusējuma EULA</del>. Netiek iestatīta galvenā noklusējuma EULA. Lūdzu, pievienojiet vienu pakalpojumā Iestatījumi.',
+    'use_default_eula_column'			=> 'Use default EULA',
 
 );
diff --git a/resources/lang/lv/admin/settings/general.php b/resources/lang/lv/admin/settings/general.php
index 6fc62013c3..01e57a843d 100644
--- a/resources/lang/lv/admin/settings/general.php
+++ b/resources/lang/lv/admin/settings/general.php
@@ -61,9 +61,12 @@ return array(
     'label_logo'                => 'Label Logo',
     'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
     'laravel'                   => 'Laravel versija',
+    'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Certificate',
     'ldap_enabled'              => 'LDAP iespējota',
     'ldap_integration'          => 'LDAP integrācija',
     'ldap_settings'             => 'LDAP iestatījumi',
+    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_login_test_help'      => 'Ievadiet derīgu LDAP lietotājvārdu un paroli no iepriekš norādītā pamata DN, lai pārbaudītu, vai LDAP lietotājvārds ir konfigurēts pareizi. VISPIRMS SAGLABĀJIET ATJAUNINĀTOS LDAP IESTATĪJUMUS.',
     'ldap_login_sync_help'      => 'Šis tikai pārbauda vai darbojas LDAP sinhronizācija. Ja LDAP autentifikācijas vaicājums nav pareizs, lietotāji, iespējams, joprojām nevarēs pierakstīties. VISPIRMS SAGLABĀJIET ATJAUNINĀTOS LDAP IESTATĪJUMUS.',
     'ldap_server'               => 'LDAP serveris',
diff --git a/resources/lang/lv/admin/users/message.php b/resources/lang/lv/admin/users/message.php
index 2e77c4caf3..10a80dcd0c 100644
--- a/resources/lang/lv/admin/users/message.php
+++ b/resources/lang/lv/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
     'user_deleted_warning'      => 'Šis lietotājs ir izdzēsts. Jums būs jāatjauno šis lietotājs, lai tos rediģētu vai piešķirtu tiem jaunus aktīvus.',
     'ldap_not_configured'        => 'LDAP integrācija nav konfigurēta šai instalācijai.',
     'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
+    'password_reset_sent'       => 'A password reset link has been sent to :email!',
 
 
     'success' => array(
diff --git a/resources/lang/lv/button.php b/resources/lang/lv/button.php
index 25366eb0dc..05f77eb989 100644
--- a/resources/lang/lv/button.php
+++ b/resources/lang/lv/button.php
@@ -14,4 +14,5 @@ return array(
 	'select_file'				=> 'Atlasiet failu ...',
     'select_files'				=> 'Atlasiet datnes...',
     'generate_labels'           => '{1} Generate Label|[2,*] Generate Labels',
+    'send_password_link'       => 'Send Password Reset Link',
 );
diff --git a/resources/lang/mi/admin/categories/general.php b/resources/lang/mi/admin/categories/general.php
index 6781dfe308..d59eb91f77 100644
--- a/resources/lang/mi/admin/categories/general.php
+++ b/resources/lang/mi/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'Whakahōuhia te Kāwai',
     'use_default_eula'					=> 'Whakamahia te taunoa 123_57__321primary taunoa EULA</a> hei utu mo tenei.',
     'use_default_eula_disabled'			=> '<del>Me te taunoa tuatahi o te EULA instead.</del> Karekau he tautuhinga taunoa EULA. Tēnā tāpirihia tētahi i Ngā Tautuhinga.',
+    'use_default_eula_column'			=> 'Use default EULA',
 
 );
diff --git a/resources/lang/mi/admin/settings/general.php b/resources/lang/mi/admin/settings/general.php
index 785f841f04..8d18afb0a1 100644
--- a/resources/lang/mi/admin/settings/general.php
+++ b/resources/lang/mi/admin/settings/general.php
@@ -61,9 +61,12 @@ return array(
     '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',
+    'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Certificate',
     'ldap_enabled'              => 'I whakahohea te LDAP',
     'ldap_integration'          => 'Te whakauru i te LDAP',
     'ldap_settings'             => 'Tautuhinga LDAP',
+    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_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_server'               => 'Tūmau LDAP',
diff --git a/resources/lang/mi/admin/users/message.php b/resources/lang/mi/admin/users/message.php
index ef939b84ab..999c5bf473 100644
--- a/resources/lang/mi/admin/users/message.php
+++ b/resources/lang/mi/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
     'user_deleted_warning'      => 'Kua mukua tenei kaiwhakamahi. Me whakahou e koe tenei kaiwhakamahi ki te whakatika i aua mea, ki te tuku ranei i nga taonga hou.',
     'ldap_not_configured'        => 'Ko te whakaurutanga LDAP kua kore i whirihorahia mo tenei whakauru.',
     'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
+    'password_reset_sent'       => 'A password reset link has been sent to :email!',
 
 
     'success' => array(
diff --git a/resources/lang/mi/button.php b/resources/lang/mi/button.php
index e7acd34c8b..77b4919873 100644
--- a/resources/lang/mi/button.php
+++ b/resources/lang/mi/button.php
@@ -14,4 +14,5 @@ return array(
 	'select_file'				=> 'Tīpako Kōnae ...',
     'select_files'				=> 'Select Files...',
     'generate_labels'           => '{1} Generate Label|[2,*] Generate Labels',
+    'send_password_link'       => 'Send Password Reset Link',
 );
diff --git a/resources/lang/mk/admin/categories/general.php b/resources/lang/mk/admin/categories/general.php
index 9054957ecd..cc28efa84c 100644
--- a/resources/lang/mk/admin/categories/general.php
+++ b/resources/lang/mk/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'Уреди категорија',
     'use_default_eula'					=> 'Наместо ова, користете <a href="#" data-toggle="modal" data-target="#eulaModal">стандардни Услови за користење</a>.',
     'use_default_eula_disabled'			=> '<del>Наместо ова, користете стандардни Услови за користење.</del> Не се внесени стандардни Услови за користење. Ве молиме внесете ги во Поставки.',
+    'use_default_eula_column'			=> 'Use default EULA',
 
 );
diff --git a/resources/lang/mk/admin/settings/general.php b/resources/lang/mk/admin/settings/general.php
index 064a2d7aaf..ec56863050 100644
--- a/resources/lang/mk/admin/settings/general.php
+++ b/resources/lang/mk/admin/settings/general.php
@@ -61,9 +61,12 @@ return array(
     'label_logo'                => 'Label Logo',
     'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
     'laravel'                   => 'Laravel верзија',
+    'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Certificate',
     'ldap_enabled'              => 'Овозможен LDAP',
     'ldap_integration'          => 'Интеграција со LDAP',
     'ldap_settings'             => 'Поставки на LDAP',
+    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_login_test_help'      => 'Внесете важечко LDAP корисничко име и лозинка од основниот DN што сте е наведен погоре за да проверите дали вашата LDAP најава е правилно конфигурирана. МОРА ПРВО ДА ГИ СНИМИТЕ LDAP ПОСТАВКИТЕ.',
     '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_server'               => 'LDAP Server',
diff --git a/resources/lang/mk/admin/users/message.php b/resources/lang/mk/admin/users/message.php
index 0c63b5b252..a6da220f12 100644
--- a/resources/lang/mk/admin/users/message.php
+++ b/resources/lang/mk/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
     'user_deleted_warning'      => 'Овој корисник е избришан. Ќе мора да го вратите за да го ажурирате или да му доделите нови основни средства.',
     'ldap_not_configured'        => 'Интеграција со LDAP не е конфигурирана.',
     'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
+    'password_reset_sent'       => 'A password reset link has been sent to :email!',
 
 
     'success' => array(
diff --git a/resources/lang/mk/button.php b/resources/lang/mk/button.php
index 2cf17817c3..da990ce3a3 100644
--- a/resources/lang/mk/button.php
+++ b/resources/lang/mk/button.php
@@ -14,4 +14,5 @@ return array(
 	'select_file'				=> 'Избери датотека...',
     'select_files'				=> 'Избери датотека...',
     'generate_labels'           => '{1} Generate Label|[2,*] Generate Labels',
+    'send_password_link'       => 'Send Password Reset Link',
 );
diff --git a/resources/lang/ml-IN/admin/categories/general.php b/resources/lang/ml-IN/admin/categories/general.php
index f681aaf85c..4b4a370e4e 100644
--- a/resources/lang/ml-IN/admin/categories/general.php
+++ b/resources/lang/ml-IN/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'Update Category',
     'use_default_eula'					=> 'Use the <a href="#" data-toggle="modal" data-target="#eulaModal">primary default EULA</a> instead.',
     'use_default_eula_disabled'			=> '<del>Use the primary default EULA instead.</del> No primary default EULA is set. Please add one in Settings.',
+    'use_default_eula_column'			=> 'Use default EULA',
 
 );
diff --git a/resources/lang/ml-IN/admin/settings/general.php b/resources/lang/ml-IN/admin/settings/general.php
index e15162210e..fb268f39f0 100644
--- a/resources/lang/ml-IN/admin/settings/general.php
+++ b/resources/lang/ml-IN/admin/settings/general.php
@@ -61,9 +61,12 @@ return array(
     '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',
+    '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_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_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_server'               => 'LDAP Server',
diff --git a/resources/lang/ml-IN/admin/users/message.php b/resources/lang/ml-IN/admin/users/message.php
index e517cd113b..85d016f04a 100644
--- a/resources/lang/ml-IN/admin/users/message.php
+++ b/resources/lang/ml-IN/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
     'user_deleted_warning'      => 'This user has been deleted. You will have to restore this user to edit them or assign them new assets.',
     'ldap_not_configured'        => 'LDAP integration has not been configured for this installation.',
     'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
+    'password_reset_sent'       => 'A password reset link has been sent to :email!',
 
 
     'success' => array(
@@ -38,10 +39,10 @@ return array(
         'asset_already_accepted' => 'This asset has already been accepted.',
         'accept_or_decline' => 'You must either accept or decline this asset.',
         'incorrect_user_accepted' => 'The asset you have attempted to accept was not checked out to you.',
-        'ldap_could_not_connect' => 'Could not connect to the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD <br>Error from LDAP Server:',
-        'ldap_could_not_bind' => 'Could not bind to the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD<br>Error from LDAP Server: ',
-        'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD and any Locations that may have additional OUs associated with them. <br>Error from LDAP Server:',
-        'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD and any Locations that may have additional OUs associated with them. <br>Error from LDAP Server:',
+        'ldap_could_not_connect' => 'Could not connect to the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
+        'ldap_could_not_bind' => 'Could not bind to the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server: ',
+        'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
+        'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
         'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ',
     ),
 
diff --git a/resources/lang/ml-IN/button.php b/resources/lang/ml-IN/button.php
index 2b97223250..27131e5fc6 100644
--- a/resources/lang/ml-IN/button.php
+++ b/resources/lang/ml-IN/button.php
@@ -14,4 +14,5 @@ return array(
 	'select_file'				=> 'Select File...',
     'select_files'				=> 'Select Files...',
     'generate_labels'           => '{1} Generate Label|[2,*] Generate Labels',
+    'send_password_link'       => 'Send Password Reset Link',
 );
diff --git a/resources/lang/mn/admin/categories/general.php b/resources/lang/mn/admin/categories/general.php
index 224ac23589..fe01f9bc13 100644
--- a/resources/lang/mn/admin/categories/general.php
+++ b/resources/lang/mn/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'Ангилал шинэчлэх',
     'use_default_eula'					=> 'Үүний оронд <a href="#" data-toggle="modal" data-target="#eulaModal">үндсэн стандарт EULA</a> -г ашиглана уу.',
     'use_default_eula_disabled'			=> '<del>Үүний оронд үндсэн хэрэглэгчийн гэрээг ашиглана уу.</del> Үндсэн хэрэглэгчийн гэрээг зааж өгөөгүй байна. Тохируулга хэсэгт нэмж оруулна уу.',
+    'use_default_eula_column'			=> 'Use default EULA',
 
 );
diff --git a/resources/lang/mn/admin/settings/general.php b/resources/lang/mn/admin/settings/general.php
index 6b3b9a9f02..9eb95f5312 100644
--- a/resources/lang/mn/admin/settings/general.php
+++ b/resources/lang/mn/admin/settings/general.php
@@ -61,9 +61,12 @@ return array(
     'label_logo'                => 'Label Logo',
     'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
     'laravel'                   => 'Лараэлийн хувилбар',
+    'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Certificate',
     'ldap_enabled'              => 'LDAP идэвхжсэн',
     'ldap_integration'          => 'LDAP интеграцчилал',
     'ldap_settings'             => 'LDAP Тохиргоо',
+    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_login_test_help'      => 'Таны LDAP нэвтрэлтийг зөв тохируулсан эсэхийг шалгахын тулд дээр дурдсан үндсэн DN-ээс хүчинтэй LDAP хэрэглэгчийн нэр, нууц үгээ оруулна уу. ТА ЭХЛЭЭД ШИНЭЧЛЭГДСЭН LDAP ТОХИРГООГОО ХАДГАЛАХ ЁСТОЙ.',
     'ldap_login_sync_help'      => 'Энэ нь зөвхөн LDAP-ийг зөв синхрончлох боломжтой эсэхийг шалгадаг. Хэрэв таны LDAP баталгаажуулалтын асуулга буруу байвал хэрэглэгчид нэвтрэх боломжгүй хэвээр байх магадлалтай. ТА ЭХЛЭЭД ШИНЭЧЛЭГДСЭН LDAP ТОХИРГООГОО ХАДГАЛАХ ЁСТОЙ.',
     'ldap_server'               => 'LDAP сервер',
diff --git a/resources/lang/mn/admin/users/message.php b/resources/lang/mn/admin/users/message.php
index d429876291..1dd62e31ff 100644
--- a/resources/lang/mn/admin/users/message.php
+++ b/resources/lang/mn/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
     'user_deleted_warning'      => 'Энэ хэрэглэгч устгагдсан. Та энэ хэрэглэгчийг засварлах, шинэ актив үүсгэх эрхтэй.',
     'ldap_not_configured'        => 'LDAP интеграци нь энэ суулгацыг тохируулаагүй байна.',
     'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
+    'password_reset_sent'       => 'A password reset link has been sent to :email!',
 
 
     'success' => array(
diff --git a/resources/lang/mn/button.php b/resources/lang/mn/button.php
index 2486db2cc1..727a68bd6f 100644
--- a/resources/lang/mn/button.php
+++ b/resources/lang/mn/button.php
@@ -14,4 +14,5 @@ return array(
 	'select_file'				=> 'Файл сонгох...',
     'select_files'				=> 'Файл сонгох...',
     'generate_labels'           => '{1} Generate Label|[2,*] Generate Labels',
+    'send_password_link'       => 'Send Password Reset Link',
 );
diff --git a/resources/lang/ms/admin/accessories/message.php b/resources/lang/ms/admin/accessories/message.php
index e06e835a08..9e1a62636d 100644
--- a/resources/lang/ms/admin/accessories/message.php
+++ b/resources/lang/ms/admin/accessories/message.php
@@ -2,7 +2,7 @@
 
 return array(
 
-    'does_not_exist' => 'The accessory [:id] does not exist.',
+    'does_not_exist' => 'Aksesori [:id] tidak wujud.',
     'assoc_users'	 => 'Aksesori ini pada masa ini mempunyai: mengira item yang diperiksa kepada pengguna. Sila semak aksesori dan cuba lagi.',
 
     'create' => array(
diff --git a/resources/lang/ms/admin/asset_maintenances/general.php b/resources/lang/ms/admin/asset_maintenances/general.php
index 81d265f846..b2bb7231dc 100644
--- a/resources/lang/ms/admin/asset_maintenances/general.php
+++ b/resources/lang/ms/admin/asset_maintenances/general.php
@@ -8,7 +8,7 @@
         'repair'             => 'Baiki',
         'maintenance'        => 'Penyelenggaraan',
         'upgrade'            => 'Naik taraf',
-        'calibration'        => 'Calibration',
-        'software_support'   => 'Software Support',
-        'hardware_support'   => 'Hardware Support',
+        'calibration'        => 'Kalibrasi',
+        'software_support'   => 'Sokongan Perisian',
+        'hardware_support'   => 'Sokongan Perkakasan',
     ];
diff --git a/resources/lang/ms/admin/categories/general.php b/resources/lang/ms/admin/categories/general.php
index 6c230e3daa..9a1f374a44 100644
--- a/resources/lang/ms/admin/categories/general.php
+++ b/resources/lang/ms/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'Kemaskini Kategori',
     'use_default_eula'					=> 'Gunakan <a href="#" data-toggle="modal" data-target="#eulaModal">pilihan utama lalai EULA</a> sebaliknya.',
     'use_default_eula_disabled'			=> '<del>Gunakan EULA lalai utama bukannya.</del> Tiada seting utama EULA ditetapkan. Sila tambah satu dalam Tetapan.',
+    'use_default_eula_column'			=> 'Guna EULA lalai',
 
 );
diff --git a/resources/lang/ms/admin/depreciations/general.php b/resources/lang/ms/admin/depreciations/general.php
index 11ee18fc6b..4c6f2130d1 100644
--- a/resources/lang/ms/admin/depreciations/general.php
+++ b/resources/lang/ms/admin/depreciations/general.php
@@ -8,6 +8,6 @@ return array(
     'depreciation_name'  					=> 'Nama Susut Nilai',
     'number_of_months'  					=> 'Bilangan Bulan',
     'update'  					            => 'Kemas kini Susutnilai',
-    'depreciation_min'                      => 'Minimum Value after Depreciation'
+    'depreciation_min'                      => 'Nilai Minimum selepas Susut Nilai'
 
 );
diff --git a/resources/lang/ms/admin/hardware/general.php b/resources/lang/ms/admin/hardware/general.php
index d21f66f7d2..5822118f43 100644
--- a/resources/lang/ms/admin/hardware/general.php
+++ b/resources/lang/ms/admin/hardware/general.php
@@ -10,9 +10,9 @@ return array(
     'checkout'  				=> 'Aset Checkout',
     'clone'  					=> 'Pendua Harta',
     'deployable'  				=> 'Deployable',
-    'deleted'  					=> 'This asset has been deleted.',
+    'deleted'  					=> 'Aset ini telah dipadamkan.',
     'edit'  					=> 'Kemaskini Harta',
-    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
+    'model_deleted'  			=> 'Model Aset ini telah dipadamkan. Anda mesti kembalikan model sebelum anda boleh kembalikan Aset.',
     'requestable'               => 'Diminta',
     'requested'				    => 'Diminta',
     'restore'  					=> 'Pulihkan Asset',
diff --git a/resources/lang/ms/admin/hardware/table.php b/resources/lang/ms/admin/hardware/table.php
index 1fa744ae50..cee76b3154 100644
--- a/resources/lang/ms/admin/hardware/table.php
+++ b/resources/lang/ms/admin/hardware/table.php
@@ -20,6 +20,6 @@ return array(
     'title'      	=> 'Harta ',
     'image'		=> 'Imej Peranti',
     'days_without_acceptance' => 'Hari Tanpa Penerimaan',
-    'monthly_depreciation' => 'Monthly Depreciation'
+    'monthly_depreciation' => 'Susut Nilai Bulanan'
 
 );
diff --git a/resources/lang/ms/admin/kits/general.php b/resources/lang/ms/admin/kits/general.php
index b4f2d90ae1..2823e18451 100644
--- a/resources/lang/ms/admin/kits/general.php
+++ b/resources/lang/ms/admin/kits/general.php
@@ -1,17 +1,17 @@
 <?php
 
 return array(
-    '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.',
+    'about_kits_title'                  => 'Perihal Kit Pratakrif',
+    'about_kits_text'                   => 'Kit Pratakrif membolehkan anda menyemak koleksi item (aset, lesen, dll) dengan cepat kepada pengguna. Ini boleh membantu apabila proses onboarding anda konsisten merentas ramai pengguna dan semua pengguna menerima item yang sama.',
     '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. ',
+    'create_success'                    => 'Kit berjaya dibuat.',
+    'create'                            => 'Buat Kit Pratakrif',
+    'update'                            => 'Kemas kini Kit Pratakrif',
+    'delete_success'                    => 'Kit berjaya dipadamkan.',
+    'update_success'                    => 'Kit telah berjaya dikemas kini.',
+    'none_models'                       => 'Aset tersedia tidak mencukupi untuk :model untuk checkout. :qty diperlukan. ',
+    'none_licenses'                     => 'Tidak ada ruang yang mencukupi untuk :license untuk checkout. :qty diperlukan. ',
+    'none_consumables'                  => 'Tiada unit tersedia untuk :consumable untuk checkout. :qty diperlukan. ',
+    'none_accessory'                    => 'Unit :aksesori yang tersedia tidak mencukupi untuk daftar keluar. :qty diperlukan. ',
 
 );
diff --git a/resources/lang/ms/admin/licenses/message.php b/resources/lang/ms/admin/licenses/message.php
index 25c59864ff..e07ce5eee5 100644
--- a/resources/lang/ms/admin/licenses/message.php
+++ b/resources/lang/ms/admin/licenses/message.php
@@ -8,7 +8,7 @@ return array(
     'owner_doesnt_match_asset' => 'Harta yang anda ingin sekutukan dengan lesen ini dimiliki oleh orang lain selain dari orang yang dipilih dalam pilihan yang disekutukan.',
     'assoc_users'	 => 'Lesen ini telah diagihkan kepada pengguna dan tidak boleh dihapuskan. Sila semak lesen terlebih dahulu, dan cuba hapus semula.  ',
     'select_asset_or_person' => 'Anda mesti memilih aset atau pengguna, tetapi tidak kedua-duanya.',
-    'not_found' => 'License not found',
+    'not_found' => 'Lesen tidak ditemui',
 
 
     'create' => array(
diff --git a/resources/lang/ms/admin/locations/table.php b/resources/lang/ms/admin/locations/table.php
index b65bb1e997..0acfa83847 100644
--- a/resources/lang/ms/admin/locations/table.php
+++ b/resources/lang/ms/admin/locations/table.php
@@ -11,7 +11,7 @@ return array(
     'country'                   => 'Negara',
     'create'                    => 'Cipta Lokasi',
     'update'                    => 'Kemaskini Lokasi',
-    'print_assigned'            => 'Print Assigned',
+    'print_assigned'            => 'Cetakan Ditugaskan',
     'print_all_assigned'        => 'Print All Assigned',
     'name'                      => 'Nama Lokasi',
     'address'                   => 'Alamat',
diff --git a/resources/lang/ms/admin/models/general.php b/resources/lang/ms/admin/models/general.php
index 7773d3d1c3..d0814712b1 100644
--- a/resources/lang/ms/admin/models/general.php
+++ b/resources/lang/ms/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Mengenai Model Asset',
     'about_models_text'           => 'Model Aset adalah cara untuk mengumpulkan aset yang sama. "MBP 2013", "IPhone 6s", dan sebagainya.',
-    'deleted'  					        => 'This model has been deleted.',
+    'deleted'  					        => 'Model ini telah dipadamkan.',
     'bulk_delete'               => 'Padam Secara Pukal Model Aset',
     'bulk_delete_help'               => 'Gunakan kotak semakan di bawah untuk mengesahkan penghapusan model aset terpilih. Model aset yang mempunyai aset yang berkaitan dengannya tidak boleh dihapuskan sehingga aset dikaitkan dengan model yang berbeza.',
     'bulk_delete_warn'          => 'Anda akan hapus :model_count model aset.',
@@ -14,5 +14,5 @@ return array(
     'view_models'               => 'Lihat Model',
     'fieldset'                  => 'Fieldset',
     'no_custom_field'           => 'Tiada bidang tersuai',
-    'add_default_values'        => 'Add default values',
+    'add_default_values'        => 'Tambahkan nilai lalai',
 );
diff --git a/resources/lang/ms/admin/models/message.php b/resources/lang/ms/admin/models/message.php
index 05662d224e..9e2a1dd13d 100644
--- a/resources/lang/ms/admin/models/message.php
+++ b/resources/lang/ms/admin/models/message.php
@@ -34,9 +34,9 @@ return array(
     ),
 
     'bulkdelete' => array(
-        'error'   		    => 'No models were selected, so nothing was deleted.',
-        'success' 		    => ':success_count model(s) deleted!',
-        'success_partial' 	=> ':success_count model(s) were deleted, however :fail_count were unable to be deleted because they still have assets associated with them.'
+        'error'   		    => 'Tiada model dipilih, jadi tiada apa yang dipadamkan.',
+        'success' 		    => ':success_count model(s) dipadamkan!',
+        'success_partial' 	=> ':success_count model(s) telah dipadamkan, namun :fail_count tidak dapat dipadamkan kerana mereka masih mempunyai aset yang dikaitkan dengannya.'
     ),
 
 );
diff --git a/resources/lang/ms/admin/settings/general.php b/resources/lang/ms/admin/settings/general.php
index dfd13f6449..a302170f42 100644
--- a/resources/lang/ms/admin/settings/general.php
+++ b/resources/lang/ms/admin/settings/general.php
@@ -4,18 +4,18 @@ return array(
     'ad'				        => 'Direktori Aktif',
     'ad_domain'				    => 'Domain direktori aktif',
     'ad_domain_help'			=> 'Ini kadangkala sama dengan domain e-mel anda, tetapi tidak semestinya.',
-    'ad_append_domain_label'    => 'Append domain name',
-    'ad_append_domain'          => 'Append domain name to username field',
-    'ad_append_domain_help'     => 'User isn\'t required to write "username@domain.local", they can just type "username".' ,
-    'admin_cc_email'            => 'CC Email',
-    'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
+    'ad_append_domain_label'    => 'Tambahkan nama domain',
+    'ad_append_domain'          => 'Tambahkan nama domain pada medan nama pengguna',
+    'ad_append_domain_help'     => 'Pengguna tidak perlu menulis "nama pengguna@domain.local", mereka hanya boleh menaip "nama pengguna".' ,
+    'admin_cc_email'            => 'SK Email',
+    'admin_cc_email_help'       => 'Jika anda ingin menghantar salinan e-mel daftar masuk/daftar keluar yang dihantar kepada pengguna ke akaun e-mel tambahan, masukkannya di sini. Jika tidak, biarkan medan ini kosong.',
     'is_ad'				        => 'Ini adalah pelayan Direktori Aktif',
     'alert_email'				=> 'Hantar isyarat kepada',
     'alerts_enabled'			=> 'Isyarat Dihidupkan',
     'alert_interval'			=> 'Amaran Pemberitahuan Amaran (dalam hari)',
     'alert_inv_threshold'		=> 'Ambang Amaran Inventori',
-    'allow_user_skin'           => 'Allow user skin',
-    'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' ,
+    'allow_user_skin'           => 'Benarkan kulit antaramuka pengguna',
+    'allow_user_skin_help_text' => 'Menandai kotak ini akan membolehkan pengguna mengatasi kulit UI dengan kulit yang berbeza.' ,
     'asset_ids'					=> 'ID Aset',
     'audit_interval'            => 'Selang Audit',
     'audit_interval_help'       => 'Sekiranya anda dikehendaki untuk secara tetap mengaudit aset anda, masukkan selang waktu dalam bulan.',
@@ -27,13 +27,13 @@ return array(
     'backups'					=> 'Sandaran',
     'barcode_settings'			=> 'Tetapan Kod Bar',
     'confirm_purge'			    => 'Mengesahkan Purge',
-    'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone and will PERMANENTLY delete all soft-deleted items and users. (You should make a backup first, just to be safe.)',
+    'confirm_purge_help'		=> 'Masukkan teks "DELETE" dalam kotak di bawah untuk membersihkan rekod anda yang dipadamkan. Tindakan ini tidak boleh dibuat asal dan akan memadamkan semua item dan pengguna yang dipadam lembut secara KEKAL. (Anda harus membuat sandaran dahulu, hanya untuk selamat.)',
     'custom_css'				=> 'CSS tersuai',
     'custom_css_help'			=> 'Masukkan mana-mana CSS ubah khas yang anda mahu gunakan. Jangan masukkan tag &lt;style&gt;&lt;/style&gt;.',
     'custom_forgot_pass_url'	=> 'URL Khas untuk Penetapan Semula Kata Laluan',
     'custom_forgot_pass_url_help'	=> 'Ini menggantikan URL terlupa kata laluan terbina pada skrin log masuk, berguna untuk mengarahkan pengguna ke fungsi semula kata laluan LDAP dalaman atau dihoskan. Ia secara langsung akan melumpuhkan fungsi kata laluan terlupa pengguna tempatan.',
-    'dashboard_message'			=> 'Dashboard Message',
-    'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
+    'dashboard_message'			=> 'Mesej Papan Pemuka',
+    'dashboard_message_help'	=> 'Teks ini akan muncul pada papan pemuka untuk sesiapa sahaja yang mempunyai kebenaran untuk melihat papan pemuka.',
     'default_currency'  		=> 'Mata Wang Default',
     'default_eula_text'			=> 'EULA lalai',
     'default_language'			=> 'Bahasa Lalai',
@@ -43,27 +43,30 @@ return array(
     'display_eol'               => 'Papar EOL dalam paparan jadual',
     'display_qr'                => 'Paparkan Kod Square',
     'display_alt_barcode'		=> 'Paparkan kod bar 1D',
-    'email_logo'                => 'Email Logo',
+    'email_logo'                => 'Logo E-Mel',
     'barcode_type'				=> 'Jenis Barcode 2D',
     'alt_barcode_type'			=> 'Jenis kod bar 1D',
-    'email_logo_size'       => 'Square logos in email look best. ',
+    'email_logo_size'       => 'Logo segi empat sama dalam e-mel kelihatan terbaik. ',
     'eula_settings'				=> 'Tetapan EULA',
     'eula_markdown'				=> 'EULA ini membolehkan markah <a href="https://help.github.com/articles/github-flavored-markdown/">Github berperisa</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'            => 'Jenis fail yang diterima ialah ico, png dan gif. Format imej lain mungkin tidak berfungsi dalam semua penyemak imbas.',
+    'favicon_size'          => 'Favicon hendaklah imej segi empat sama, 16x16 piksel.',
+    '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',
     'generate_backup'			=> 'Hasilkan Backup',
     'header_color'              => 'Warna Tandukan',
     'info'                      => 'Tetapan ini membenarkan anda menyesuaikan sesetengah aspek pemasangan anda.',
-    'label_logo'                => 'Label Logo',
-    'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
+    'label_logo'                => 'Logo Label',
+    'label_logo_size'           => 'Logo segi empat sama kelihatan terbaik - akan dipaparkan di bahagian atas sebelah kanan setiap label aset. ',
     'laravel'                   => 'Versi Laravel',
+    'ldap_client_tls_cert'      => 'Sijil TLS Bahagian Pelanggan LDAP',
     'ldap_enabled'              => 'LDAP diaktifkan',
     'ldap_integration'          => 'Integrasi LDAP',
     'ldap_settings'             => 'Tetapan LDAP',
+    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_login_test_help'      => 'Masukkan nama pengguna dan kata laluan LDAP yang sah dari pangkalan DN yang anda tentukan di atas untuk menguji sama ada log masuk LDAP anda dikonfigurasi dengan betul. ANDA MESTI SIMPAN KONFIGURASI LDAP TERKINI DAHULU.',
     'ldap_login_sync_help'      => 'Ini hanya ujian bahawa LDAP boleh diselaraskan dengan betul. Jika pertanyaan Pengesahan LDAP anda tidak betul, pengguna mungkin masih tidak boleh log masuk. ANDA MESTI SIMPAN KONFIGURASI LDAP TERKINI DAHULU.',
     'ldap_server'               => 'Pelayan LDAP',
@@ -74,10 +77,10 @@ return array(
     'ldap_tls'                  => 'Gunakan TLS',
     'ldap_tls_help'             => 'Ini harus diperiksa hanya jika anda menjalankan STARTTLS pada pelayan LDAP anda.',
     'ldap_uname'                => 'Nama Pengguna LDAP Bind',
-    'ldap_dept'                 => 'LDAP Department',
-    'ldap_phone'                => 'LDAP Telephone Number',
-    'ldap_jobtitle'             => 'LDAP Job Title',
-    'ldap_country'              => 'LDAP Country',
+    'ldap_dept'                 => 'Jabatan LDAP',
+    'ldap_phone'                => 'Nombor Telefon LDAP',
+    'ldap_jobtitle'             => 'LDAP Jawatan',
+    'ldap_country'              => 'LDAP Negara',
     'ldap_pword'                => 'LDAP Bind Password',
     'ldap_basedn'               => 'Pangkalan Bind DN',
     'ldap_filter'               => 'Penapis LDAP',
@@ -89,29 +92,29 @@ return array(
     'ldap_auth_filter_query'    => 'Pertanyaan Pengesahan LDAP',
     'ldap_version'              => 'Versi LDAP',
     'ldap_active_flag'          => 'Bendera Aktif LDAP',
-    'ldap_activated_flag_help'  => 'This flag is used to determine whether a user can login to Snipe-IT and does not affect the ability to check items in or out to them.',
+    'ldap_activated_flag_help'  => 'Bendera ini digunakan untuk menentukan sama ada pengguna boleh log masuk ke Snipe-IT dan tidak menjejaskan keupayaan untuk menyemak item masuk atau keluar kepada mereka.',
     'ldap_emp_num'              => 'Nombor Kakitangan LDAP',
     'ldap_email'                => 'E-mel LDAP',
-    'license'                  => 'Software License',
+    'license'                  => 'Lesen Perisian',
     'load_remote_text'          => 'Skrip Jauh',
     'load_remote_help_text'		=> 'Pemasangan Snipe-IT ini boleh memuatkan skrip dari dunia luar.',
     'login_note'                => 'Nota Masuk',
     'login_note_help'           => 'Opsyenal termasuk beberapa ayat pada skrin log masuk anda, contohnya untuk membantu orang yang telah menemui peranti yang hilang atau dicuri. Medan ini menerima markah <a href="https://help.github.com/articles/github-flavored-markdown/">Github 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_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_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_header_name_text' => 'Custom user name header',
-    'login_remote_user_header_name_help' => 'Use the specified header instead of REMOTE_USER',
+    'login_remote_user_text'    => 'Pilihan log masuk Pengguna Jarak Jauh',
+    'login_remote_user_enabled_text' => 'Dayakan Log Masuk dengan Pengepala Pengguna Jarak Jauh',
+    'login_remote_user_enabled_help' => 'Pilihan ini mendayakan Pengesahan melalui pengepala REMOTE_USER mengikut "Antara Muka Gerbang Biasa (rfc3875)"',
+    'login_common_disabled_text' => 'Lumpuhkan mekanisme pengesahan lain',
+    'login_common_disabled_help' => 'Pilihan ini melumpuhkan mekanisme pengesahan lain. Hanya dayakan pilihan ini jika anda pasti log masuk REMOTE_USER anda sudah berfungsi',
+    'login_remote_user_custom_logout_url_text' => 'URL log keluar tersuai',
+    'login_remote_user_custom_logout_url_help' => 'Jika url disediakan di sini, pengguna akan diubah hala ke URL ini selepas pengguna log keluar dari Snipe-IT. Ini berguna untuk menutup sesi pengguna pembekal Pengesahan anda dengan betul.',
+    'login_remote_user_header_name_text' => 'Pengepala nama pengguna tersuai',
+    'login_remote_user_header_name_help' => 'Gunakan pengepala yang ditentukan dan bukannya REMOTE_USER',
     'logo'                    	=> 'Logo',
-    'logo_print_assets'         => 'Use in Print',
-    'logo_print_assets_help'    => 'Use branding on printable asset lists ',
+    'logo_print_assets'         => 'Gunakan dalam Cetakan',
+    'logo_print_assets_help'    => 'Gunakan penjenamaan pada senarai aset boleh cetak ',
     'full_multiple_companies_support_help_text' => 'Membataskan pengguna (termasuk pentadbir) yang diberikan kepada syarikat kepada aset syarikat mereka.',
     'full_multiple_companies_support_text' => 'Sokongan Syarikat Pelbagai Penuh',
-    'show_in_model_list'   => 'Show in Model Dropdowns',
+    'show_in_model_list'   => 'Tunjukkan dalam Model Dropdown',
     'optional'					=> 'pilihan',
     'per_page'                  => 'Senarai Setiap Mukasurat',
     'php'                       => 'Versi PHP',
@@ -120,22 +123,22 @@ return array(
     'pwd_secure_complexity'     => 'Kompleks Kata Laluan',
     'pwd_secure_complexity_help' => 'Pilih mana-mana peraturan kompleksiti kata laluan yang anda mahu untuk menguatkuasakan.',
     'pwd_secure_min'            => 'Aksara minimum kata laluan',
-    'pwd_secure_min_help'       => 'Minimum permitted value is 8',
+    'pwd_secure_min_help'       => 'Nilai minimum yang dibenarkan ialah 8',
     'pwd_secure_uncommon'       => 'Cegah kata laluan biasa',
     'pwd_secure_uncommon_help'  => 'Ini tidak akan membenarkan pengguna menggunakan kata laluan yang biasa dari 10,000 kata laluan teratas dilaporkan melanggar.',
     'qr_help'                   => 'Bolehkan Kod QR dahulu untuk pasang ini',
     'qr_text'                   => 'Teks Kod QR',
-    'saml_enabled'              => 'SAML enabled',
-    'saml_integration'          => 'SAML Integration',
-    'saml_sp_entityid'          => 'Entity ID',
-    'saml_sp_acs_url'           => 'Assertion Consumer Service (ACS) URL',
-    'saml_sp_sls_url'           => 'Single Logout Service (SLS) URL',
-    'saml_sp_x509cert'          => 'Public Certificate',
-    'saml_sp_metadata_url'      => 'Metadata URL',
-    'saml_idp_metadata'         => 'SAML IdP Metadata',
-    'saml_idp_metadata_help'    => 'You can specify the IdP metadata using a URL or XML file.',
-    'saml_attr_mapping_username' => 'Attribute Mapping - Username',
-    'saml_attr_mapping_username_help' => 'NameID will be used if attribute mapping is unspecified or invalid.',
+    'saml_enabled'              => 'SAML didayakan',
+    'saml_integration'          => 'Penyepaduan SAML',
+    'saml_sp_entityid'          => 'ID Entiti',
+    'saml_sp_acs_url'           => 'URL Assertion Consumer Service (ACS)',
+    'saml_sp_sls_url'           => 'URL Perkhidmatan Log Keluar Tunggal (SLS)',
+    'saml_sp_x509cert'          => 'Sijil Awam',
+    'saml_sp_metadata_url'      => 'URL metadata',
+    'saml_idp_metadata'         => 'Metadata IdP SAML',
+    'saml_idp_metadata_help'    => 'Anda boleh menentukan metadata IdP menggunakan URL atau fail XML.',
+    'saml_attr_mapping_username' => 'Pemetaan Atribut - Nama Pengguna',
+    'saml_attr_mapping_username_help' => 'NameID akan digunakan jika pemetaan atribut tidak ditentukan atau tidak sah.',
     'saml_forcelogin_label'     => 'SAML Force Login',
     'saml_forcelogin'           => 'Make SAML the primary login',
     'saml_forcelogin_help'      => 'You can use \'/login?nosaml\' to get to the normal login page.',
diff --git a/resources/lang/ms/admin/statuslabels/table.php b/resources/lang/ms/admin/statuslabels/table.php
index e9fb99b2bd..5a23ce5243 100644
--- a/resources/lang/ms/admin/statuslabels/table.php
+++ b/resources/lang/ms/admin/statuslabels/table.php
@@ -5,8 +5,8 @@ return array(
     'archived'      	=> 'Diarkibkan',
     'create'      	=> 'Cipata Label Status',
     'color'      	=> 'Warna Carta',
-    'default_label' => 'Default Label',
-    'default_label_help' => 'This is used to ensure your most commonly used status labels appear at the top of the select box when creating/editing assets.',
+    'default_label' => 'Label Asal',
+    'default_label_help' => 'Ini digunakan untuk memastikan label status yang paling biasa anda gunakan muncul di bahagian atas kotak pilihan semasa membuat/mengedit aset.',
     'deployable'      	=> 'Deployable',
     'info'      	=> 'Label status digunakan untuk menggambarkan pelbagai negeri aset anda boleh masuk. Mereka mungkin keluar untuk dibaiki, hilang / dicuri, dan lain-lain. Anda boleh membuat label status baru untuk aset yang boleh ditugaskan, tertunda dan diarkibkan.',
     'name'      	=> 'Nama Status',
diff --git a/resources/lang/ms/admin/users/general.php b/resources/lang/ms/admin/users/general.php
index f7aec797b9..ce3fb13ebc 100644
--- a/resources/lang/ms/admin/users/general.php
+++ b/resources/lang/ms/admin/users/general.php
@@ -19,7 +19,7 @@ return array(
     'ldap_config_text'  => 'Tetapan konfigurasi LDAP boleh didapati Admin> Tetapan. Lokasi (pilihan) yang dipilih akan ditetapkan untuk semua pengguna yang diimport.',
     'print_assigned'    => 'Cetak Semua yang Diperuntukkan',
     'software_user'     => 'Perisian diagihkan kepada :nama',
-    'send_email_help'   => 'You must provide an email address for this user to send them credentials. Emailing credentials can only be done on user creation. Passwords are stored in a one-way hash and cannot be retrieved once saved.',
+    'send_email_help'   => 'Anda mesti memberikan alamat e-mel untuk pengguna ini menghantar bukti kelayakan kepada mereka. Bukti kelayakan e-mel hanya boleh dilakukan pada penciptaan pengguna. Kata laluan disimpan dalam cincang sehala dan tidak boleh diambil semula setelah disimpan.',
     'view_user'         => 'Papar Pengguna :nama',
     'usercsv'           => 'Fail CSV',
     'two_factor_admin_optin_help' => 'Tetapan admin semasa anda membenarkan penguatkuasaan selektif pengesahan dua faktor.',
diff --git a/resources/lang/ms/admin/users/message.php b/resources/lang/ms/admin/users/message.php
index 7903cad454..b7d366d720 100644
--- a/resources/lang/ms/admin/users/message.php
+++ b/resources/lang/ms/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
     'user_deleted_warning'      => 'Pengguna telah dihapuskan. Anda perlu masukkan semula pengguna ini untuk kemaskini atau untuk serahkan dia harta baru.',
     'ldap_not_configured'        => 'Integrasi LDAP belum dikonfigurasi untuk pemasangan ini.',
     'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
+    'password_reset_sent'       => 'A password reset link has been sent to :email!',
 
 
     'success' => array(
diff --git a/resources/lang/ms/button.php b/resources/lang/ms/button.php
index 28a2961c6f..f8c47bc27c 100644
--- a/resources/lang/ms/button.php
+++ b/resources/lang/ms/button.php
@@ -12,6 +12,7 @@ return array(
     'submit'  	                => 'Hantar',
     'upload'                    => 'Muat naik',
 	'select_file'				=> 'Pilih Fail ...',
-    'select_files'				=> 'Select Files...',
+    'select_files'				=> 'Pilih Fail...',
     'generate_labels'           => '{1} Generate Label|[2,*] Generate Labels',
+    'send_password_link'       => 'Hantar Pautan Set Semula Kata Laluan',
 );
diff --git a/resources/lang/nl/admin/categories/general.php b/resources/lang/nl/admin/categories/general.php
index f0d0c3b373..ca25719e4d 100644
--- a/resources/lang/nl/admin/categories/general.php
+++ b/resources/lang/nl/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'Categorie Bijwerken',
     'use_default_eula'					=> 'Gebruik de <a href="#" data-toggle="modal" data-target="#eulaModal"> standaard gebruikersovereenkomst</a> anders.',
     'use_default_eula_disabled'			=> '<del>Gebruik de standaard gebruikersovereenkomst anders.</del> Geen standaard gebruikersovereenkomst ingesteld. Voeg er één toe in Instellingen.',
+    'use_default_eula_column'			=> 'Gebruik standaard eindgebruikersovereenkomst',
 
 );
diff --git a/resources/lang/nl/admin/hardware/general.php b/resources/lang/nl/admin/hardware/general.php
index 32e2e67fe2..f71e81d134 100644
--- a/resources/lang/nl/admin/hardware/general.php
+++ b/resources/lang/nl/admin/hardware/general.php
@@ -10,9 +10,9 @@ return array(
     'checkout'  				=> 'Asset uitchecken',
     'clone'  					=> 'Dupliceer Asset',
     'deployable'  				=> 'Uitgeefbaar',
-    'deleted'  					=> 'This asset has been deleted.',
+    'deleted'  					=> 'Deze asset is verwijderd.',
     'edit'  					=> 'Asset bewerken',
-    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
+    'model_deleted'  			=> 'Dit Assets model is verwijderd. U moet het model herstellen voordat u het Asset kunt herstellen.',
     'requestable'               => 'Aanvraagbaar',
     'requested'				    => 'Aangevraagd',
     'restore'  					=> 'Herstel Asset',
diff --git a/resources/lang/nl/admin/models/general.php b/resources/lang/nl/admin/models/general.php
index cadbacf96f..bdc6d86fc7 100644
--- a/resources/lang/nl/admin/models/general.php
+++ b/resources/lang/nl/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Over Asset Modellen',
     'about_models_text'           => 'Assetmodellen zijn een manier om identieke assets te groeperen. "MBP 2013", "iPhone 6s", enz.',
-    'deleted'  					        => 'This model has been deleted.',
+    'deleted'  					        => 'Dit model is verwijderd.',
     'bulk_delete'               => 'In bulk verwijderen van assetmodellen',
     'bulk_delete_help'               => 'Gebruik de selectievakjes hieronder om het verwijderen van de geselecteerde assetmodellen te bevestigen. Assetmodellen waarbij assets gekoppeld zijn, kunnen niet verwijderd worden totdat de assets gekoppeld zijn aan een ander model.',
     'bulk_delete_warn'          => 'Je staat op het punt om :model_count assetmodellen te verwijderen.',
diff --git a/resources/lang/nl/admin/settings/general.php b/resources/lang/nl/admin/settings/general.php
index ec23d09774..2b10ed2a49 100644
--- a/resources/lang/nl/admin/settings/general.php
+++ b/resources/lang/nl/admin/settings/general.php
@@ -61,9 +61,12 @@ return array(
     'label_logo'                => 'Label logo',
     'label_logo_size'           => 'Vierkante logo\'s zien er het beste uit - zullen worden weergegeven in de rechterbovenhoek van elk asset label. ',
     'laravel'                   => 'Laravel Versie',
+    'ldap_client_tls_cert'      => 'LDAP Client-Side TLS-certificaat',
     'ldap_enabled'              => 'LDAP ingeschakeld',
     'ldap_integration'          => 'LDAP integratie',
     'ldap_settings'             => 'LDAP instellingen',
+    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_login_test_help'      => 'Voer een geldig LDAP gebruikersnaam en paswoord in van de base DN die u hierboven heeft bepaald. Dit om te testen of uw LDAP login correct is geconfigureerd. U MOET EERST UW BIJGEWERKTE LDAP INSTELLINGEN OPSLAAN.',
     'ldap_login_sync_help'      => 'Dit test enkel of LDAP correct kan synchroniseren. Als uw LDAP authenticatie vraag niet correct is, dan is het mogelijk dat gebruikers niet kunnen inloggen. U MOET EERST UW BIJGEWERKTE LDAP INSTELLINGEN OPSLAAN.',
     'ldap_server'               => 'LDAP server',
diff --git a/resources/lang/nl/admin/users/message.php b/resources/lang/nl/admin/users/message.php
index 70ad72b991..284aa3406c 100644
--- a/resources/lang/nl/admin/users/message.php
+++ b/resources/lang/nl/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
     'user_deleted_warning'      => 'Deze gebruiker is verwijderd. Je zult deze gebruiker moeten herstellen om hem te bewerken of om nieuwe assets toe te wijzen.',
     'ldap_not_configured'        => 'LDAP integratie is niet geconfigureerd voor deze installatie.',
     'password_resets_sent'      => 'De geselecteerde gebruikers die zijn geactiveerd en die een geldig e-mailadres hebben, hebben een wachtwoord reset link ontvangen.',
+    'password_reset_sent'       => 'Een link om het wachtwoord te resetten is verstuurd naar :email!',
 
 
     'success' => array(
diff --git a/resources/lang/nl/button.php b/resources/lang/nl/button.php
index b1a41f7d0d..44f1542100 100644
--- a/resources/lang/nl/button.php
+++ b/resources/lang/nl/button.php
@@ -14,4 +14,5 @@ return array(
 	'select_file'				=> 'Bestand selecteren...',
     'select_files'				=> 'Bestanden selecteren...',
     'generate_labels'           => '{1} Genereer label|[2,*] Genereer labels',
+    'send_password_link'       => 'Stuur een wachtwoordherstellink',
 );
diff --git a/resources/lang/nl/general.php b/resources/lang/nl/general.php
index 2d1e8a3ef4..d8dfe7b493 100644
--- a/resources/lang/nl/general.php
+++ b/resources/lang/nl/general.php
@@ -176,7 +176,7 @@
     'remove_company'        => 'Verwijder bedrijfsverbinding',
     'reports'				=> 'Rapporten',
     'restored'				=> 'hersteld',
-    'restore'				=> 'Restore',
+    'restore'				=> 'Herstel',
     'requested'				=> 'Aangevraagd',
     'request_canceled'      => 'Aanvraag geannuleerd',
     'save'  				=> 'Opslaan',
diff --git a/resources/lang/no/admin/categories/general.php b/resources/lang/no/admin/categories/general.php
index 7f184a477e..ae5280bd6a 100644
--- a/resources/lang/no/admin/categories/general.php
+++ b/resources/lang/no/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'Oppdatere kategori',
     'use_default_eula'					=> 'Bruk <a href="#" data-toggle="modal" data-target="#eulaModal">standard EULA</a> i stedet.',
     'use_default_eula_disabled'			=> '<del>Bruk standard EULA i stedet.</del> Ingen standard EULA er satt. Legg til en i Innstillinger.',
+    'use_default_eula_column'			=> 'Bruk standard EULA',
 
 );
diff --git a/resources/lang/no/admin/depreciations/general.php b/resources/lang/no/admin/depreciations/general.php
index 193acb1db5..1ca2b0370f 100644
--- a/resources/lang/no/admin/depreciations/general.php
+++ b/resources/lang/no/admin/depreciations/general.php
@@ -8,6 +8,6 @@ return array(
     'depreciation_name'  					=> 'Avskrivningsnavn',
     'number_of_months'  					=> 'Antall måneder',
     'update'  					            => 'Oppdater avskrivninger',
-    'depreciation_min'                      => 'Minimum Value after Depreciation'
+    'depreciation_min'                      => 'Minimumsverdi etter avskrivning'
 
 );
diff --git a/resources/lang/no/admin/hardware/general.php b/resources/lang/no/admin/hardware/general.php
index 863acad21c..2ea0ac2bb3 100644
--- a/resources/lang/no/admin/hardware/general.php
+++ b/resources/lang/no/admin/hardware/general.php
@@ -10,9 +10,9 @@ return array(
     'checkout'  				=> 'Sjekk ut asset',
     'clone'  					=> 'Klon eiendel',
     'deployable'  				=> 'Utleverbar',
-    'deleted'  					=> 'This asset has been deleted.',
+    'deleted'  					=> 'Denne eiendelen har blitt slettet.',
     'edit'  					=> 'Rediger eiendel',
-    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
+    'model_deleted'  			=> 'Denne eiendelsmodellen er slettet. Du må gjenopprette modellen før du kan gjenopprette eiendelen.',
     'requestable'               => 'Forespørrbar',
     'requested'				    => 'Forespurt',
     'restore'  					=> 'Gjenopprett eiendel',
diff --git a/resources/lang/no/admin/hardware/table.php b/resources/lang/no/admin/hardware/table.php
index 07a384f855..6edb5494f3 100644
--- a/resources/lang/no/admin/hardware/table.php
+++ b/resources/lang/no/admin/hardware/table.php
@@ -20,6 +20,6 @@ return array(
     'title'      	=> 'Eiendel ',
     'image'		=> 'Enhet bilde',
     'days_without_acceptance' => 'Dager uten aksept',
-    'monthly_depreciation' => 'Monthly Depreciation'
+    'monthly_depreciation' => 'Månedlig avskrivning'
 
 );
diff --git a/resources/lang/no/admin/kits/general.php b/resources/lang/no/admin/kits/general.php
index b4f2d90ae1..eee9639958 100644
--- a/resources/lang/no/admin/kits/general.php
+++ b/resources/lang/no/admin/kits/general.php
@@ -1,17 +1,17 @@
 <?php
 
 return array(
-    '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. ',
+    'about_kits_title'                  => 'Om forhåndsdefinerte sett',
+    'about_kits_text'                   => 'Forhåndsdefinerte sett lar deg raskt sjekke ut en samling av utstyr (eiendeler, lisenser, etc) til en bruker. Dette kan være nyttig når onboarding-prosessen er konsistent på tvers av mange brukere, slik at alle brukere skal ha det samme utstyret.',
+    'checkout'                          => 'Sjekk ut sett ',
+    'create_success'                    => 'Settet har blitt opprettet.',
+    'create'                            => 'Opprett forhåndsdefinert sett',
+    'update'                            => 'Oppdater forhåndsdefinert sett',
+    'delete_success'                    => 'Settet har blitt slettet.',
+    'update_success'                    => 'Settet har blitt oppdatert.',
+    'none_models'                       => 'Det er ikke nok tilgjengelige ressurser for å sjekke ut :model. Vi trenger :qty stk. ',
+    'none_licenses'                     => 'Det er ikke nok seter for :license til å sjekke ut. Det trengs :qty ekstra. ',
+    'none_consumables'                  => 'Det er ikke nok tilgjengelige :consumable til å sjekke ut. Det trengs :qty. ',
+    'none_accessory'                    => 'Det er ikke nok tilgjengelige :accessory til å sjekke ut. Det trengs :qty. ',
 
 );
diff --git a/resources/lang/no/admin/licenses/message.php b/resources/lang/no/admin/licenses/message.php
index 957935f6aa..9c3dd05ba4 100644
--- a/resources/lang/no/admin/licenses/message.php
+++ b/resources/lang/no/admin/licenses/message.php
@@ -8,7 +8,7 @@ return array(
     'owner_doesnt_match_asset' => 'Eiendelen du prøver å koble til denne lisensen er eid av noen andre enn personen du har valgt i tildelt til-nedtrekkslista.',
     'assoc_users'	 => 'Denne lisensen er sjekket ut til en bruker og kan ikke slettes. Vennligst sjekk inn lisensen først, og forsøk sletting på nytt. ',
     'select_asset_or_person' => 'Du må velge en ressurs eller en bruker, men ikke begge.',
-    'not_found' => 'License not found',
+    'not_found' => 'Lisens ikke funnet',
 
 
     'create' => array(
diff --git a/resources/lang/no/admin/locations/table.php b/resources/lang/no/admin/locations/table.php
index 4a45125c51..24f45a89f9 100644
--- a/resources/lang/no/admin/locations/table.php
+++ b/resources/lang/no/admin/locations/table.php
@@ -11,8 +11,8 @@ return array(
     'country'                   => 'Land',
     'create'                    => 'Opprett plassering',
     'update'                    => 'Oppdater plassering',
-    'print_assigned'            => 'Print Assigned',
-    'print_all_assigned'        => 'Print All Assigned',
+    'print_assigned'            => 'Skriv ut tilordnede',
+    'print_all_assigned'        => 'Skriv ut alle tilordnede',
     'name'                      => 'Plasseringsnavn',
     'address'                   => 'Adresse',
     'zip'                       => 'Postnummer',
diff --git a/resources/lang/no/admin/models/general.php b/resources/lang/no/admin/models/general.php
index 2c00ff2f8b..e6a284f9ad 100644
--- a/resources/lang/no/admin/models/general.php
+++ b/resources/lang/no/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Om asset modeller',
     'about_models_text'           => 'Asset modeller er en måte å gruppere identiske eiendeler. "MBP 2013", "IPhone 6s", etc.',
-    'deleted'  					        => 'This model has been deleted.',
+    'deleted'  					        => 'Denne modellen har blitt slettet.',
     'bulk_delete'               => 'Bulk slett modeller',
     'bulk_delete_help'               => 'Bruk merkeboksene nedenfor til å bekrefte sletting av de merkede modellene. Modeller som har eiendeler tilknyttet kan ikke slettes før eiendelene har blitt tilknyttet en annen modell.',
     'bulk_delete_warn'          => 'Du er i ferd med å slette :model_count modeller.',
diff --git a/resources/lang/no/admin/settings/general.php b/resources/lang/no/admin/settings/general.php
index 59a304e552..16ef09245a 100644
--- a/resources/lang/no/admin/settings/general.php
+++ b/resources/lang/no/admin/settings/general.php
@@ -4,9 +4,9 @@ return array(
     'ad'				        => 'Active Directory',
     'ad_domain'				    => 'Active Directory domene',
     'ad_domain_help'			=> 'Dette er noen ganger det samme som e-post domene, men ikke alltid.',
-    'ad_append_domain_label'    => 'Append domain name',
-    'ad_append_domain'          => 'Append domain name to username field',
-    'ad_append_domain_help'     => 'User isn\'t required to write "username@domain.local", they can just type "username".' ,
+    'ad_append_domain_label'    => 'Legg til domenenavn',
+    'ad_append_domain'          => 'Legg til domenenavn i feltet for brukernavn',
+    'ad_append_domain_help'     => 'Bruker kreves ikke å skrive "brukernavn@domene.local", de kan bare skrive "brukernavn".' ,
     'admin_cc_email'            => 'CC e-post',
     'admin_cc_email_help'       => 'Hvis du vil sende en kopi av innsjekk-/utsjekkeposter som sendes til brukere til en ekstra epostadresse, skriv den inn her. La ellers feltet stå tomt.',
     'is_ad'				        => 'Dette er en Active Directory server',
@@ -14,8 +14,8 @@ return array(
     'alerts_enabled'			=> 'Varslinger aktivert',
     'alert_interval'			=> 'Terskel for utløpende varslinger (dager)',
     'alert_inv_threshold'		=> 'Terskel for eiendelsvarslinger',
-    'allow_user_skin'           => 'Allow user skin',
-    'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' ,
+    'allow_user_skin'           => 'Tillat tilpasset utseende for bruker',
+    'allow_user_skin_help_text' => 'Kryss av denne boksen for å la brukere overstyre standardutseendet med et annet.' ,
     'asset_ids'					=> 'Eiendels-IDer',
     'audit_interval'            => 'Audit intervall',
     'audit_interval_help'       => 'Hvis du regelmessig må fysisk overvåke dine eiendeler, angi intervallet i måneder.',
@@ -27,7 +27,7 @@ return array(
     'backups'					=> 'Sikkerhetskopier',
     'barcode_settings'			=> 'Strekkodeinnstillinger',
     'confirm_purge'			    => 'Bekreft rensking',
-    'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone and will PERMANENTLY delete all soft-deleted items and users. (You should make a backup first, just to be safe.)',
+    'confirm_purge_help'		=> 'Skriv "DELETE" i boksen under for å fjerne dine slettende data. Denne handlingen kan ikke angres og vil PERMANENT slette alle slettede elementer og brukere. (Du bør først gjøre en sikkerhetskopi, bare for å være trygg.)',
     'custom_css'				=> 'Egendefinert CSS',
     'custom_css_help'			=> 'Legg til egendefinert CSS. Ikke ta med taggene &lt;style&gt;&lt;/style&gt;.',
     'custom_forgot_pass_url'	=> 'Egendefinert passord tilbakestillings-URL',
@@ -43,15 +43,15 @@ return array(
     'display_eol'               => 'Vis levetid i tabellvisning',
     'display_qr'                => 'Vis Qr-kode',
     'display_alt_barcode'		=> 'Vis 1D strekkode',
-    'email_logo'                => 'Email Logo',
+    'email_logo'                => 'E-postlogo',
     'barcode_type'				=> '2D strekkodetype',
     'alt_barcode_type'			=> '1D strekkodetype',
-    'email_logo_size'       => 'Square logos in email look best. ',
+    'email_logo_size'       => 'Kvadratiske logoer ser best ut i e-post. ',
     'eula_settings'				=> 'EULA-innstillinger',
     'eula_markdown'				=> 'Denne EULAen tillater <a href="https://help.github.com/articles/github-flavored-markdown/">Github Flavored 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.',
+    'favicon_format'            => 'Aksepterte filtyper er ico, png og gif. Andre bildeformater vil muligens ikke fungere i alle nettlesere.',
+    'favicon_size'          => 'Favoritt-symboler bør være kvadratiske, 16x16 punkter.',
     'footer_text'               => 'Ekstra bunnteksttekst ',
     '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.',
@@ -59,12 +59,15 @@ Linjeskift, topptekst, bilder, osv. kan føre til uventede resultater.',
     'generate_backup'			=> 'Generer Sikkerhetskopi',
     'header_color'              => 'Overskriftsfarge',
     'info'                      => 'Disse innstillingene lar deg tilpasse enkelte aspekter av installasjonen din.',
-    'label_logo'                => 'Label Logo',
-    'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
+    'label_logo'                => 'Etikett-logo',
+    'label_logo_size'           => 'Kvadratisk logo vil se best ut. Den vil vises øverst til høyre på hver merkelapp. ',
     'laravel'                   => 'Laravel-versjon',
+    'ldap_client_tls_cert'      => 'LDAP TLS klient-sertifikat',
     'ldap_enabled'              => 'LDAP aktivert',
     'ldap_integration'          => 'LDAP Integrering',
     'ldap_settings'             => 'LDAP Instillinger',
+    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_login_test_help'      => 'Skriv inn et gyldig LDAP brukernavn og passord fra samme base DN som du anga ovenfor for å teste at LDAP-innlogging er riktig konfigurert. DU MÅ LAGRE DINE OPPDATERTE LDAP-INNSTILLINGER FØRST.',
     'ldap_login_sync_help'      => 'Tester at LDAP kan synkronisere. Feil i LDAP autentiseringsspørringen din kan før til at brukere ikke kan logge inn. DU MÅ LAGRE DINE OPPDATERTE LDAP-INNSTILLINGER FØRST.',
     'ldap_server'               => 'LDAP Server',
@@ -75,10 +78,10 @@ Linjeskift, topptekst, bilder, osv. kan føre til uventede resultater.',
     'ldap_tls'                  => 'Bruk TLS',
     'ldap_tls_help'             => 'Kryss av denne hvis du kjører STARTTLS på LDAP-serveren. ',
     'ldap_uname'                => 'LDAP Bundet brukernavn',
-    'ldap_dept'                 => 'LDAP Department',
-    'ldap_phone'                => 'LDAP Telephone Number',
-    'ldap_jobtitle'             => 'LDAP Job Title',
-    'ldap_country'              => 'LDAP Country',
+    'ldap_dept'                 => 'LDAP avdeling',
+    'ldap_phone'                => 'LDAP telefonnummer',
+    'ldap_jobtitle'             => 'LDAP Jobbtittel',
+    'ldap_country'              => 'LDAP Land',
     'ldap_pword'                => 'LDAP Bind passord',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP Filter',
@@ -90,7 +93,7 @@ Linjeskift, topptekst, bilder, osv. kan føre til uventede resultater.',
     'ldap_auth_filter_query'    => 'LDAP autentisering spørring',
     'ldap_version'              => 'LDAP Versjon',
     'ldap_active_flag'          => 'LDAP aktive flag',
-    'ldap_activated_flag_help'  => 'This flag is used to determine whether a user can login to Snipe-IT and does not affect the ability to check items in or out to them.',
+    'ldap_activated_flag_help'  => 'Dette merket brukes til å bestemme om en bruker kan logge inn på Snipe-IT eller ikke, og påvirker ikke muligheten til å sjekke inn eller ut enheter til dem.',
     'ldap_emp_num'              => 'LDAP ansattnummer',
     'ldap_email'                => 'LDAP E-post',
     'license'                  => 'Programvarelisens',
@@ -105,8 +108,8 @@ Linjeskift, topptekst, bilder, osv. kan føre til uventede resultater.',
     'login_common_disabled_help' => 'Deaktiverer andre autentiseringsmekanismer. Aktiver dette valget kun hvis du er sikker på at din REMOTE_USER innlogging allerede fungerer',
     'login_remote_user_custom_logout_url_text' => 'Tilpasset utloggingsadresse',
     'login_remote_user_custom_logout_url_help' => 'Hvis en URL angis her blir brukerne videresendt til denne URLen etter utlogging fra Snipe-IT. Dette er nyttig for korrekt lukking av autentiseringssesjoner hos din autentiseringsleverandør.',
-    'login_remote_user_header_name_text' => 'Custom user name header',
-    'login_remote_user_header_name_help' => 'Use the specified header instead of REMOTE_USER',
+    'login_remote_user_header_name_text' => 'Egendefinert brukernavn-header',
+    'login_remote_user_header_name_help' => 'Bruk angitt header-felt i stedet for REMOTE_USER',
     'logo'                    	=> 'Logo',
     'logo_print_assets'         => 'Bruk i Print',
     'logo_print_assets_help'    => 'Bruk branding på utskrivbare eiendelslister ',
@@ -121,45 +124,45 @@ Linjeskift, topptekst, bilder, osv. kan føre til uventede resultater.',
     'pwd_secure_complexity'     => 'Passordkompleksitet',
     'pwd_secure_complexity_help' => 'Velg hvilken passord kompleksitet du ønsker å håndheve.',
     'pwd_secure_min'            => 'Passord minimum antall tegn',
-    'pwd_secure_min_help'       => 'Minimum permitted value is 8',
+    'pwd_secure_min_help'       => 'Minimum tillatt verdi er 8',
     'pwd_secure_uncommon'       => 'Forhindre vanlige passord',
     'pwd_secure_uncommon_help'  => 'Dette vil forhindre brukere fra å bruke vanlige passord fra de vanligste 10 000 passord som er rapportert.',
     'qr_help'                   => 'Aktiver QR-koder først for å velge denne',
     'qr_text'                   => 'Tekst QR-kode',
-    'saml_enabled'              => 'SAML enabled',
-    'saml_integration'          => 'SAML Integration',
+    'saml_enabled'              => 'SAML aktivert',
+    'saml_integration'          => 'SAML-integrasjon',
     'saml_sp_entityid'          => 'Entity ID',
     'saml_sp_acs_url'           => 'Assertion Consumer Service (ACS) URL',
     'saml_sp_sls_url'           => 'Single Logout Service (SLS) URL',
-    'saml_sp_x509cert'          => 'Public Certificate',
+    'saml_sp_x509cert'          => 'Offentlig sertifikat',
     'saml_sp_metadata_url'      => 'Metadata URL',
     'saml_idp_metadata'         => 'SAML IdP Metadata',
-    'saml_idp_metadata_help'    => 'You can specify the IdP metadata using a URL or XML file.',
-    'saml_attr_mapping_username' => 'Attribute Mapping - Username',
-    'saml_attr_mapping_username_help' => 'NameID will be used if attribute mapping is unspecified or invalid.',
-    'saml_forcelogin_label'     => 'SAML Force Login',
-    'saml_forcelogin'           => 'Make SAML the primary login',
-    'saml_forcelogin_help'      => 'You can use \'/login?nosaml\' to get to the normal login page.',
-    'saml_slo_label'            => 'SAML Single Log Out',
-    'saml_slo'                  => 'Send a LogoutRequest to IdP on Logout',
-    'saml_slo_help'             => 'This will cause the user to be first redirected to the IdP on logout. Leave unchecked if the IdP doesn\'t correctly support SP-initiated SAML SLO.',
-    'saml_custom_settings'      => 'SAML Custom Settings',
-    'saml_custom_settings_help' => 'You can specify additional settings to the onelogin/php-saml library. Use at your own risk.',
+    'saml_idp_metadata_help'    => 'Du kan spesifisere IdP-metadata ved hjelp av URL eller XML-fil.',
+    'saml_attr_mapping_username' => 'Attributt for brukernavn',
+    'saml_attr_mapping_username_help' => 'NameID vil bli brukt hvis tilordning av attributtet er uspesifisert eller ugyldig.',
+    'saml_forcelogin_label'     => 'SAML som standard',
+    'saml_forcelogin'           => 'Gjør SAML til standard innlogging',
+    'saml_forcelogin_help'      => 'Du kan bruke \'/login?nosaml\' for å komme til den normale innloggingssiden.',
+    'saml_slo_label'            => 'SAML utlogging',
+    'saml_slo'                  => 'Send en Logoutforespørsel til IdP på Logg ut',
+    'saml_slo_help'             => 'Dette vil føre til at brukeren først blir omdirigert til idP når hen logger ut. Ikke kryss av om idP ikke støtter \'SP-initiated SAML SLO\'.',
+    'saml_custom_settings'      => 'SAML Egendefinerte innstillinger',
+    'saml_custom_settings_help' => 'Du kan angi flere innstillinger til onelogin/php-saml biblioteket. Bruk på eget ansvar.',
     'setting'                   => 'Innstilling',
     'settings'                  => 'Innstillinger',
     'show_alerts_in_menu'       => 'Vis varsler i toppmenyen',
     'show_archived_in_list'     => 'Arkiverte eiendeler',
     'show_archived_in_list_text'     => 'Vis arkiverte eiendeler i "alle eiendeler" utlisting',
-    'show_assigned_assets'      => 'Show assets assigned to assets',
-    'show_assigned_assets_help' => 'Display assets which were assigned to the other assets in View User -> Assets, View User -> Info -> Print All Assigned and in Account -> View Assigned Assets.',
+    'show_assigned_assets'      => 'Vis eiendeler tildelt til eiendeler',
+    'show_assigned_assets_help' => 'Vis ressurser som ble tildelt andre eiendeler i Vis bruker -> Eiendeler, Vis bruker -> Info -> Skriv ut alle tildelte og i Konto -> Vis tildelte eiendeler.',
     'show_images_in_email'     => 'Vis bilder i e-post',
-    'show_images_in_email_help'   => 'Uncheck this box if your Snipe-IT installation is behind a VPN or closed network and users outside the network will not be able to load images served from this installation in their emails.',
+    'show_images_in_email_help'   => 'Fjern merkingen i denne boksen hvis Snipe-IT-installasjonen er bak en VPN eller et lukket nettverk og brukere utenfor nettverket ikke vil kunne laste bilder servert fra denne installasjonen i e-posten.',
     'site_name'                 => 'Nettstedsnavn',
     'slack_botname'             => 'Slack botnavn',
     'slack_channel'             => 'Slack-kanal',
     'slack_endpoint'            => 'Slack endepunkt',
     'slack_integration'         => 'Slack-innstillinger',
-    'slack_integration_help'    => 'Slack integration is optional, however the endpoint and channel are required if you wish to use it. To configure Slack integration, you must first <a href=":slack_link" target="_new" rel="noopener">create an incoming webhook</a> on your Slack account. Click on the <strong>Test Slack Integration</strong> button to confirm your settings are correct before saving. ',
+    'slack_integration_help'    => 'Slack-integrasjon er valgfritt, men endepunktet og kanalen er påkrevd hvis du ønsker å bruke den. For å konfigurere Slack integrering, må du <a href=":slack_link" target="_new" rel="noopener">først opprette en innkommende webhook</a> på Slack-kontoen din. Klikk på knappen <strong>Test Slack Integrasjon</strong> for å bekrefte at innstillingene er riktige før du lagrer. ',
     'slack_integration_help_button'    => 'Du vil se en testknapp etter at du lagrer Slack-informasjonen.',
     'slack_test_help'           => 'Test om Slack-integrasjonen din er riktig konfigurert. DU MÅ LAGRE DINE OPPDATERTE SLACK-INNSTILLINGER FØRST.',
     'snipe_version'  			=> 'Snipe-IT-versjon',
@@ -171,7 +174,7 @@ Linjeskift, topptekst, bilder, osv. kan føre til uventede resultater.',
     'update'                    => 'Oppdater innstillinger',
     'value'                     => 'Verdi',
     'brand'                     => 'Merkevare',
-    'web_brand'                 => 'Web Branding Type',
+    'web_brand'                 => 'Velg branding-type',
     'about_settings_title'      => 'Om Innstillinger',
     'about_settings_text'       => 'Disse innstillingene lar deg tilpasse enkelte aspekter av installasjonen din.',
     'labels_per_page'           => 'Etiketter per side',
@@ -226,5 +229,5 @@ Linjeskift, topptekst, bilder, osv. kan føre til uventede resultater.',
     'unique_serial'                => 'Unike serienumre',
     'unique_serial_help_text'                => 'Håndhever at  eiendelsserienumre er unike',
     'zerofill_count'        => 'Lengden på ID-merker, inkludert 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.',
+    'username_format_help'   => 'Denne innstillingen vil bare bli brukt av importprosessen dersom et brukernavn ikke er oppgitt, og vi må generere et brukernavn for deg.',
 );
diff --git a/resources/lang/no/admin/users/general.php b/resources/lang/no/admin/users/general.php
index 7c08d0d88d..1a11192e93 100644
--- a/resources/lang/no/admin/users/general.php
+++ b/resources/lang/no/admin/users/general.php
@@ -19,7 +19,7 @@ return array(
     'ldap_config_text'  => 'LDAP-konfigurasjonsinnstillingene kan finnes på Admin > innstillinger. Den (Valgfrie) valgte plasseringen angis for alle importerte brukere.',
     'print_assigned'    => 'Skriv ut alt tilordnet',
     'software_user'     => 'Programvare utsjekket til :name',
-    'send_email_help'   => 'You must provide an email address for this user to send them credentials. Emailing credentials can only be done on user creation. Passwords are stored in a one-way hash and cannot be retrieved once saved.',
+    'send_email_help'   => 'Du må legge inn brukerens e-postadresse for å kunne sende dem innloggingsinformasjon. Sending av innloggingsinformasjon kan kun gjøres når brukeren blir opprettet. Passordet lagres på en sikker måte, slik at det ikke kan hentes opp når det er lagret.',
     'view_user'         => 'Vis bruker :name',
     'usercsv'           => 'CSV-fil',
     'two_factor_admin_optin_help' => 'Gjeldende administrasjonsinnstillinger tillater selektiv håndhevelse av to-faktor autentisering.  ',
diff --git a/resources/lang/no/admin/users/message.php b/resources/lang/no/admin/users/message.php
index c4bb5a2182..da412c08ad 100644
--- a/resources/lang/no/admin/users/message.php
+++ b/resources/lang/no/admin/users/message.php
@@ -12,7 +12,8 @@ return array(
     'insufficient_permissions'  => 'Utilstrekkelige rettigheter.',
     'user_deleted_warning'      => 'Denne brukeren er slettet. Du vil må gjenopprette denne brukeren for å redigere, eller tildele nye eiendeler.',
     'ldap_not_configured'        => 'LDAP integrasjonen er ikke konfigurert i denne installasjonen.',
-    'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
+    'password_resets_sent'      => 'De valgte brukerne som er aktivert og har en gyldig e-postadresse har blitt sendt en tilbakestillingslenke.',
+    'password_reset_sent'       => 'En lenke for tilbakestilling av passord har blitt sendt til :email!',
 
 
     'success' => array(
diff --git a/resources/lang/no/auth/general.php b/resources/lang/no/auth/general.php
index 7eef420361..ceb82328ad 100644
--- a/resources/lang/no/auth/general.php
+++ b/resources/lang/no/auth/general.php
@@ -4,13 +4,13 @@ return [
     'send_password_link'	        => 'Send Passord Tilbakestillingslink',
     'email_reset_password'			=> 'E-post Passord Tilbakestill',
     'reset_password'			    => 'Tilbakestill Passord',
-    'saml_login'                    => 'Login via SAML',
+    'saml_login'                    => 'Logg inn med SSO',
     'login'                         => 'Logg inn',
     'login_prompt'                  => 'Vennligst logg inn',
     'forgot_password'               => 'Jeg har glemt passordet mitt',
-    'ldap_reset_password'           => 'Please click here to reset your LDAP password',
+    'ldap_reset_password'           => 'Klikk her for å nullstille ditt LDAP-passord',
     'remember_me'                   => 'Husk meg',
-    'username_help_top'                 => 'Enter your <strong>username</strong> to be emailed a password reset link.',
-    'username_help_bottom'          => 'Your username and email address <em>may</em> be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator. <br><br><strong>Usernames without an associated email address will not be emailed a password reset link.</strong> ',
+    'username_help_top'                 => 'Skriv inn ditt <strong>brukernavn</strong> for å få tilsendt en lenke for tilbakestilling av passord.',
+    'username_help_bottom'          => 'Ditt brukernavn og e-postadresse <em>kan</em> være det samme, men kan være, avhengig av din konfigurasjon. Dersom du ikke husker brukernavnet ditt, ta kontakt med systemansvarlig. <br><br><strong>Brukernavn uten en tilknyttet e-postadresse vil ikke bli sendt en lenke for tilbakestilling av passordet.</strong> ',
     ];
 
diff --git a/resources/lang/no/auth/message.php b/resources/lang/no/auth/message.php
index 98decedb69..41eb5107ba 100644
--- a/resources/lang/no/auth/message.php
+++ b/resources/lang/no/auth/message.php
@@ -7,13 +7,13 @@ return array(
     'account_not_activated'  => 'Denne brukerkontoen er ikke aktiv.',
     'account_suspended'      => 'Denne brukerkontoen er deaktivert.',
     'account_banned'         => 'Denne brukerkontoen er forbudt.',
-    'throttle'               => 'Too many failed login attempts. Please try again in :minutes minutes.',
+    'throttle'               => 'For mange mislykkede påloggingsforsøk. Prøv igjen om :minutes minutter.',
 
     'two_factor' => array(
-        'already_enrolled'      => 'Your device is already enrolled.',
-        'success'               => 'You have successfully logged in.',
-        'code_required'         => 'Two-factor code is required.',
-        'invalid_code'          => 'Two-factor code is invalid.',
+        'already_enrolled'      => 'Enheten din er allerede registrert.',
+        'success'               => 'Du har logget inn.',
+        'code_required'         => 'To-faktor-kode er påkrevd.',
+        'invalid_code'          => 'To-faktor-koden er ugyldig.',
     ),
 
     'signin' => array(
@@ -22,8 +22,8 @@ return array(
     ),
 
     'logout' => array(
-        'error'   => 'There was a problem while trying to log you out, please try again.',
-        'success' => 'You have successfully logged out.',
+        'error'   => 'Det oppstod et problem med utlogging, prøv igjen.',
+        'success' => 'Du har logget ut.',
     ),
 
     'signup' => array(
@@ -33,7 +33,7 @@ return array(
 
     'forgot-password' => array(
         'error'   => 'Det oppstod et problem under henting av kode for resetting av passord. Prøv igjen.',
-        'success' => 'If that email address exists in our system, a password recovery email has been sent.',
+        'success' => 'Hvis den oppgitte e-postadressen finnes i systemet vårt har det blitt sendt en e-post med gjenopprettelse av passord.',
     ),
 
     'forgot-password-confirm' => array(
diff --git a/resources/lang/no/button.php b/resources/lang/no/button.php
index 4326e5c7bb..9f5752c989 100644
--- a/resources/lang/no/button.php
+++ b/resources/lang/no/button.php
@@ -13,5 +13,6 @@ return array(
     'upload'                    => 'Last opp',
 	'select_file'				=> 'Velg fil...',
     'select_files'				=> 'Velg filer...',
-    'generate_labels'           => '{1} Generate Label|[2,*] Generate Labels',
+    'generate_labels'           => '{1} Lag etikett [2,*] Lag etiketter',
+    'send_password_link'       => 'Send lenke for å nullstille passordet',
 );
diff --git a/resources/lang/no/general.php b/resources/lang/no/general.php
index 2c615dc193..b30b4927ea 100644
--- a/resources/lang/no/general.php
+++ b/resources/lang/no/general.php
@@ -30,7 +30,7 @@
     'bulkaudit'             => 'Bulk revisjon',
     'bulkaudit_status'      => 'Revisjon Status',
     'bulk_checkout'  		=> 'Masseutsjekk',
-    'bystatus'              => 'by Status',
+    'bystatus'              => 'etter Status',
     'cancel'  				=> 'Avbryt',
     'categories'			=> 'Kategorier',
     'category'				=> 'Kategori',
@@ -58,7 +58,7 @@
     'created'               => 'Enhet opprettet',
     'created_asset'			=> 'eiendel opprettet',
     'created_at' 			=> 'Opprettet',
-    'record_created' 		=> 'Record Created',
+    'record_created' 		=> 'Post opprettet',
     'updated_at' 			=> 'Oppdatert',
     'currency'  			=> '$', // this is deprecated
     'current'  				=> 'Nåværende',
@@ -79,7 +79,7 @@
     'depreciation_report'	=> 'Avskrivningsrapport',
     'details'               => 'Detaljer',
     'download'				=> 'Last ned',
-    'download_all'				=> 'Download All',
+    'download_all'				=> 'Last ned alle',
     'depreciation'			=> 'Avskrivning',
     'editprofile'  			=> 'Rediger din profil',
     'eol'					=> 'Livstid',
@@ -90,17 +90,17 @@
     'firstname_lastname_format'	=> 'Fornavn Etternavn (oladunk@example.com)',
     'firstname_lastname_underscore_format' => 'Fornavn Etternavn (oladunk@example.com)',
     'lastnamefirstinitial_format' =>  'Etternavn Initialer (oladunk@example.com)',
-    'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
+    'firstintial_dot_lastname_format' => 'Fornavn Initialer. Etternavn (j.smith@example.com)',
     'first'					=> 'Første',
-    'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
-    'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
-    'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
-    'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
+    'firstnamelastname'     => 'Fornavn Etternavn (oladunk@example.com)',
+    'lastname_firstinitial' => 'Etternavn Fornavn Initialer (smith_j@example.com)',
+    'firstinitial.lastname' => 'Fornavn Initialer Etternavn (j.smith@example.com)',
+    'firstnamelastinitial'  => 'Fornavn Etternavn Initialer (janes@example.com)',
     'first_name'			=> 'Fornavn',
     'first_name_format'		=> 'Fornavn (oladunk@example.com)',
     'files'                 => 'Filer',
     'file_name'				=> 'Fil',
-    'file_type'             => 'File Type',
+    'file_type'             => 'Filtype',
     'file_uploads'			=> 'Filopplastinger',
     'generate'				=> 'Generer',
      'github_markdown'      => 'Dette feltet tillater <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
@@ -112,17 +112,17 @@
     'image'                 => 'Bilde',
     'image_delete'         	=> 'Slett bilde',
     'image_upload'         	=> 'Last opp bilde',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, and svg. Max upload size allowed is :size.',
+    'image_filetypes_help'  => 'Tillatte filtyper er jpg, webp, png, gif, og svg. Maks filstørrelse er :size.',
     'import'         	    => 'Importer',
-    'importing'         	=> 'Importing',
-    'importing_help'        => 'You can import assets, accessories, licenses, components, consumables, and users via CSV file. <br><br>The CSV should be comma-delimited and formatted with headers that match the ones in the <a href="https://snipe-it.readme.io/docs/importing" target="_new">sample CSVs in the documentation</a>.',
+    'importing'         	=> 'Importerer',
+    'importing_help'        => 'Du kan importere eiendeler, tilbehør, lisenser, komponenter, forbruksvarer og brukere via CSV-fil. <br><br>CSV-en må være kommaseparert og formatert med overskrifter som stemmer overens med de i <a href="https://snipe-it.readme.io/docs/importing" target="_new">eksempel-CSV i dokumentasjonen</a>.',
     'import-history'        => 'Importhistorikk',
     'asset_maintenance'        => 'Vedlikehold av eiendeler',
     'asset_maintenance_report' => 'Rapport Vedlikehold av eiendeler',
     'asset_maintenances'       => 'Vedlikehold av eiendeler',
     'item'  				=> 'Enhet',
     'insufficient_permissions' => 'Utilstrekkelige rettigheter!',
-    'kits'       			=> 'Predefined Kits',
+    'kits'       			=> 'Forhåndsdefinerte sett',
     'language'				=> 'Språk',
     'last'					=> 'Siste',
     'last_login'            => 'Siste pålogging',
@@ -133,11 +133,11 @@
     'licenses'				=> 'Lisenser',
     'list_all'				=> 'List alle',
     'loading'				=> 'Laster',
-    'lock_passwords'        => 'This field value will not be saved in a demo installation.',
+    'lock_passwords'        => 'Denne feltverdien vil ikke bli lagret i en demo-installasjon.',
     'feature_disabled'      => 'Denne funksjonen er deaktivert i demo-installasjonen.',
     'location'              => 'Lokasjon',
     'locations'				=> 'Lokasjoner',
-    'logo_size'				=> 'Square logos look best with Logo + Text. Logo maximum display size is 50px high x 500px wide.  ',
+    'logo_size'				=> 'Kvadratisk logo vises best med Logo + Text. Logo maximum display size is 50px high x 500px wide.  ',
     'logout'				=> 'Logg ut',
     'lookup_by_tag'     => 'Søk på ID-merke',
     'maintenances'          => 'Vedlikehold',
@@ -176,7 +176,7 @@
     'remove_company'        => 'Fjern tilknytning til bedrift',
     'reports'				=> 'Rapporter',
     'restored'				=> 'gjenopprettet',
-    'restore'				=> 'Restore',
+    'restore'				=> 'Gjenopprett',
     'requested'				=> 'Forespurt',
     'request_canceled'      => 'Forespørsel avbrutt',
     'save'  				=> 'Lagre',
@@ -200,7 +200,7 @@
     'sign_in'				=> 'Logg inn',
     'signature'             => 'Signatur',
     'skin'       			=> 'Tema',
-    'slack_test_msg'        => 'Oh hai! Looks like your Slack integration with Snipe-IT is working!',
+    'slack_test_msg'        => 'Hei-hå! Ser som din Slack-integrasjon med Snipe-IT fungerer!',
     'some_features_disabled' => 'DEMO MODUS: Noe funksjonalitet er skrudd av i denne installasjonen.',
     'site_name'				=> 'Nettstedsnavn',
     'state'  				=> 'Stat',
@@ -221,14 +221,14 @@
     'unknown_admin'			=> 'Ukjent admin',
     'username_format'		=> 'Format brukernavn',
     'update'                => 'Oppdater',
-    'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
+    'upload_filetypes_help'      => 'Tillatte filtyper er png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf og rar. Maks. filstørrelse er :size.',
     'uploaded'              => 'Lastet opp',
     'user'					=> 'Bruker',
     'accepted'			    => 'akseptert',
     'declined'			    => 'avslått',
     'unaccepted_asset_report' => 'Ikke aksepterte eiendeler',
     'users'                 => 'Brukere',
-    'viewall'				=> 'View All',
+    'viewall'				=> 'Vis alle',
     'viewassets'  			=> 'Vis tildelte eiendeler',
     'website'               => 'Nettsted',
     'welcome'				=> 'Velkommen, :name',
@@ -237,14 +237,14 @@
     'zip'  					=> 'Postnummer',
     'noimage'				=> 'Bilde er ikke lastet opp eller finner ikke bilde.',
     'token_expired'         => 'Din sesjon har utløpt. Prøv igjen.',
-    'login_enabled'         => 'Login Enabled',
-    'audit_due'             => 'Due for Audit',
-    'audit_overdue'         => 'Overdue for Audit',
-    'accept'                => 'Accept :asset',
-    'i_accept'              => 'I accept',
-    'i_decline'             => 'I decline',
-    'sign_tos'              => 'Sign below to indicate that you agree to the terms of service:',
-    'clear_signature'       => 'Clear Signature',
-    'show_help'             => 'Show help',
-    'hide_help'             => 'Hide help',
+    'login_enabled'         => 'Innlogging aktiv',
+    'audit_due'             => 'Revisjonsfrist nær',
+    'audit_overdue'         => 'Revisjonsfrist forfalt',
+    'accept'                => 'Akseptér :asset',
+    'i_accept'              => 'Jeg aksepterer',
+    'i_decline'             => 'Jeg avslår',
+    'sign_tos'              => 'Signér under for å akseptere vilkårene for tjenesten:',
+    'clear_signature'       => 'Fjern signatur',
+    'show_help'             => 'Vis hjelp',
+    'hide_help'             => 'Skjul hjelp',
     ];
diff --git a/resources/lang/no/help.php b/resources/lang/no/help.php
index 4cb2354f89..232bdd1afc 100644
--- a/resources/lang/no/help.php
+++ b/resources/lang/no/help.php
@@ -13,23 +13,23 @@ return array(
     |
     */
 
-    "more_info_title" => "More Info",
+    "more_info_title" => "Mer 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 is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.",
+    "audit_help" => "Kryss av for å endre eiendelen til å bruke denne nye lokasjonen. Hvis du ikke krysser av vil lokasjonen kun bli notert i revisjonsloggen.<br><br>Merk at hvis denne eiendelen er sjekket ut vil det ikke endre lokasjon for brukeren, eiendelen eller lokasjonen den er sjekket ut til.",
 
-    'assets' => 'Assets are items tracked by serial number or asset tag.  They tend to be higher value items where identifying a specific item matters.',
+    'assets' => 'Eiendeler er enheter som spores på serienummer eller annen merking. Typisk er dette kostbare enheter der det gir mening å spore enkeltenheter.',
 
-    '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' => 'Kategorier hjelper deg med å organisere ting. Eksempeler på kategorier kan være &quot;Skrivebord&quot;, &quot;Bærbare&quot;, &quot;Mobiltelefon&quot;, &quot;Nettbrett&quot; og så videre, men du kan bruke kategorier som gir mening for deg.',
 
-    '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' => 'Tilbehør er ting du leverer ut som ikke har serienummer (eller som du ikke sporer enkeltvis), for eksempel datamus og tastaturer.',
 
-    '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'     => 'Firma kan brukes som et enkelt identifikatorfelt, eller det kan brukes til å begrense eksponeringen av eiendeler, brukere, etc hvis full firmastøtte er aktivert i innstillingene.',
 
-    'components'    => 'Components are items that are part of an asset, for example HDD, RAM, etc.',
+    'components'    => 'Komponenter er ting som er del av en eiendel, f. eks. internminne, disk o. l.',
 
-    'consumables'   => 'Consumables are anything purchased that will be used up over time. For example, printer ink or copier paper.',
+    'consumables'   => 'Forbruksvarer er alle varer som blir brukt opp over tid. For eksempel skrivertoner eller kopipapir.',
 
-    'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.',
+    'depreciations' => 'Du kan sette opp avskrivninger for å kostnadsføre eiendeler basert på en lineær avskrivning i perioden.',
 
 
 
diff --git a/resources/lang/no/mail.php b/resources/lang/no/mail.php
index 3d9b877c5e..d2179b1a54 100644
--- a/resources/lang/no/mail.php
+++ b/resources/lang/no/mail.php
@@ -9,7 +9,7 @@ return array(
     'asset' => 'Eiendel:',
     'asset_name' => 'Navn:',
     'asset_requested' => 'Eiendel forespurt',
-    'asset_tag' => 'Asset Tag',
+    'asset_tag' => 'Eiendelsmerke',
     'assigned_to' => 'Tilordnet til',
     'best_regards' => 'Med vennlig hilsen,',
     'canceled' => 'Avbrutt:',
@@ -18,12 +18,12 @@ return array(
     'click_to_confirm' => 'Klikk på følgende link for å bekrefte din :web konto:',
     'click_on_the_link_accessory' => 'Vennligst klikk på lenken nedenfor for å bekreft at du har mottatt tilbehøret.',
     'click_on_the_link_asset' => 'Vennligst klikk på lenken nedenfor for å bekreft at du har mottatt eiendelen.',
-    'Confirm_Asset_Checkin' => 'Asset checkin confirmation',
-    'Confirm_Accessory_Checkin' => 'Accessory checkin confirmation',
-    'Confirm_accessory_delivery' => 'Accessory delivery confirmation',
-    'Confirm_license_delivery' => 'License delivery confirmation',
-    'Confirm_asset_delivery' => 'Asset delivery confirmation',
-    'Confirm_consumable_delivery' => 'Consumable delivery confirmation',
+    'Confirm_Asset_Checkin' => 'Bekreft innsjekk av eiendel',
+    'Confirm_Accessory_Checkin' => 'Bekreft innsjekk av tilbehør',
+    'Confirm_accessory_delivery' => 'Bekreft levering av tilbehør',
+    'Confirm_license_delivery' => 'Bekreft levering av lisens',
+    'Confirm_asset_delivery' => 'Bekreft levering av eiendel',
+    'Confirm_consumable_delivery' => 'Bekreft levering av forbruksvare',
     'current_QTY' => 'Nåværende antall',
     'Days' => 'Dager',
     'days' => 'Dager',
@@ -63,17 +63,17 @@ return array(
     'license_expiring_alert' => ':count lisens utløper de neste :threshold dagene.|:count lisenser utløper de neste :threshold dagene.',
     'to_reset' => 'Fullfør dette skjemaet for å tilbakestille ditt :web passord:',
     'type' => 'Type',
-    'upcoming-audits' => 'There is :count asset that is coming up for audit within :threshold days.|There are :count assets that are coming up for audit within :threshold days.',
+    'upcoming-audits' => ':count eiendel har revisjonsfrist innen :treshold dager.|:count eiendeler har revisjonsfrist innen :threshold dager.',
     'user' => 'Bruker',
     'username' => 'Brukernavn',
     'welcome' => 'Velkommen :name',
     'welcome_to' => 'Velkommen til :web!',
     'your_credentials' => 'Din Snipe-IT konto',
-    'Accessory_Checkin_Notification' => 'Accessory checked in',
-    'Asset_Checkin_Notification' => 'Asset checked in',
-    'License_Checkin_Notification' => 'License checked in',
-    'Expected_Checkin_Report' => 'Expected asset checkin report',
-    'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching',
-    'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date',
-    'your_assets' => 'View Your Assets'
+    'Accessory_Checkin_Notification' => 'Tilbehør sjekket inn',
+    'Asset_Checkin_Notification' => 'Eiendel sjekket inn',
+    'License_Checkin_Notification' => 'Lisens sjekket inn',
+    'Expected_Checkin_Report' => 'Rapport over forventet innsjekking av eiendeler',
+    'Expected_Checkin_Notification' => 'Påminnelse: Innsjekkingsfrist for :name nærmer seg',
+    'Expected_Checkin_Date' => 'En enhet som er sjekket ut til deg skal leveres tilbake den :date',
+    'your_assets' => 'Vis dine eiendeler'
 );
diff --git a/resources/lang/no/validation.php b/resources/lang/no/validation.php
index 9b10d1a7f2..7b6b4a3aeb 100644
--- a/resources/lang/no/validation.php
+++ b/resources/lang/no/validation.php
@@ -89,7 +89,7 @@ return array(
     'uploaded'             => 'Atribbutet :attribute kunne ikke lastes opp.',
     'url'                  => 'Attributt-formatet :attribute er ugyldig.',
     "unique_undeleted"     => ":attribute må være unikt.",
-    "non_circular"         => "The :attribute must not create a circular reference.",
+    "non_circular"         => "Attributtet :attribute kan ikke opprette en sirkulær referanse.",
 
     /*
     |--------------------------------------------------------------------------
diff --git a/resources/lang/pl/admin/categories/general.php b/resources/lang/pl/admin/categories/general.php
index 82aeae0520..bcde742c63 100644
--- a/resources/lang/pl/admin/categories/general.php
+++ b/resources/lang/pl/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'Aktualizuj kategorię',
     'use_default_eula'					=> 'Użyj <a href="#" data-toggle="modal" data-target="#eulaModal"> domyślnej EULA</a> zamiast tego.',
     'use_default_eula_disabled'			=> '<del>Użyj domyślnej EULA.</del> Brak domyślnej EULA. Proszę dodaj jedną w Ustawieniach.',
+    'use_default_eula_column'			=> 'Użyj domyślnej EULA',
 
 );
diff --git a/resources/lang/pl/admin/hardware/general.php b/resources/lang/pl/admin/hardware/general.php
index ddda802b85..05745d47a2 100644
--- a/resources/lang/pl/admin/hardware/general.php
+++ b/resources/lang/pl/admin/hardware/general.php
@@ -10,9 +10,9 @@ return array(
     'checkout'  				=> 'Przypisz zasób',
     'clone'  					=> 'Klonuj zasób',
     'deployable'  				=> 'Gotowe do wdrożenia',
-    'deleted'  					=> 'This asset has been deleted.',
+    'deleted'  					=> 'Ten zasób został usunięty.',
     'edit'  					=> 'Edytuj zasób',
-    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
+    'model_deleted'  			=> 'Ten model zasobów został usunięty. Musisz przywrócić model zanim będziesz mógł przywrócić zasób.',
     'requestable'               => 'Żądane',
     'requested'				    => 'Zamówione',
     'restore'  					=> 'Przywróć aktywa',
diff --git a/resources/lang/pl/admin/models/general.php b/resources/lang/pl/admin/models/general.php
index 06bd0ee610..2ed25ae151 100644
--- a/resources/lang/pl/admin/models/general.php
+++ b/resources/lang/pl/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'O Modelach aktywów',
     'about_models_text'           => 'Modele aktywów są sposobem grupowania identycznych aktywów. "MBP 2013", "IPhone 6s", itp.',
-    'deleted'  					        => 'This model has been deleted.',
+    'deleted'  					        => 'Ten model został usunięty.',
     'bulk_delete'               => 'Zbiorcze usuwanie modeli aktywów',
     'bulk_delete_help'               => 'Użyj poniższych pól wyboru, aby potwierdzić usunięcie wybranych modeli zasobów. Modele zasobów z którymi są powiązane zasoby, nie mogą zostać usunięte, dopóki zasoby nie zostaną powiązane z innym modelem.',
     'bulk_delete_warn'          => 'Zamierzasz usunąć :model_count modeli aktywów.',
diff --git a/resources/lang/pl/admin/settings/general.php b/resources/lang/pl/admin/settings/general.php
index 51e8ba5f02..def84d4992 100644
--- a/resources/lang/pl/admin/settings/general.php
+++ b/resources/lang/pl/admin/settings/general.php
@@ -61,9 +61,12 @@ return array(
     'label_logo'                => 'Logo na etykiecie',
     'label_logo_size'           => 'Najlepiej wygląda logo kwadratowe - będzie wyświetlane w prawym górnym rogu każdej etykiety aktywów. ',
     'laravel'                   => 'Wersja Laravel',
+    'ldap_client_tls_cert'      => 'Ceryfikat TLS klienta LDAP',
     'ldap_enabled'              => 'LDAP włączone',
     'ldap_integration'          => 'Integracja z LDAP',
     'ldap_settings'             => 'Ustawienia LDAP',
+    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_login_test_help'      => 'Wprowadź poprawną nazwę użytkownika i hasło w podstawowej domenie, którą wprowadziłeś wyżej. W ten sposób przetestujesz czy logowanie LDAP jest poprawnie skonfigurowane. KONIECZNIE ZAPISZ WCZEŚNIEJ SWOJE USTAWIENIA LDAP.',
     'ldap_login_sync_help'      => 'To tylko sprawdza, czy LDAP może poprawnie się synchronizować. Jeśli zapytanie o autoryzację LDAP nie jest poprawne, użytkownicy nadal mogą nie być w stanie się zalogować. NAJPIERW MUSISZ ZAPISAĆ TWOJE WCZEŚNIEJSZE AKTUALIZACJE USTAWIEŃ LDAP.',
     'ldap_server'               => 'Serwery LDAP',
diff --git a/resources/lang/pl/admin/users/message.php b/resources/lang/pl/admin/users/message.php
index 9a32ad5822..6d8b9ff25d 100644
--- a/resources/lang/pl/admin/users/message.php
+++ b/resources/lang/pl/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
     'user_deleted_warning'      => 'Ten użytkownik został usunięty. Musisz przywrócić tego użytkownika aby je wyedytować lub przypisać je do nowych aktywów.',
     'ldap_not_configured'        => 'Integracja z LDAP nie została skonfigurowana dla tej instalacji.',
     'password_resets_sent'      => 'Wybrani użytkownicy, którzy są aktywni i mają prawidłowe adresy e-mail, otrzymali link do resetowania hasła.',
+    'password_reset_sent'       => 'Link umożliwiający zresetowanie hasła został wysłany na :email!',
 
 
     'success' => array(
diff --git a/resources/lang/pl/button.php b/resources/lang/pl/button.php
index 129cbf24ec..47333bf73a 100644
--- a/resources/lang/pl/button.php
+++ b/resources/lang/pl/button.php
@@ -14,4 +14,5 @@ return array(
 	'select_file'				=> 'Wybierz plik...',
     'select_files'				=> 'Wybierz pliki...',
     'generate_labels'           => '{1} Generuj etykietę|[2,*] Generuj etykiety',
+    'send_password_link'       => 'Wyślij e-mail z linkiem resetującym hasło',
 );
diff --git a/resources/lang/pl/general.php b/resources/lang/pl/general.php
index 8cfb669b3e..4266eb3780 100644
--- a/resources/lang/pl/general.php
+++ b/resources/lang/pl/general.php
@@ -176,7 +176,7 @@
     'remove_company'        => 'Usuń powiązanie firmy',
     'reports'				=> 'Raporty',
     'restored'				=> 'przywrócone',
-    'restore'				=> 'Restore',
+    'restore'				=> 'Przywróć',
     'requested'				=> 'Wymagane',
     'request_canceled'      => 'Żądanie anulowane',
     'save'  				=> 'Zapisz',
diff --git a/resources/lang/pt-BR/admin/categories/general.php b/resources/lang/pt-BR/admin/categories/general.php
index 85e08f8cef..b9cf699302 100644
--- a/resources/lang/pt-BR/admin/categories/general.php
+++ b/resources/lang/pt-BR/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'Atualizar Categoria',
     'use_default_eula'					=> 'Em vez disso, use o <a href="#" data-toggle="modal" data-target="#eulaModal">EULA padrão primário</a>.',
     'use_default_eula_disabled'			=> '<del>Em vez disso, use o EULA padrão primário.</del> Nenhum EULA padrão primário foi definido. Adicione um nas Configurações.',
+    'use_default_eula_column'			=> 'Use default EULA',
 
 );
diff --git a/resources/lang/pt-BR/admin/hardware/general.php b/resources/lang/pt-BR/admin/hardware/general.php
index fca50e42ae..3161fe06a0 100644
--- a/resources/lang/pt-BR/admin/hardware/general.php
+++ b/resources/lang/pt-BR/admin/hardware/general.php
@@ -10,9 +10,9 @@ return array(
     'checkout'  				=> 'Checkout de Ativo',
     'clone'  					=> 'Clonar Ativo',
     'deployable'  				=> 'Implementável',
-    'deleted'  					=> 'This asset has been deleted.',
+    'deleted'  					=> 'Este modelo foi excluído.',
     'edit'  					=> 'Editar Ativo',
-    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
+    'model_deleted'  			=> 'Este modelo de Ativos foi excluído. Você deve restaurar o modelo antes de restaurar o Ativo.',
     'requestable'               => 'Solicitável',
     'requested'				    => 'Solicitado',
     'restore'  					=> 'Restaurar Ativo',
diff --git a/resources/lang/pt-BR/admin/models/general.php b/resources/lang/pt-BR/admin/models/general.php
index 4213d37dbf..7fdc23c9d6 100644
--- a/resources/lang/pt-BR/admin/models/general.php
+++ b/resources/lang/pt-BR/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Sobre os Modelos de Ativos',
     'about_models_text'           => 'Os Modelos dos ativos são uma maneira para agrupar ativos idênticos. "MBP 2013", "iPhone 6s", etc.',
-    'deleted'  					        => 'This model has been deleted.',
+    'deleted'  					        => 'Este modelo foi excluído.',
     'bulk_delete'               => 'Bulk deletar modelos de ativos',
     'bulk_delete_help'               => 'Use a caixa abaixo para confirmar a exlusão dos modelos de ativos selecionados. Modelos de ativos que tem ativos associados a eles não podem ser deletados a não ser que esses ativos sejam associados a um modelo diferente.',
     'bulk_delete_warn'          => 'Você está prestes a exluir :model_count asset models.',
diff --git a/resources/lang/pt-BR/admin/settings/general.php b/resources/lang/pt-BR/admin/settings/general.php
index e078e4c3ff..ebf697e33e 100644
--- a/resources/lang/pt-BR/admin/settings/general.php
+++ b/resources/lang/pt-BR/admin/settings/general.php
@@ -61,9 +61,12 @@ return array(
     'label_logo'                => 'Logotipo da etiqueta',
     'label_logo_size'           => 'Logos quadrados são melhores - eles serão exibidos no topo à direita de cada etiqueta de ativo. ',
     'laravel'                   => 'Versão do Laravel',
+    'ldap_client_tls_cert'      => 'Certificado TLS do cliente LDAP',
     'ldap_enabled'              => 'LDAP ativo',
     'ldap_integration'          => 'Integração LDAP',
     'ldap_settings'             => 'Configurações LDAP',
+    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_login_test_help'      => 'Digite um nome de usuário e senha LDAP válidos a partir do DN base que você especificou acima para testar se seu login LDAP está configurado corretamente. VOCÊ DEVE SALVAR AS CONFIGURAÇÕES LDAP ATUALIZADAS PRIMEIRAMENTE.',
     'ldap_login_sync_help'      => 'Isso apenas prova que LDAP sincroniza corretamente. Se o autenticador query LDAP não estiver correto, usuários ainda não poderão realizar o login. VOCÊ DEVE PRIMEIRO SALVAR AS NOVAS CONFIGURAÇÕES DO LDAP.',
     'ldap_server'               => 'Servidor LDAP',
diff --git a/resources/lang/pt-BR/admin/users/message.php b/resources/lang/pt-BR/admin/users/message.php
index 94ad2f00fc..fde3d4889d 100644
--- a/resources/lang/pt-BR/admin/users/message.php
+++ b/resources/lang/pt-BR/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
     'user_deleted_warning'      => 'Este usuário foi deletado. Você terá que restaurar este usuário para editá-los ou atribui-lós novos bens.',
     'ldap_not_configured'        => 'Integração LDAP não foi configurada para esta instalação.',
     'password_resets_sent'      => 'Os usuários selecionados que são ativados e têm um endereço de e-mail válido receberam um link de redefinição de senha.',
+    'password_reset_sent'       => 'Um link de redefinição de senha foi enviado para :email!',
 
 
     'success' => array(
diff --git a/resources/lang/pt-BR/button.php b/resources/lang/pt-BR/button.php
index 9e52ed2557..5bd6c878ff 100644
--- a/resources/lang/pt-BR/button.php
+++ b/resources/lang/pt-BR/button.php
@@ -14,4 +14,5 @@ return array(
 	'select_file'				=> 'Selecionar arquivo...',
     'select_files'				=> 'Selecionar arquivos...',
     'generate_labels'           => '{1} Gerar Etiqueta|[2,*] Gerar Etiquetas',
+    'send_password_link'       => 'Enviar Link de redefinição de senha',
 );
diff --git a/resources/lang/pt-PT/admin/accessories/message.php b/resources/lang/pt-PT/admin/accessories/message.php
index 200beee1d8..167415df00 100644
--- a/resources/lang/pt-PT/admin/accessories/message.php
+++ b/resources/lang/pt-PT/admin/accessories/message.php
@@ -2,7 +2,7 @@
 
 return array(
 
-    'does_not_exist' => 'The accessory [:id] does not exist.',
+    'does_not_exist' => 'O acessório [:id] não existe.',
     'assoc_users'	 => 'Esta acessório tem atualmente :count items alocados a utilizadores. Por favor, devolva-os e tente novamente. ',
 
     'create' => array(
diff --git a/resources/lang/pt-PT/admin/asset_maintenances/general.php b/resources/lang/pt-PT/admin/asset_maintenances/general.php
index 3a26a0d69a..d7b219c85c 100644
--- a/resources/lang/pt-PT/admin/asset_maintenances/general.php
+++ b/resources/lang/pt-PT/admin/asset_maintenances/general.php
@@ -9,6 +9,6 @@
         'maintenance'        => 'Manutenção',
         'upgrade'            => 'Melhorar',
         'calibration'        => 'Calibração',
-        'software_support'   => 'Software Support',
-        'hardware_support'   => 'Hardware Support',
+        'software_support'   => 'Apoio ao Software',
+        'hardware_support'   => 'Apoio para Hardware',
     ];
diff --git a/resources/lang/pt-PT/admin/categories/general.php b/resources/lang/pt-PT/admin/categories/general.php
index b4facf4a32..8e22344569 100644
--- a/resources/lang/pt-PT/admin/categories/general.php
+++ b/resources/lang/pt-PT/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'Actualizar Categoria',
     'use_default_eula'					=> 'Em vez disso, utilize o <a href="#" data-toggle="modal" data-target="#eulaModal">EULA padrão</a>.',
     'use_default_eula_disabled'			=> '<del>Em vez disso, utilize o EULA padrão</del> Nenhum foi definido. Adicione um nas Configurações.',
+    'use_default_eula_column'			=> 'Usar EULA padrão',
 
 );
diff --git a/resources/lang/pt-PT/admin/depreciations/general.php b/resources/lang/pt-PT/admin/depreciations/general.php
index 383dfb2a5f..816ab7fd6a 100644
--- a/resources/lang/pt-PT/admin/depreciations/general.php
+++ b/resources/lang/pt-PT/admin/depreciations/general.php
@@ -8,6 +8,6 @@ return array(
     'depreciation_name'  					=> 'Nome da depreciação',
     'number_of_months'  					=> 'Número de mêses',
     'update'  					            => 'Actualizar depreciação',
-    'depreciation_min'                      => 'Minimum Value after Depreciation'
+    'depreciation_min'                      => 'Valor Mínimo após a Depreciação'
 
 );
diff --git a/resources/lang/pt-PT/admin/hardware/general.php b/resources/lang/pt-PT/admin/hardware/general.php
index 84de554748..d324629420 100644
--- a/resources/lang/pt-PT/admin/hardware/general.php
+++ b/resources/lang/pt-PT/admin/hardware/general.php
@@ -10,7 +10,7 @@ return array(
     'checkout'  				=> 'Ativo de compras',
     'clone'  					=> 'Clonar Ativo',
     'deployable'  				=> 'Implementável',
-    'deleted'  					=> 'This asset has been deleted.',
+    'deleted'  					=> 'Este ativo foi excluído.',
     'edit'  					=> 'Editar artigo',
     'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
     'requestable'               => 'Solicitavel',
diff --git a/resources/lang/pt-PT/admin/settings/general.php b/resources/lang/pt-PT/admin/settings/general.php
index dabe23cd68..45d674a343 100644
--- a/resources/lang/pt-PT/admin/settings/general.php
+++ b/resources/lang/pt-PT/admin/settings/general.php
@@ -61,9 +61,12 @@ return array(
     'label_logo'                => 'Logotipo da etiqueta',
     'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
     'laravel'                   => 'Versão do Laravel',
+    'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Certificate',
     'ldap_enabled'              => 'LDAP ativo',
     'ldap_integration'          => 'Integração LDAP',
     'ldap_settings'             => 'Configurações LDAP',
+    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_login_test_help'      => 'Introduza um utilizador e palavra-passe da LDAP válido pertencente ao DN que especificou acima +ara testar se a sua autenticação da LDAP foi configurada corretamente, PRIMEIRO DEVE GRAVAR AS SUAS DEFINIÇÕES ATUALIZADAS DA LDAP.',
     'ldap_login_sync_help'      => 'Isto apenas testa que a LDAP consegue sincronizar corretamente. Se a sua consulta de autenticação LDAP não estiver correta, os utilizadores poderão ainda não conseguir fazer a autenticação. PRIMEIRO DEVE GRAVAR AS SUAS DEFINIÇÕES ATUALIZADAS DA LDAP.',
     'ldap_server'               => 'Servidor LDAP',
diff --git a/resources/lang/pt-PT/admin/users/message.php b/resources/lang/pt-PT/admin/users/message.php
index 42a30ccef4..4fb84cd4af 100644
--- a/resources/lang/pt-PT/admin/users/message.php
+++ b/resources/lang/pt-PT/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
     'user_deleted_warning'      => 'Este utilizador foi removido. Terá que restaurar este utilizador para os editar ou alocar-lhe novos artigos.',
     'ldap_not_configured'        => 'A integração com LDAP não foi configurada para este instalação.',
     'password_resets_sent'      => 'Os usuários selecionados que são ativados e têm um endereço de e-mail válido receberam um link de redefinição de senha.',
+    'password_reset_sent'       => 'A password reset link has been sent to :email!',
 
 
     'success' => array(
diff --git a/resources/lang/pt-PT/auth/general.php b/resources/lang/pt-PT/auth/general.php
index 8bd0f010c5..5c83e23f85 100644
--- a/resources/lang/pt-PT/auth/general.php
+++ b/resources/lang/pt-PT/auth/general.php
@@ -4,13 +4,13 @@ return [
     'send_password_link'	        => 'Enviar Link de redefinição da senha',
     'email_reset_password'			=> 'Redefinição da senha e-mail',
     'reset_password'			    => 'Redefinir Senha',
-    'saml_login'                    => 'Login via SAML',
+    'saml_login'                    => 'Iniciar sessão via SAML',
     'login'                         => 'Nome de registo',
     'login_prompt'                  => 'Faça o Login',
     'forgot_password'               => 'Esqueci a minha senha',
-    'ldap_reset_password'           => 'Please click here to reset your LDAP password',
+    'ldap_reset_password'           => 'Por favor clique aqui para redefinir sua senha LDAP',
     'remember_me'                   => 'Lembrar-me',
-    'username_help_top'                 => 'Enter your <strong>username</strong> to be emailed a password reset link.',
-    'username_help_bottom'          => 'Your username and email address <em>may</em> be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator. <br><br><strong>Usernames without an associated email address will not be emailed a password reset link.</strong> ',
+    'username_help_top'                 => 'Introduza o seu <strong>nome de usuário</strong> para que lhe seja enviado um email com link de redifinição de senha.',
+    'username_help_bottom'          => 'O seu nome de usuário e o seu endereço de email <em>podem</em> podem ser os mesmos, mas também podem não ser os mesmos, dependendo da sua configuração. Se não se recorda do seu nome de usuário, entre em contacto com o seu administrador. <br><br><strong>Nomes de usuário sem um endereço de email associado não receberão um link de redefinição de senha por email. </strong> ',
     ];
 
diff --git a/resources/lang/pt-PT/auth/message.php b/resources/lang/pt-PT/auth/message.php
index db9f53b29c..9985939b3b 100644
--- a/resources/lang/pt-PT/auth/message.php
+++ b/resources/lang/pt-PT/auth/message.php
@@ -7,13 +7,13 @@ return array(
     'account_not_activated'  => 'Esta conta de utilizador não está ativa.',
     'account_suspended'      => 'Está conta de utilizador encontra-se suspensa.',
     'account_banned'         => 'Este utilizador foi desabilitado.',
-    'throttle'               => 'Too many failed login attempts. Please try again in :minutes minutes.',
+    'throttle'               => 'Muitas tentativas falhadas de início de sessão. Por favor, tente novamente dentro de :minutes minuto(s).',
 
     'two_factor' => array(
-        'already_enrolled'      => 'Your device is already enrolled.',
-        'success'               => 'You have successfully logged in.',
-        'code_required'         => 'Two-factor code is required.',
-        'invalid_code'          => 'Two-factor code is invalid.',
+        'already_enrolled'      => 'O seu dispositivo já está inscrito.',
+        'success'               => 'A sua sessão foi iniciada com sucesso.',
+        'code_required'         => 'O código de dois fatores é obrigatório.',
+        'invalid_code'          => 'O código de dois fatores é inválido.',
     ),
 
     'signin' => array(
@@ -22,8 +22,8 @@ return array(
     ),
 
     'logout' => array(
-        'error'   => 'There was a problem while trying to log you out, please try again.',
-        'success' => 'You have successfully logged out.',
+        'error'   => 'Ocorreu um problema ao tentar encerrar a sua sessão. Por favor, tente novamente.',
+        'success' => 'A sessão foi encerrada com sucesso.',
     ),
 
     'signup' => array(
@@ -33,7 +33,7 @@ return array(
 
     'forgot-password' => array(
         'error'   => 'Ocorreu um problema a tentar obter um código para restauro da password. Por favor, tente novamente.',
-        'success' => 'If that email address exists in our system, a password recovery email has been sent.',
+        'success' => 'Se esse endereço de e-mail existir no nosso sistema, um e-mail de recuperação de senha foi enviado.',
     ),
 
     'forgot-password-confirm' => array(
diff --git a/resources/lang/pt-PT/button.php b/resources/lang/pt-PT/button.php
index 175026fb80..b4b36a7b85 100644
--- a/resources/lang/pt-PT/button.php
+++ b/resources/lang/pt-PT/button.php
@@ -13,5 +13,6 @@ return array(
     'upload'                    => 'Carregar',
 	'select_file'				=> 'Selecione o arquivo...',
     'select_files'				=> 'Selecionar ficheiros...',
-    'generate_labels'           => '{1} Generate Label|[2,*] Generate Labels',
+    'generate_labels'           => '{1} Gerar Rótulo|[2,*] Gerar Rótulos',
+    'send_password_link'       => 'Send Password Reset Link',
 );
diff --git a/resources/lang/pt-PT/mail.php b/resources/lang/pt-PT/mail.php
index 8798ae8601..a6e19a76a7 100644
--- a/resources/lang/pt-PT/mail.php
+++ b/resources/lang/pt-PT/mail.php
@@ -9,7 +9,7 @@ return array(
     'asset' => 'Artigo:',
     'asset_name' => 'Nome do Artigo:',
     'asset_requested' => 'Artigo requesitado',
-    'asset_tag' => 'Asset Tag',
+    'asset_tag' => 'Etiqueta do Ativo',
     'assigned_to' => 'Atribuído a',
     'best_regards' => 'Atenciosamente',
     'canceled' => 'Cancelado:',
@@ -63,7 +63,7 @@ return array(
     'license_expiring_alert' => 'Há :count licença a expirar nos próximos :threshold dias. Existem :count licenças que irão expirar nos próximos :threshold dias.',
     'to_reset' => 'Para fazer reset a senha do :web, preencha este formulário:',
     'type' => 'Tipo',
-    'upcoming-audits' => 'There is :count asset that is coming up for audit within :threshold days.|There are :count assets that are coming up for audit within :threshold days.',
+    'upcoming-audits' => 'Existe um :count ativo que está a chegar para ser auditado em :threshold dias.|Existem :count ativos que estão a chegar para serem auditados em :threshold dias.',
     'user' => 'Utilizador',
     'username' => 'Nome de utilizador',
     'welcome' => 'Bem vindo, :name',
@@ -75,5 +75,5 @@ return array(
     'Expected_Checkin_Report' => 'Expected asset checkin report',
     'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching',
     'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date',
-    'your_assets' => 'View Your Assets'
+    'your_assets' => 'Ver seus ativos'
 );
diff --git a/resources/lang/ro/admin/categories/general.php b/resources/lang/ro/admin/categories/general.php
index 8c3ae68253..10fb976af9 100644
--- a/resources/lang/ro/admin/categories/general.php
+++ b/resources/lang/ro/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'Actualizeaza categorie',
     'use_default_eula'					=> 'Utilizați în schimb <a href="#" data-toggle="modal" data-target="#eulaModal"> implicit EULA</a>.',
     'use_default_eula_disabled'			=> '<del>Foloseste EULA general implicita.</del> EULA implicita nu a fost gasita. A se crea una in Setari.',
+    'use_default_eula_column'			=> 'Use default EULA',
 
 );
diff --git a/resources/lang/ro/admin/settings/general.php b/resources/lang/ro/admin/settings/general.php
index 6034ed2124..d3b7a04de4 100644
--- a/resources/lang/ro/admin/settings/general.php
+++ b/resources/lang/ro/admin/settings/general.php
@@ -61,9 +61,12 @@ return array(
     'label_logo'                => 'Sigla etichetei',
     'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
     'laravel'                   => 'Versiune Laravel',
+    'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Certificate',
     'ldap_enabled'              => 'LDAP activat',
     'ldap_integration'          => 'Integrarea LDAP',
     'ldap_settings'             => 'Setări LDAP',
+    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_login_test_help'      => 'Introduceți un nume de utilizator LDAP și o parolă valabilă din DN-ul de bază pe care l-ați specificat mai sus pentru a testa dacă datele de conectare LDAP sunt configurate corect. TREBUIE SĂ SAȚI PRIMUL SETĂRI LDAP ACTUALIZATE.',
     'ldap_login_sync_help'      => 'Acest lucru testează numai faptul că LDAP poate sincroniza corect. Dacă interogarea dvs. de autentificare LDAP nu este corectă, este posibil ca utilizatorii să nu se poată conecta. TREBUIE SĂ ACTUALIZAȚI SETĂRILE LDAP MAI ÎNTÂI.',
     'ldap_server'               => 'LDAP Server',
diff --git a/resources/lang/ro/admin/users/message.php b/resources/lang/ro/admin/users/message.php
index 77783432b2..c85da01a4b 100644
--- a/resources/lang/ro/admin/users/message.php
+++ b/resources/lang/ro/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
     'user_deleted_warning'      => 'Acest utilizator a fost sters. Trebuie sa restaurati utilizator ca sa-l editati sau sa-i desemnati active noi.',
     'ldap_not_configured'        => 'Integrarea LDAP nu a fost configurată pentru această instalare.',
     'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
+    'password_reset_sent'       => 'A password reset link has been sent to :email!',
 
 
     'success' => array(
diff --git a/resources/lang/ro/button.php b/resources/lang/ro/button.php
index 5770f91aec..3f736baa0d 100644
--- a/resources/lang/ro/button.php
+++ b/resources/lang/ro/button.php
@@ -14,4 +14,5 @@ return array(
 	'select_file'				=> 'Selectați Fișier ...',
     'select_files'				=> 'Selectați Fișier...',
     'generate_labels'           => '{1} Generate Label|[2,*] Generate Labels',
+    'send_password_link'       => 'Send Password Reset Link',
 );
diff --git a/resources/lang/ro/general.php b/resources/lang/ro/general.php
index 369f594d85..efc90e4dc2 100644
--- a/resources/lang/ro/general.php
+++ b/resources/lang/ro/general.php
@@ -70,7 +70,7 @@
     'debug_warning'         => 'Avertizare!',
     'debug_warning_text'    => 'Această aplicație rulează în modul de producție cu debugging activat. Acest lucru poate expune date sensibile dacă aplicația dvs. este accesibilă lumii exterioare. Dezactivați modul de depanare setând valoarea <code>APP_DEBUG</code> din fișierul <code>.env</code> la <code>false</code>.',
     'delete'  				=> 'Sterge',
-    'delete_confirm'  		=> 'Are you sure you wish to delete :item?',
+    'delete_confirm'  		=> 'Sigur doriți să ștergeți :item?',
     'deleted'  				=> 'Sters',
     'delete_seats'  		=> 'Locurile șterse',
     'departments'           => 'departamente',
diff --git a/resources/lang/ru/admin/categories/general.php b/resources/lang/ru/admin/categories/general.php
index 85da68624a..349937aa7f 100644
--- a/resources/lang/ru/admin/categories/general.php
+++ b/resources/lang/ru/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'Изменить категорию',
     'use_default_eula'					=> 'Использовать <a href="#" data-toggle="modal" data-target="#eulaModal">главное пользовательское соглашение по умолчанию</a>.',
     'use_default_eula_disabled'			=> '<del>Использовать основное пользовательское соглашение.</del> Не задано основное пользовательское соглашение. Добавьте его в Настройках.',
+    'use_default_eula_column'			=> 'Использовать лицензию по умолчанию',
 
 );
diff --git a/resources/lang/ru/admin/depreciations/general.php b/resources/lang/ru/admin/depreciations/general.php
index ef11fc0b7d..077a1f3e0f 100644
--- a/resources/lang/ru/admin/depreciations/general.php
+++ b/resources/lang/ru/admin/depreciations/general.php
@@ -8,6 +8,6 @@ return array(
     'depreciation_name'  					=> 'Название амортизации',
     'number_of_months'  					=> 'Количество месяцев',
     'update'  					            => 'Обновить амортизацию',
-    'depreciation_min'                      => 'Minimum Value after Depreciation'
+    'depreciation_min'                      => 'Минимальное значение после амортизации'
 
 );
diff --git a/resources/lang/ru/admin/hardware/general.php b/resources/lang/ru/admin/hardware/general.php
index d831571dd9..7e8302ada2 100644
--- a/resources/lang/ru/admin/hardware/general.php
+++ b/resources/lang/ru/admin/hardware/general.php
@@ -10,9 +10,9 @@ return array(
     'checkout'  				=> 'Выдать актив пользователю',
     'clone'  					=> 'Клонировать актив',
     'deployable'  				=> 'Доступные',
-    'deleted'  					=> 'This asset has been deleted.',
+    'deleted'  					=> 'Этот актив был удален.',
     'edit'  					=> 'Редактировать актив',
-    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
+    'model_deleted'  			=> 'Эта модель была удалена. Вы должны восстановить модель прежде, чем сможете восстановить актив.',
     'requestable'               => 'Готов к выдаче',
     'requested'				    => 'Запрошенное',
     'restore'  					=> 'Восстановить актив',
diff --git a/resources/lang/ru/admin/models/general.php b/resources/lang/ru/admin/models/general.php
index e42cca6ee0..af4665996a 100644
--- a/resources/lang/ru/admin/models/general.php
+++ b/resources/lang/ru/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'О моделях активов',
     'about_models_text'           => 'Модели активов это способ группировки идентичных активов. Например, "MacBookPro 2013, iPhone 6s", и т. д.',
-    'deleted'  					        => 'This model has been deleted.',
+    'deleted'  					        => 'Эта модель была удалена.',
     'bulk_delete'               => 'Массовое удаление моделей активов',
     'bulk_delete_help'               => 'Установите флажки ниже, чтобы подтвердить удаление выбранных моделей активов. Модели, имеющие связанные с ними активы, не могут быть удалены до тех пор, пока активы не будут связаны с другой моделью.',
     'bulk_delete_warn'          => 'Вы собираетесь удалить :model_count моделей активов.',
diff --git a/resources/lang/ru/admin/settings/general.php b/resources/lang/ru/admin/settings/general.php
index deca2c495b..7221e3b1d2 100644
--- a/resources/lang/ru/admin/settings/general.php
+++ b/resources/lang/ru/admin/settings/general.php
@@ -4,9 +4,9 @@ return array(
     'ad'				        => 'Active Directory',
     'ad_domain'				    => 'Домен Active Directory',
     'ad_domain_help'			=> 'Обычно, то же, что и ваш домен, но не всегда.',
-    'ad_append_domain_label'    => 'Append domain name',
-    'ad_append_domain'          => 'Append domain name to username field',
-    'ad_append_domain_help'     => 'User isn\'t required to write "username@domain.local", they can just type "username".' ,
+    'ad_append_domain_label'    => 'Добавить доменное имя',
+    'ad_append_domain'          => 'Добавить имя домена к имени пользователя',
+    'ad_append_domain_help'     => 'Пользователю не нужно будет вводить "username@domain.local", можно просто ввести "username".' ,
     'admin_cc_email'            => 'Скрытая копия',
     'admin_cc_email_help'       => 'Если вы хотите отправлять копии писем, что приходят пользователям при выдаче/возврате, на какой-то дополнительный адрес электронной почты, то введите его здесь. В противном случае оставьте это поле пустым.',
     'is_ad'				        => 'У вас сервер Active Directory',
@@ -14,7 +14,7 @@ return array(
     'alerts_enabled'			=> 'Уведомления включены',
     'alert_interval'			=> 'Предупреждение об истечении срока (в днях)',
     'alert_inv_threshold'		=> 'Порог оповещения о запасах',
-    'allow_user_skin'           => 'Allow user skin',
+    'allow_user_skin'           => 'Разрешить пользовтельские темы офрмления',
     'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' ,
     'asset_ids'					=> 'ID актива',
     'audit_interval'            => 'Интервал аудита',
@@ -27,7 +27,7 @@ return array(
     'backups'					=> 'Резервные копии',
     'barcode_settings'			=> 'Настройки штрихкода',
     'confirm_purge'			    => 'Подтвердить удаление',
-    'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone and will PERMANENTLY delete all soft-deleted items and users. (You should make a backup first, just to be safe.)',
+    'confirm_purge_help'		=> 'Введите "DELETE" в поле ниже для окончательного удаления ваших удаленных записей. Это действие не может быть отменено и ПОЛНОСТЬЮ очистит все удаленные записи. (Предварительно сделайте бекап, просто на всякий случай.)',
     'custom_css'				=> 'Пользовательское CSS',
     'custom_css_help'			=> 'Введите любое пользовательское CSS, которые вы хотите использовать. Не указывайте &lt;style&gt;&lt;/style&gt; теги.',
     'custom_forgot_pass_url'	=> 'Пользовательский URL для сброса пароля',
@@ -46,7 +46,7 @@ return array(
     'email_logo'                => 'Логотип E-Mail',
     'barcode_type'				=> 'Тип 2D штрихкода',
     'alt_barcode_type'			=> 'Тип линейного штрихкода',
-    'email_logo_size'       => 'Square logos in email look best. ',
+    'email_logo_size'       => 'В почте лучше всего выглядят квадратные логотипы. ',
     'eula_settings'				=> 'Настройки лицензионного соглашения',
     'eula_markdown'				=> 'Это EULA поддерживает <a href="https://help.github.com/articles/github-flavored-markdown/">форматирование Github flavored markdown</a>.',
     'favicon'                   => 'Favicon',
@@ -59,11 +59,14 @@ return array(
     'header_color'              => 'Цвет заголовка',
     'info'                      => 'Эти настройки позволяют персонализировать некоторые аспекты вашей установки.',
     'label_logo'                => 'Label Logo',
-    'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
+    'label_logo_size'           => 'Для маркировки активов лучше всего подойдут квадратные логотипы. Они будт отображаться в правом верхнем углу актива. ',
     'laravel'                   => 'Версия Laravel',
+    'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Certificate',
     'ldap_enabled'              => 'LDAP активно',
     'ldap_integration'          => 'Интеграция LDAP',
     'ldap_settings'             => 'Настройка LDAP',
+    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_login_test_help'      => 'Введите действительное имя пользователя и пароль LDAP из базового DN, указанного выше, чтобы проверить, правильно ли настроен логин LDAP. СНАЧАЛА ВЫ ДОЛЖНЫ СОХРАНИТЬ ВАШИ ОБНОВЛЕННЫЕ НАСТРОЙКИ LDAP.',
     'ldap_login_sync_help'      => 'Этим производится проверка правильности синхронизации LDAP. Если тест подлинности LDAP не пройдёт, пользователи так и не смогут войти в систему. СНАЧАЛА ВЫ ДОЛЖНЫ СОХРАНИТЬ ВАШИ ОБНОВЛЕННЫЕ НАСТРОЙКИ LDAP.',
     'ldap_server'               => 'Сервер LDAP',
diff --git a/resources/lang/ru/admin/users/message.php b/resources/lang/ru/admin/users/message.php
index b0ecae1f41..2d91f07f00 100644
--- a/resources/lang/ru/admin/users/message.php
+++ b/resources/lang/ru/admin/users/message.php
@@ -12,7 +12,8 @@ return array(
     'insufficient_permissions'  => 'Недостаточно прав.',
     'user_deleted_warning'      => 'Этот пользователь был удален. Вы должны его восстановить чтобы иметь возможность его редактировать или привязывать новые активы.',
     'ldap_not_configured'        => 'Интеграция с LDAP не настроена для этой инсталляции.',
-    'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
+    'password_resets_sent'      => 'Ссылка для сброса пароля была отправлена выбранным пользователям которые имеют действительный адрес электронной почты а активированы.',
+    'password_reset_sent'       => 'Ссылка для сброса пароля была отправлена на адрес :email!',
 
 
     'success' => array(
diff --git a/resources/lang/ru/auth/general.php b/resources/lang/ru/auth/general.php
index 7f1b99a294..8c16fdb562 100644
--- a/resources/lang/ru/auth/general.php
+++ b/resources/lang/ru/auth/general.php
@@ -8,7 +8,7 @@ return [
     'login'                         => 'Логин',
     'login_prompt'                  => 'Пожалуйста, авторизуйтесь',
     'forgot_password'               => 'Я забыл мой пароль',
-    'ldap_reset_password'           => 'Please click here to reset your LDAP password',
+    'ldap_reset_password'           => 'Нажмите здесь для сброса своего пароля в LDAP',
     'remember_me'                   => 'Запомнить меня',
     'username_help_top'                 => 'Введите своё <strong>Имя Пользователя</strong>, чтобы получить ссылку для сброса пароля.',
     'username_help_bottom'          => 'Ваши Имя Пользователя и Ваш E-Mail <em>могут</em> быть одинаковыми, но могут и не быть, в зависимости от Вашей конфигурации. Если Вы не можете вспомнить Ваше Имя Пользователя - обратитесь к Вашему системному администратору.<br><br><strong>Имена Пользователя, к которым не привязан адрес электронной почты, не смогут получить ссылку на сброс пароля.</strong> ',
diff --git a/resources/lang/ru/button.php b/resources/lang/ru/button.php
index 4579bd8b8f..c0067c7915 100644
--- a/resources/lang/ru/button.php
+++ b/resources/lang/ru/button.php
@@ -14,4 +14,5 @@ return array(
 	'select_file'				=> 'Выберите файл...',
     'select_files'				=> 'Выбрать файлы...',
     'generate_labels'           => '{1} Сгенерировать этикетку[2,*] Cгенерировать этикетки',
+    'send_password_link'       => 'Отправить ссылку для сброса пароля',
 );
diff --git a/resources/lang/ru/general.php b/resources/lang/ru/general.php
index e4ba6fa7e6..085b583349 100644
--- a/resources/lang/ru/general.php
+++ b/resources/lang/ru/general.php
@@ -58,7 +58,7 @@
     'created'               => 'Элемент создан',
     'created_asset'			=> 'Создать актив',
     'created_at' 			=> 'Создано',
-    'record_created' 		=> 'Record Created',
+    'record_created' 		=> 'Запись Создана',
     'updated_at' 			=> 'Обновлено',
     'currency'  			=> 'Руб.', // this is deprecated
     'current'  				=> 'Текущий',
@@ -90,10 +90,10 @@
     'firstname_lastname_format'	=> 'Имя и фамилия через точку  (jane.smith@example.com)',
     'firstname_lastname_underscore_format' => 'Имя и фамилия (jane_smith@example.com)',
     'lastnamefirstinitial_format' =>  'Фамилия и первая буква имени (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
+    'firstintial_dot_lastname_format' => 'Первая буква имени Фамилия (i.ivanov@example.com)',
     'first'					=> 'В начало',
-    'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
-    'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
+    'firstnamelastname'     => 'Имя Фамилия (ivanivanov@example.com)',
+    'lastname_firstinitial' => 'Фамилия Первая буква имени (ivanov_i@example.com)',
     'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
     'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
     'first_name'			=> 'Имя',
@@ -112,17 +112,17 @@
     'image'                 => 'Изображение',
     'image_delete'         	=> 'Удалить изображение',
     'image_upload'         	=> 'Загрузить изображение',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, and svg. Max upload size allowed is :size.',
+    'image_filetypes_help'  => 'Допустимые типы файлов - pg, webp, png, gif, и svg. Максимальный размер файла :size.',
     'import'         	    => 'Импорт',
     'importing'         	=> 'Импортируется',
-    'importing_help'        => 'You can import assets, accessories, licenses, components, consumables, and users via CSV file. <br><br>The CSV should be comma-delimited and formatted with headers that match the ones in the <a href="https://snipe-it.readme.io/docs/importing" target="_new">sample CSVs in the documentation</a>.',
+    'importing_help'        => 'Вы можете импортировать активы, аксессуары, лицензии, компоненты, расходные материалы и пользователей через CSV-файл. <br><br>CSV должен быть разделен запятыми и отформатирован заголовками, которые соответствуют заголовкам <a href="https://snipe-it.readme.io/docs/importing" target="_new">образца CSV в документации</a>.',
     'import-history'        => 'История импорта',
     'asset_maintenance'        => 'Обслуживание',
     'asset_maintenance_report' => 'Отчет по обслуживанию',
     'asset_maintenances'       => 'Активы на обслуживании',
     'item'  				=> 'Предмет',
     'insufficient_permissions' => 'Недостаточно прав!',
-    'kits'       			=> 'Predefined Kits',
+    'kits'       			=> 'Готовые наборы',
     'language'				=> 'Язык',
     'last'					=> 'В конец',
     'last_login'            => 'Последний вход',
@@ -133,7 +133,7 @@
     'licenses'				=> 'Лицензии',
     'list_all'				=> 'Весь список',
     'loading'				=> 'Загрузка',
-    'lock_passwords'        => 'This field value will not be saved in a demo installation.',
+    'lock_passwords'        => 'Это значение не будет сохранено в демо-версии.',
     'feature_disabled'      => 'Функция отключена в этой версии.',
     'location'              => 'Расположение',
     'locations'				=> 'Места',
@@ -176,7 +176,7 @@
     'remove_company'        => 'Удалить привязку компании',
     'reports'				=> 'Отчеты',
     'restored'				=> 'восстановлено',
-    'restore'				=> 'Restore',
+    'restore'				=> 'Восстановить',
     'requested'				=> 'Запрошено',
     'request_canceled'      => 'Запрос отменен',
     'save'  				=> 'Сохранить',
@@ -228,7 +228,7 @@
     'declined'			    => 'отменено',
     'unaccepted_asset_report' => 'Непринятые активы',
     'users'                 => 'Пользователи',
-    'viewall'				=> 'View All',
+    'viewall'				=> 'Посмотреть все',
     'viewassets'  			=> 'Показать присвоенные активы',
     'website'               => 'Сайт',
     'welcome'				=> 'Добро пожаловать, :name',
diff --git a/resources/lang/ru/help.php b/resources/lang/ru/help.php
index 4cb2354f89..200d0be2ea 100644
--- a/resources/lang/ru/help.php
+++ b/resources/lang/ru/help.php
@@ -13,7 +13,7 @@ return array(
     |
     */
 
-    "more_info_title" => "More Info",
+    "more_info_title" => "Подробнее",
 
     "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 is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.",
 
diff --git a/resources/lang/ru/mail.php b/resources/lang/ru/mail.php
index 88de6b76b3..5dccafe137 100644
--- a/resources/lang/ru/mail.php
+++ b/resources/lang/ru/mail.php
@@ -73,7 +73,7 @@ return array(
     'Asset_Checkin_Notification' => 'Asset checked in',
     'License_Checkin_Notification' => 'License checked in',
     'Expected_Checkin_Report' => 'Expected asset checkin report',
-    'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching',
+    'Expected_Checkin_Notification' => 'Напоминание: приближается крайний срок проверки :name',
     'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date',
     'your_assets' => 'Посмотреть активы'
 );
diff --git a/resources/lang/si-LK/admin/categories/general.php b/resources/lang/si-LK/admin/categories/general.php
index 7741b7da62..52e936d0b6 100644
--- a/resources/lang/si-LK/admin/categories/general.php
+++ b/resources/lang/si-LK/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'Update Category',
     'use_default_eula'					=> 'Use the <a href="#" data-toggle="modal" data-target="#eulaModal">primary default EULA</a> instead.',
     'use_default_eula_disabled'			=> '<del>Use the primary default EULA instead.</del> No primary default EULA is set. Please add one in Settings.',
+    'use_default_eula_column'			=> 'Use default EULA',
 
 );
diff --git a/resources/lang/si-LK/admin/settings/general.php b/resources/lang/si-LK/admin/settings/general.php
index e15162210e..fb268f39f0 100644
--- a/resources/lang/si-LK/admin/settings/general.php
+++ b/resources/lang/si-LK/admin/settings/general.php
@@ -61,9 +61,12 @@ return array(
     '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',
+    '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_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_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_server'               => 'LDAP Server',
diff --git a/resources/lang/si-LK/admin/users/message.php b/resources/lang/si-LK/admin/users/message.php
index e517cd113b..85d016f04a 100644
--- a/resources/lang/si-LK/admin/users/message.php
+++ b/resources/lang/si-LK/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
     'user_deleted_warning'      => 'This user has been deleted. You will have to restore this user to edit them or assign them new assets.',
     'ldap_not_configured'        => 'LDAP integration has not been configured for this installation.',
     'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
+    'password_reset_sent'       => 'A password reset link has been sent to :email!',
 
 
     'success' => array(
@@ -38,10 +39,10 @@ return array(
         'asset_already_accepted' => 'This asset has already been accepted.',
         'accept_or_decline' => 'You must either accept or decline this asset.',
         'incorrect_user_accepted' => 'The asset you have attempted to accept was not checked out to you.',
-        'ldap_could_not_connect' => 'Could not connect to the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD <br>Error from LDAP Server:',
-        'ldap_could_not_bind' => 'Could not bind to the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD<br>Error from LDAP Server: ',
-        'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD and any Locations that may have additional OUs associated with them. <br>Error from LDAP Server:',
-        'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD and any Locations that may have additional OUs associated with them. <br>Error from LDAP Server:',
+        'ldap_could_not_connect' => 'Could not connect to the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
+        'ldap_could_not_bind' => 'Could not bind to the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server: ',
+        'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
+        'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
         'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ',
     ),
 
diff --git a/resources/lang/si-LK/button.php b/resources/lang/si-LK/button.php
index 2b97223250..27131e5fc6 100644
--- a/resources/lang/si-LK/button.php
+++ b/resources/lang/si-LK/button.php
@@ -14,4 +14,5 @@ return array(
 	'select_file'				=> 'Select File...',
     'select_files'				=> 'Select Files...',
     'generate_labels'           => '{1} Generate Label|[2,*] Generate Labels',
+    'send_password_link'       => 'Send Password Reset Link',
 );
diff --git a/resources/lang/sk/admin/categories/general.php b/resources/lang/sk/admin/categories/general.php
index 277035d4c1..9f62ba012f 100644
--- a/resources/lang/sk/admin/categories/general.php
+++ b/resources/lang/sk/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'Upraviť kategóriu',
     'use_default_eula'					=> 'Použiť <a href="#" data-toggle="modal" data-target="#eulaModal">predvolený dokument EULA</a> namiesto toho.',
     'use_default_eula_disabled'			=> '<del>Použiť namiesto toho predvolený dokument EULA.</del> Predvolený dokument EULA nie je nastavený. Prosím vyberte predvolený dokument v Nastaveniach.',
+    'use_default_eula_column'			=> 'Use default EULA',
 
 );
diff --git a/resources/lang/sk/admin/settings/general.php b/resources/lang/sk/admin/settings/general.php
index caae05844b..2192727fe7 100644
--- a/resources/lang/sk/admin/settings/general.php
+++ b/resources/lang/sk/admin/settings/general.php
@@ -54,16 +54,19 @@ return array(
     '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.',
-    'general_settings'			=> 'General Settings',
+    'general_settings'			=> 'Všeobecné nastavenia',
     'generate_backup'			=> 'Generate Backup',
     'header_color'              => 'Header Color',
     'info'                      => 'These settings let you customize certain aspects of your installation.',
     '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',
+    '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_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_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_server'               => 'LDAP Server',
@@ -92,7 +95,7 @@ return array(
     'ldap_activated_flag_help'  => 'This flag is used to determine whether a user can login to Snipe-IT and does not affect the ability to check items in or out to them.',
     'ldap_emp_num'              => 'LDAP Employee Number',
     'ldap_email'                => 'LDAP Email',
-    'license'                  => 'Software License',
+    'license'                  => 'Softvérová licencia',
     'load_remote_text'          => 'Remote Scripts',
     'load_remote_help_text'		=> 'This Snipe-IT install can load scripts from the outside world.',
     'login_note'                => 'Login Note',
diff --git a/resources/lang/sk/admin/users/message.php b/resources/lang/sk/admin/users/message.php
index c4e5402cff..ad3881a561 100644
--- a/resources/lang/sk/admin/users/message.php
+++ b/resources/lang/sk/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
     '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!',
 
 
     'success' => array(
diff --git a/resources/lang/sk/button.php b/resources/lang/sk/button.php
index 6b54e6701f..0b93458980 100644
--- a/resources/lang/sk/button.php
+++ b/resources/lang/sk/button.php
@@ -14,4 +14,5 @@ return array(
 	'select_file'				=> 'Vybrať súbor...',
     'select_files'				=> 'Vybrať súbory...',
     'generate_labels'           => '{1} Generovať štítok|[2,*] Generovať štítky',
+    'send_password_link'       => 'Send Password Reset Link',
 );
diff --git a/resources/lang/sk/general.php b/resources/lang/sk/general.php
index 446957c9a5..d65c1bec8f 100644
--- a/resources/lang/sk/general.php
+++ b/resources/lang/sk/general.php
@@ -31,7 +31,7 @@
     'bulkaudit_status'      => 'Audit Status',
     'bulk_checkout'  		=> 'Bulk Checkout',
     'bystatus'              => 'by Status',
-    'cancel'  				=> 'Cancel',
+    'cancel'  				=> 'Zrušiť',
     'categories'			=> 'Categories',
     'category'				=> 'Category',
     'change' 		        => 'In/Out',
@@ -69,7 +69,7 @@
     'date'					=> 'Date',
     'debug_warning'         => 'Warning!',
     'debug_warning_text'    => 'This application is running in production mode with debugging enabled. This can expose sensitive data if your application is accessible to the outside world. Disable debug mode by setting the <code>APP_DEBUG</code> value in your <code>.env</code> file to <code>false</code>.',
-    'delete'  				=> 'Delete',
+    'delete'  				=> 'Odstrániť',
     'delete_confirm'  		=> 'Are you sure you wish to delete :item?',
     'deleted'  				=> 'Deleted',
     'delete_seats'  		=> 'Deleted Seats',
@@ -179,7 +179,7 @@
     'restore'				=> 'Restore',
     'requested'				=> 'Requested',
     'request_canceled'      => 'Request Canceled',
-    'save'  				=> 'Save',
+    'save'  				=> 'Uložiť',
     'select'				=> 'Select',
     'search'				=> 'Search',
     'select_category'       => 'Select a Category',
@@ -194,7 +194,7 @@
     'select_statuslabel'	=> 'Select Status',
     'select_company'    	=> 'Select Company',
     'select_asset'    		=> 'Select Asset',
-    'settings'				=> 'Settings',
+    'settings'				=> 'Nastavenia',
     'show_deleted'  		=> 'Show Deleted',
     'show_current'  		=> 'Show Current',
     'sign_in'				=> 'Sign in',
diff --git a/resources/lang/sl/admin/accessories/message.php b/resources/lang/sl/admin/accessories/message.php
index a527695e45..d54f701a25 100644
--- a/resources/lang/sl/admin/accessories/message.php
+++ b/resources/lang/sl/admin/accessories/message.php
@@ -2,7 +2,7 @@
 
 return array(
 
-    'does_not_exist' => 'The accessory [:id] does not exist.',
+    'does_not_exist' => 'Dodatek [:id] ne obstaja.',
     'assoc_users'	 => 'Ta dodatek trenutno vsebuje: štetje predmetov, elementov ki so izdani uporabnikom. Preverite dodatke in poskusite znova. ',
 
     'create' => array(
diff --git a/resources/lang/sl/admin/asset_maintenances/general.php b/resources/lang/sl/admin/asset_maintenances/general.php
index c5823db9ae..8d4b958591 100644
--- a/resources/lang/sl/admin/asset_maintenances/general.php
+++ b/resources/lang/sl/admin/asset_maintenances/general.php
@@ -8,7 +8,7 @@
         'repair'             => 'Popravi',
         'maintenance'        => 'Vzdrževanje',
         'upgrade'            => 'Nadgradnja',
-        'calibration'        => 'Calibration',
-        'software_support'   => 'Software Support',
-        'hardware_support'   => 'Hardware Support',
+        'calibration'        => 'Kalibracija',
+        'software_support'   => 'Podpora za programsko opremo',
+        'hardware_support'   => 'Podpora za strojno opremo',
     ];
diff --git a/resources/lang/sl/admin/categories/general.php b/resources/lang/sl/admin/categories/general.php
index a17449cf78..27354fed65 100644
--- a/resources/lang/sl/admin/categories/general.php
+++ b/resources/lang/sl/admin/categories/general.php
@@ -3,8 +3,8 @@
 return array(
     'asset_categories' 					=> 'Kategorije sredstev',
     'category_name'  					=> 'Ime kategorije',
-    'checkin_email'                     => 'Send email to user on checkin/checkout.',
-    'checkin_email_notification'        => 'This user will be sent an email on checkin/checkout.',
+    'checkin_email'                     => 'Pošlji e-pošto uporabniku ob sprejemu/izdaji.',
+    'checkin_email_notification'        => 'Uporabnik bo poslan e-pošto ob sprejemu/izdaji.',
     'clone'                             => 'Kloniraj Karegorijo',
     'create'  							=> 'Ustvari kategorijo',
     'edit'                              => 'Uredi Kategorijo',
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'Posodobi kategorijo',
     'use_default_eula'					=> 'Uporabite <a href="#" data-toggle="modal" data-target="#eulaModal">privzeto EULA</a> namesto tega.',
     'use_default_eula_disabled'			=> '<del>Namesto tega uporabite privzeto EULA.</del> Ni privzete EULA. Dodajte jo v Nastavitvah.',
+    'use_default_eula_column'			=> 'Uporabi privzeto EULA',
 
 );
diff --git a/resources/lang/sl/admin/custom_fields/general.php b/resources/lang/sl/admin/custom_fields/general.php
index 215ed99ff4..e0f84afa2d 100644
--- a/resources/lang/sl/admin/custom_fields/general.php
+++ b/resources/lang/sl/admin/custom_fields/general.php
@@ -28,5 +28,5 @@ return array(
     'create_fieldset'         => 'Nov set polj',
     'create_field'            => 'Novo polje po meri',
     'value_encrypted'      	        => 'Vrednost tega polja je šifrirana v bazi podatkov. Dešifrirane vrednosti bodo lahko videli samo skrbniki sistema',
-    'show_in_email'     => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails.',
+    'show_in_email'     => 'Vključi vrednost tega polja v izdajni e-pošti poslani uporabniku? Šifriranih polj ni mogoče vključiti v e-pošti.',
 );
diff --git a/resources/lang/sl/admin/depreciations/general.php b/resources/lang/sl/admin/depreciations/general.php
index da65624789..37bfdc05c5 100644
--- a/resources/lang/sl/admin/depreciations/general.php
+++ b/resources/lang/sl/admin/depreciations/general.php
@@ -8,6 +8,6 @@ return array(
     'depreciation_name'  					=> 'Ime amortizacije',
     'number_of_months'  					=> 'Število mesecev',
     'update'  					            => 'Posodobi amortizacijo',
-    'depreciation_min'                      => 'Minimum Value after Depreciation'
+    'depreciation_min'                      => 'Minimalna vrednost po amortizaciji'
 
 );
diff --git a/resources/lang/sl/admin/hardware/general.php b/resources/lang/sl/admin/hardware/general.php
index 6468e07259..b5b1f7458c 100644
--- a/resources/lang/sl/admin/hardware/general.php
+++ b/resources/lang/sl/admin/hardware/general.php
@@ -5,14 +5,14 @@ return array(
     'about_assets_text'            => 'Sredstva so stvari, ki so sledene po serijski številki ali oznaki sredstva. Ponavadi so stvari z višjo vrednostjo, pri katerih je opredelitev določenega predmeta pomembna.',
 	'archived'  				=> 'Arhivirano',
     'asset'  					=> 'Sredstev',
-    'bulk_checkout'             => 'Checkout Assets',
+    'bulk_checkout'             => 'Izdaja sredstev',
     'checkin'  					=> 'Sprejem sredstev',
     'checkout'  				=> 'Izdaja sredstev',
     'clone'  					=> 'Klonska sredstvo',
     'deployable'  				=> 'Razdeljeno',
-    'deleted'  					=> 'This asset has been deleted.',
+    'deleted'  					=> 'To sredstvo je bilo izbrisano.',
     'edit'  					=> 'Urejanje sredstva',
-    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
+    'model_deleted'  			=> 'Model tega sredstva je bil izbrisan. Pred obnovitvijo sredstva je potrebno obnoviti model.',
     'requestable'               => 'Zahtevano',
     'requested'				    => 'Zahtevano',
     'restore'  					=> 'Obnovitev sredstev',
diff --git a/resources/lang/sl/admin/hardware/table.php b/resources/lang/sl/admin/hardware/table.php
index 0440c690e5..f2588647d5 100644
--- a/resources/lang/sl/admin/hardware/table.php
+++ b/resources/lang/sl/admin/hardware/table.php
@@ -20,6 +20,6 @@ return array(
     'title'      	=> 'Sredstvo ',
     'image'		=> 'Slika naprave',
     'days_without_acceptance' => 'Dnevi brez sprejema',
-    'monthly_depreciation' => 'Monthly Depreciation'
+    'monthly_depreciation' => 'Mesečna amortizacija'
 
 );
diff --git a/resources/lang/sl/admin/kits/general.php b/resources/lang/sl/admin/kits/general.php
index b4f2d90ae1..7b1ce116f4 100644
--- a/resources/lang/sl/admin/kits/general.php
+++ b/resources/lang/sl/admin/kits/general.php
@@ -1,17 +1,17 @@
 <?php
 
 return array(
-    '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. ',
+    'about_kits_title'                  => 'O vnaprej določenih kompletih',
+    'about_kits_text'                   => 'Vnaprej določeni kompleti omogočajo hitro izdajo zbirko stvari (sredstev, licenc, ipd.) uporabniku. Zelo uporabno ob konsistentnem vstopnem procesu med velikim številom uporabnikov, kjer vsi uporabniki prejmejo enake stvari.',
+    'checkout'                          => 'Komplet za izdajo ',
+    'create_success'                    => 'Komplet uspešno ustvarjen.',
+    'create'                            => 'Ustvari vnaprej določen komplet',
+    'update'                            => 'Posodobi vnaprej določen komplet',
+    'delete_success'                    => 'Komplet uspešno izbrisan.',
+    'update_success'                    => 'Komplet uspešno posodobljen.',
+    'none_models'                       => 'Na voljo ni dovolj sredstev :model za izdajo. Potrebnih :qty. ',
+    'none_licenses'                     => 'Na voljo ni dovolj sredstev :license za izdajo. Potrebnih :qty. ',
+    'none_consumables'                  => 'Na voljo ni dovolj enot :consumable za izdajo. Potrebnih :qty. ',
+    'none_accessory'                    => 'Na voljo ni dovolj sredstev :model za izdajo. Potrebnih :qty. ',
 
 );
diff --git a/resources/lang/sl/admin/licenses/message.php b/resources/lang/sl/admin/licenses/message.php
index f2e9994fe1..005ce075c8 100644
--- a/resources/lang/sl/admin/licenses/message.php
+++ b/resources/lang/sl/admin/licenses/message.php
@@ -8,7 +8,7 @@ return array(
     'owner_doesnt_match_asset' => 'Sredstev, ki ga poskušate povezati s to licenco, je v lasti nekoga drugega, in ne v lasti uporabnika ki je izbran v spustnem seznamu.',
     'assoc_users'	 => 'Ta licenca je trenutno izdana uporabniku in je ni mogoče izbrisati. Najprej preverite licenco in poskusite znova izbrisati. ',
     'select_asset_or_person' => 'Izbrati morate sredstvo ali uporabnika, vendar ne obojega.',
-    'not_found' => 'License not found',
+    'not_found' => 'Licenca ni najdena',
 
 
     'create' => array(
diff --git a/resources/lang/sl/admin/locations/table.php b/resources/lang/sl/admin/locations/table.php
index b92b976bdc..5fe60189db 100644
--- a/resources/lang/sl/admin/locations/table.php
+++ b/resources/lang/sl/admin/locations/table.php
@@ -11,8 +11,8 @@ return array(
     'country'                   => 'Država',
     'create'                    => 'Ustvari lokacijo',
     'update'                    => 'Posodobi lokacijo',
-    'print_assigned'            => 'Print Assigned',
-    'print_all_assigned'        => 'Print All Assigned',
+    'print_assigned'            => 'Natisni dodeljene',
+    'print_all_assigned'        => 'Natisni vse dodeljene',
     'name'                      => 'Ime lokacije',
     'address'                   => 'Naslov',
     'zip'                       => 'Poštna številka',
diff --git a/resources/lang/sl/admin/manufacturers/message.php b/resources/lang/sl/admin/manufacturers/message.php
index 7972144bf1..16c8ba3c07 100644
--- a/resources/lang/sl/admin/manufacturers/message.php
+++ b/resources/lang/sl/admin/manufacturers/message.php
@@ -16,8 +16,8 @@ return array(
     ),
 
     'restore' => array(
-        'error'   => 'Manufacturer was not restored, please try again',
-        'success' => 'Manufacturer restored successfully.'
+        'error'   => 'Proizvajalec ni bil obnovljen, prosim poskusite ponovno',
+        'success' => 'Proizvajalec uspešno obnovljen.'
     ),
 
     'delete' => array(
diff --git a/resources/lang/sl/admin/models/general.php b/resources/lang/sl/admin/models/general.php
index 62db00bd20..271dea6294 100644
--- a/resources/lang/sl/admin/models/general.php
+++ b/resources/lang/sl/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'O modelih sredstev',
     'about_models_text'           => 'Modeli sredstev so način za združevanje identičnih sredstev. "MBP 2013", "IPhone 6s" itd.',
-    'deleted'  					        => 'This model has been deleted.',
+    'deleted'  					        => 'Ta model je bil izbrisan.',
     'bulk_delete'               => 'Množično brisanje modelov sredstva',
     'bulk_delete_help'               => 'S potrditvenimi polji spodaj potrdite izbris izbranih modelov sredstev. Modelov sredstev, ki imajo z njimi povezana sredstva, ni mogoče izbrisati, dokler sredstva niso povezana z drugačnim modelom.',
     'bulk_delete_warn'          => 'Izbrisali boste :modelov_count modelov sredstev.',
@@ -14,5 +14,5 @@ return array(
     'view_models'               => 'Ogled modelov',
     'fieldset'                  => 'Set polj',
     'no_custom_field'           => 'Ni polj po meri',
-    'add_default_values'        => 'Add default values',
+    'add_default_values'        => 'Dodaj privzete vrednosti',
 );
diff --git a/resources/lang/sl/admin/settings/general.php b/resources/lang/sl/admin/settings/general.php
index 1a624e9c85..38ec02082d 100644
--- a/resources/lang/sl/admin/settings/general.php
+++ b/resources/lang/sl/admin/settings/general.php
@@ -4,18 +4,18 @@ return array(
     'ad'				        => 'Active Directory',
     'ad_domain'				    => 'Domena Active Directory',
     'ad_domain_help'			=> 'To je včasih enako kot vaša domena e-pošte, vendar ne vedno.',
-    'ad_append_domain_label'    => 'Append domain name',
-    'ad_append_domain'          => 'Append domain name to username field',
-    'ad_append_domain_help'     => 'User isn\'t required to write "username@domain.local", they can just type "username".' ,
-    'admin_cc_email'            => 'CC Email',
-    'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
+    'ad_append_domain_label'    => 'Dodaj ime domene',
+    'ad_append_domain'          => 'Dodaj ime domene polju z uporabniškim imenom',
+    'ad_append_domain_help'     => 'Uporabniku ni potrebno vnesti "uporabnisko-ime@domena.local", vnesejo lahko le "uporabnisko-ime".' ,
+    'admin_cc_email'            => 'E-pošta v vednost',
+    'admin_cc_email_help'       => 'V kolikor želite poslati kopijo sprejemne/izdajne e-pošte poslane uporabnikom tudi na dodaten e-poštni račun, ga vnesite tu. V nasprotnem primeru pustite polje prazno.',
     'is_ad'				        => 'To je strežnik Active Directory',
     'alert_email'				=> 'Pošlji opozorila na',
     'alerts_enabled'			=> 'Opozorila e-pošte so omogočena',
     'alert_interval'			=> 'Prag za opozorilo pri poteku (v dneh)',
     'alert_inv_threshold'		=> 'Prag za opozorilo pri inventuri',
-    'allow_user_skin'           => 'Allow user skin',
-    'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' ,
+    'allow_user_skin'           => 'Dovoli uporabniške preobleke',
+    'allow_user_skin_help_text' => 'Potrditev tega polja bo uporabnikom omogočila spremembo preobleke uporabniškega vmesnika z drugo.' ,
     'asset_ids'					=> 'ID sredstva',
     'audit_interval'            => 'Revizijski interval',
     'audit_interval_help'       => 'Če boste morali redno fizično pregledovati svoja sredstva, vnesite interval v mesecih.',
@@ -61,9 +61,12 @@ return array(
     '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',
+    'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Certificate',
     'ldap_enabled'              => 'Omogočen LDAP',
     'ldap_integration'          => 'Integracija LDAP',
     'ldap_settings'             => 'Nastavitve LDAP',
+    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_login_test_help'      => 'Vnesite veljavno uporabniško ime in geslo za LDAP iz osnovnega DN, ki ste ga navedli zgoraj, da preizkusite, ali je vaša prijava LDAP konfigurirana pravilno. Najprej morate shraniti posodobljene nastavitve za LDAP.',
     'ldap_login_sync_help'      => 'To samo testira, če lahko LDAP pravilno sinhronizira. Če vaša poizvedba LDAP Authentication ni pravilna, se uporabniki morda še vedno ne morejo prijaviti. Najprej morate shraniti posodobljene nastavitve za LDAP.',
     'ldap_server'               => 'Strežnik LDAP',
diff --git a/resources/lang/sl/admin/statuslabels/table.php b/resources/lang/sl/admin/statuslabels/table.php
index 3e11b9040e..a0d79c1e35 100644
--- a/resources/lang/sl/admin/statuslabels/table.php
+++ b/resources/lang/sl/admin/statuslabels/table.php
@@ -5,8 +5,8 @@ return array(
     'archived'      	=> 'Arhivirano',
     'create'      	=> 'Ustvari oznako stanja',
     'color'      	=> 'Barva grafikona',
-    'default_label' => 'Default Label',
-    'default_label_help' => 'This is used to ensure your most commonly used status labels appear at the top of the select box when creating/editing assets.',
+    'default_label' => 'Privzeta oznaka',
+    'default_label_help' => 'Zagotavlja, da se najpogosteje uporabljana oznaka statusa pojavi na vrhu izbirnega polja ob ustvarjanju/urejanju sredstev.',
     'deployable'      	=> 'Razporejeno',
     'info'      	=> 'Oznake stanja se uporabljajo za oznako različnih statusov, v katerih so lahko vaša sredstva. Morda so na popravilu, so izgubljene / ukradene itd. Ustvarite lahko nove oznake statusov za sredstva.',
     'name'      	=> 'Ime statusa',
diff --git a/resources/lang/sl/admin/users/general.php b/resources/lang/sl/admin/users/general.php
index 5c08e7608d..b29027df91 100644
--- a/resources/lang/sl/admin/users/general.php
+++ b/resources/lang/sl/admin/users/general.php
@@ -2,8 +2,8 @@
 
 
 return array(
-    'activated_help_text' => 'This user can login',
-    'activated_disabled_help_text' => 'You cannot edit activation status for your own account.',
+    'activated_help_text' => 'Ta uporabnik se lahko prijavi',
+    'activated_disabled_help_text' => 'Ne moreš urejati stanja aktivacije lastnega računa.',
     'assets_user'       => 'Sredstva dodeljena osebi: ime',
     'bulk_update_warn'	=> 'Uredili boste lastnosti :user_count uporabnikov. Upoštevajte, da s tem obrazcem ne morete spremeniti lastnosti svojega uporabniškega računa, lastnosti lahko spremenite samo posamično.',
     'bulk_update_help'	=> 'Ta obrazec omogoča, da posodobite več uporabnikov hkrati. Izpolnite le polja, ki jih morate spremeniti. Vsa polja, ki ostanejo prazna, ostanejo nespremenjena.',
@@ -19,7 +19,7 @@ return array(
     'ldap_config_text'  => 'Nastavitve konfiguracije LDAP-a lahko najdete v zavihku Admin> Nastavitve. Izbrana lokacija bo nastavljena za vse uvožene uporabnike.',
     'print_assigned'    => 'Natisni vse dodeljene',
     'software_user'     => 'Programska oprema izdana osebi :name',
-    'send_email_help'   => 'You must provide an email address for this user to send them credentials. Emailing credentials can only be done on user creation. Passwords are stored in a one-way hash and cannot be retrieved once saved.',
+    'send_email_help'   => 'Obvezno je potrebno navesti e-poštni račun za tega uporabnika kamor bo prejel poverilnice. Pošiljanje poverilnic je mogoče le ob ustvarjanju uporabnika. Gesla so shranjena eno-smerno šifrirano in jih je nemogoče pridobiti po shranjenju.',
     'view_user'         => 'Ogled uporabnika :name',
     'usercsv'           => 'Datoteko CSV',
     'two_factor_admin_optin_help' => 'Vaše trenutne nastavitve skrbnika omogočajo selektivno uveljavljanje dvotaktne pristnosti.  ',
diff --git a/resources/lang/sl/admin/users/message.php b/resources/lang/sl/admin/users/message.php
index 446c75442f..67666cdcbc 100644
--- a/resources/lang/sl/admin/users/message.php
+++ b/resources/lang/sl/admin/users/message.php
@@ -12,7 +12,8 @@ return array(
     'insufficient_permissions'  => 'Nezadostna dovoljenja.',
     'user_deleted_warning'      => 'Ta uporabnik je bil izbrisan. Tega uporabnika boste morali obnoviti, da ga uredite ali dodelite nova sredstva.',
     'ldap_not_configured'        => 'Integracija LDAP za to namestitev ni bila konfigurirana.',
-    'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
+    'password_resets_sent'      => 'Izbranim aktiviranim uporabnikom z veljavnim e-poštnim računom je bila poslana povezava za ponastavitev gesla.',
+    'password_reset_sent'       => 'Povezava za ponastavitev gesla je bila poslana na :email!',
 
 
     'success' => array(
diff --git a/resources/lang/sl/auth/general.php b/resources/lang/sl/auth/general.php
index 3877f0c5b3..60f3d10601 100644
--- a/resources/lang/sl/auth/general.php
+++ b/resources/lang/sl/auth/general.php
@@ -4,13 +4,14 @@ return [
     'send_password_link'	        => 'Pošlji povezavo za ponastavitev gesla',
     'email_reset_password'			=> 'Ponastavitev gesla e-pošte',
     'reset_password'			    => 'Ponastavi geslo',
-    'saml_login'                    => 'Login via SAML',
+    'saml_login'                    => 'Prijava preko SAML',
     'login'                         => 'Prijava',
     'login_prompt'                  => 'Prosimo, prijavite se',
     'forgot_password'               => 'Pozabil sem svoje geslo',
-    'ldap_reset_password'           => 'Please click here to reset your LDAP password',
+    'ldap_reset_password'           => 'Prosim klikni tu za ponastavitev svojega gesla LDAP',
     'remember_me'                   => 'Zapomni si me',
-    'username_help_top'                 => 'Enter your <strong>username</strong> to be emailed a password reset link.',
-    'username_help_bottom'          => 'Your username and email address <em>may</em> be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator. <br><br><strong>Usernames without an associated email address will not be emailed a password reset link.</strong> ',
+    'username_help_top'                 => 'Vnesi svoje <strong>uporabniško ime</strong> za pošiljanje povezave za ponastavitev gesla.',
+    'username_help_bottom'          => 'Uporabniško ime in geslo <em>sta lahko</em> enaki, vendar to ni nujno, odvisno od konfiguracije. Če se ne spomniš uporabniškega imena, kontaktiraj skrbnika.
+<br><br><strong>Uporabniškim imenom brez dodeljenega e-poštnega računa ne bo poslane povezave za ponastavitev gesla.</strong> ',
     ];
 
diff --git a/resources/lang/sl/auth/message.php b/resources/lang/sl/auth/message.php
index 9c86406a2b..a4b795fac1 100644
--- a/resources/lang/sl/auth/message.php
+++ b/resources/lang/sl/auth/message.php
@@ -7,13 +7,13 @@ return array(
     'account_not_activated'  => 'Ta uporabniški račun ni aktiviran.',
     'account_suspended'      => 'Ta uporabniški račun je onemogočen.',
     'account_banned'         => 'Ta uporabniški račun je onemogočen.',
-    'throttle'               => 'Too many failed login attempts. Please try again in :minutes minutes.',
+    'throttle'               => 'Preveč neuspešnih prijav. Prosim poskusi ponovno čez :minutes minut.',
 
     'two_factor' => array(
-        'already_enrolled'      => 'Your device is already enrolled.',
-        'success'               => 'You have successfully logged in.',
-        'code_required'         => 'Two-factor code is required.',
-        'invalid_code'          => 'Two-factor code is invalid.',
+        'already_enrolled'      => 'Tvoja naprava je že vpisana.',
+        'success'               => 'Uspešna prijava.',
+        'code_required'         => 'Dvo-faktorska koda je obvezna.',
+        'invalid_code'          => 'Dvo-faktorska koda je neveljavna.',
     ),
 
     'signin' => array(
@@ -22,8 +22,8 @@ return array(
     ),
 
     'logout' => array(
-        'error'   => 'There was a problem while trying to log you out, please try again.',
-        'success' => 'You have successfully logged out.',
+        'error'   => 'Prišlo je do napake ob odjavi, prosim poskusi ponovno.',
+        'success' => 'Odjava uspešna.',
     ),
 
     'signup' => array(
@@ -33,7 +33,7 @@ return array(
 
     'forgot-password' => array(
         'error'   => 'Med poskusom ponastavitve gesla za ponastavitev je prišlo do težave, poskusite znova.',
-        'success' => 'If that email address exists in our system, a password recovery email has been sent.',
+        'success' => 'V kolikor ta e-poštni naslov obstaja v sistemu je nanj bilo poslano sporočilo za ponastavitev gesla.',
     ),
 
     'forgot-password-confirm' => array(
diff --git a/resources/lang/sl/button.php b/resources/lang/sl/button.php
index 1e347fe8a1..7b3460abe8 100644
--- a/resources/lang/sl/button.php
+++ b/resources/lang/sl/button.php
@@ -12,6 +12,7 @@ return array(
     'submit'  	                => 'Pošlji',
     'upload'                    => 'Naloži',
 	'select_file'				=> 'Izberite datoteko...',
-    'select_files'				=> 'Select Files...',
-    'generate_labels'           => '{1} Generate Label|[2,*] Generate Labels',
+    'select_files'				=> 'Izberi datoteke...',
+    'generate_labels'           => '{1} Generiraj Oznako|[2,2] Generiraj Oznaki|[3,*] Generiraj Oznake',
+    'send_password_link'       => 'Pošlji povezavo za ponastavitev gesla',
 );
diff --git a/resources/lang/sl/general.php b/resources/lang/sl/general.php
index 79dd8fa7fb..62edfc817c 100644
--- a/resources/lang/sl/general.php
+++ b/resources/lang/sl/general.php
@@ -9,7 +9,7 @@
     'activity_report'		=> 'Poročilo o dejavnosti',
     'address'				=> 'Naslov',
     'admin'					=> 'Administrator',
-    'administrator'			=> 'Administrator',
+    'administrator'			=> 'Skrbnik',
     'add_seats'             => 'Dodani sedeži',
     'all_assets'			=> 'Vsa sredstva',
     'all'       			=> 'Vse',
@@ -30,7 +30,7 @@
     'bulkaudit'             => 'Množična revizija',
     'bulkaudit_status'      => 'Stanje revizije',
     'bulk_checkout'  		=> 'Množična izdaja',
-    'bystatus'              => 'by Status',
+    'bystatus'              => 'po Statusu',
     'cancel'  				=> 'Prekliči',
     'categories'			=> 'Kategorije',
     'category'				=> 'Kategorija',
@@ -40,9 +40,9 @@
     'checkin'  				=> 'Prevzem',
     'checkin_from'  		=> 'Prevzem od',
     'checkout'  			=> 'Izdaja',
-    'checkouts_count'       => 'Checkouts',
-    'checkins_count'        => 'Checkins',
-    'user_requests_count'   => 'Requests',
+    'checkouts_count'       => 'Izdaje',
+    'checkins_count'        => 'Sprejemi',
+    'user_requests_count'   => 'Zahteve',
     'city'  				=> 'Mesto',
 	'click_here'			=> 'Kliknite tukaj',
     'clear_selection'		=> 'Počisti izbor',
@@ -58,7 +58,7 @@
     'created'               => 'Ustvarjeno',
     'created_asset'			=> 'ustvarjeno sredstvo',
     'created_at' 			=> 'Ustvarjen ob',
-    'record_created' 		=> 'Record Created',
+    'record_created' 		=> 'Zapis ustvarjen',
     'updated_at' 			=> 'Posodobljeno ob',
     'currency'  			=> '$', // this is deprecated
     'current'  				=> 'Trenutni',
@@ -70,7 +70,7 @@
     'debug_warning'         => 'Opozorilo!',
     'debug_warning_text'    => 'Ta aplikacija deluje v načinu proizvodnje z omogočenim odpravljanjem napak. To lahko razkrije občutljive podatke, če je vaša aplikacija dostopna zunanjemu svetu. Onemogoči način za odpravljanje napak z nastavitvijo <code>APP_DEBUG</code> vrednost v vaši <code>.env</code> datoteki do <code>false</code>.',
     'delete'  				=> 'Izbriši',
-    'delete_confirm'  		=> 'Are you sure you wish to delete :item?',
+    'delete_confirm'  		=> 'Ali ste prepričani, da želite izbrisati :item?',
     'deleted'  				=> 'Izbrisano',
     'delete_seats'  		=> 'Izbrisana mesta',
     'departments'           => 'Oddelki',
@@ -79,7 +79,7 @@
     'depreciation_report'	=> 'Poročilo o amortizaciji',
     'details'               => 'Podrobnosti',
     'download'				=> 'Prenosi',
-    'download_all'				=> 'Download All',
+    'download_all'				=> 'Prenesi vse',
     'depreciation'			=> 'Amortizacija',
     'editprofile'  			=> 'Uredite svoj profil',
     'eol'					=> 'EOL',
@@ -89,18 +89,18 @@
     'filastname_format'			=> 'Prva črka imena priimek (jsmith@example.com)',
     'firstname_lastname_format'	=> 'Ime priimek (jane.smith@example.com)',
     'firstname_lastname_underscore_format' => 'Ime priimek (jane.smith@example.com)',
-    'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
+    'lastnamefirstinitial_format' =>  'Priimek s prvo črko imena (smithj@example.com)',
+    'firstintial_dot_lastname_format' => 'Prva črka imena s priimkom (j.smith@example.com)',
     'first'					=> 'Prvi',
-    'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
-    'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
-    'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
-    'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
+    'firstnamelastname'     => 'Ime s priimkom (janesmith@example.com)',
+    'lastname_firstinitial' => 'Priimek s prvo črko imena (smith_j@example.com)',
+    'firstinitial.lastname' => 'Prva črka imena s priimkom (j.smith@example.com)',
+    'firstnamelastinitial'  => 'Ime s prvo črko priimka (janes@example.com)',
     'first_name'			=> 'Ime',
     'first_name_format'		=> 'Ime (jane@example.com)',
     'files'                 => 'Datoteke',
     'file_name'				=> 'Datoteka',
-    'file_type'             => 'File Type',
+    'file_type'             => 'Tip datoteke',
     'file_uploads'			=> 'Nalaganje datotek',
     'generate'				=> 'Ustvari',
      'github_markdown'      => 'To polje omogoča <a href="https://help.github.com/articles/github-flavored-markdown/">Github z okusom markdowna</a>.',
@@ -112,17 +112,18 @@
     'image'                 => 'Slika',
     'image_delete'         	=> 'Izbriši sliko',
     'image_upload'         	=> 'Naloži sliko',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, and svg. Max upload size allowed is :size.',
+    'image_filetypes_help'  => 'Sprejemljivi tipi datotek so jpg, png, gif in svg. Dovoljena je največja velikost nalaganja :size.',
     'import'         	    => 'Uvozi',
-    'importing'         	=> 'Importing',
-    'importing_help'        => 'You can import assets, accessories, licenses, components, consumables, and users via CSV file. <br><br>The CSV should be comma-delimited and formatted with headers that match the ones in the <a href="https://snipe-it.readme.io/docs/importing" target="_new">sample CSVs in the documentation</a>.',
+    'importing'         	=> 'Uvažanje',
+    'importing_help'        => 'Mogoč je uvoz sredstev, dodatkov, licenc, komponent, potrošnega materiala in uporabnikov preko datotek CSV.
+<br><br>Datoteka CSV mora bi ločena z vejico in oblikovana z glavami, ki se ujemajo tistim v <a href="https://snipe-it.readme.io/docs/importing" target="_new">vzorčni datoteki CSV in dokumentaciji</a>.',
     'import-history'        => 'Uvoz zgodovine',
     'asset_maintenance'        => 'Vzdrževanje sredstev',
     'asset_maintenance_report' => 'Poročilo o vzdrževanju sredstev',
     'asset_maintenances'       => 'Sredstva vzdrževanja',
     'item'  				=> 'Element',
     'insufficient_permissions' => 'Nezadostna dovoljenja!',
-    'kits'       			=> 'Predefined Kits',
+    'kits'       			=> 'Vnaprej določeni kompleti',
     'language'				=> 'Jezik',
     'last'					=> 'Zadnji',
     'last_login'            => 'Zadnja prijava',
@@ -133,11 +134,11 @@
     'licenses'				=> 'Licence',
     'list_all'				=> 'Seznam vseh',
     'loading'				=> 'Nalaganje',
-    'lock_passwords'        => 'This field value will not be saved in a demo installation.',
+    'lock_passwords'        => 'Vrednost tega polja ne bo shranjena v demo namestitvi.',
     'feature_disabled'      => 'Ta funkcija je bila onemogočena za demo namestitev.',
     'location'              => 'Lokacija',
     'locations'				=> 'Lokacije',
-    'logo_size'				=> 'Square logos look best with Logo + Text. Logo maximum display size is 50px high x 500px wide.  ',
+    'logo_size'				=> 'Kvadratni logotipi izgledajo najboljše z Logo + Besedilo. Največja prikazana velikost logotipa je višina 50px x širina 500px.  ',
     'logout'				=> 'Odjava',
     'lookup_by_tag'     => 'Iskanje po oznaki sredstva',
     'maintenances'          => 'Vzdrževanje',
@@ -176,7 +177,7 @@
     'remove_company'        => 'Odstrani povezavo do podjetja',
     'reports'				=> 'Poročila',
     'restored'				=> 'obnovljena',
-    'restore'				=> 'Restore',
+    'restore'				=> 'Obnovi',
     'requested'				=> 'Zahtevano',
     'request_canceled'      => 'Zahteva je bila preklicana',
     'save'  				=> 'Shrani',
@@ -195,12 +196,12 @@
     'select_company'    	=> 'Izberite podjetje',
     'select_asset'    		=> 'Izberite Sredstvo',
     'settings'				=> 'Nastavitve',
-    'show_deleted'  		=> 'Show Deleted',
-    'show_current'  		=> 'Show Current',
+    'show_deleted'  		=> 'Pokaži izbrisane',
+    'show_current'  		=> 'Pokaži trenutne',
     'sign_in'				=> 'Prijava',
     'signature'             => 'Podpis',
-    'skin'       			=> 'Skin',
-    'slack_test_msg'        => 'Oh hai! Looks like your Slack integration with Snipe-IT is working!',
+    'skin'       			=> 'Preobleka',
+    'slack_test_msg'        => 'Ohh! Izgleda, da tvoja integracija Slack z Snipe-IT deluje!',
     'some_features_disabled' => 'DEMO MODE: nekatere funkcije so onemogočene za to namestitev.',
     'site_name'				=> 'Ime mesta',
     'state'  				=> 'Stanje',
@@ -221,14 +222,14 @@
     'unknown_admin'			=> 'Neznan skrbnik',
     'username_format'		=> 'Format za uporabniško ime',
     'update'                => 'Posodobi',
-    'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
+    'upload_filetypes_help'      => 'Dovoljeni tipi datotek so png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf in rar. Dovoljena je največja velikost nalaganja :size.',
     'uploaded'              => 'Naloženo',
     'user'					=> 'Uporabnik',
     'accepted'			    => 'sprejeto',
     'declined'			    => 'zavrnjeno',
     'unaccepted_asset_report' => 'Nesprejeta sredstva',
     'users'                 => 'Uporabniki',
-    'viewall'				=> 'View All',
+    'viewall'				=> 'Prikaži vse',
     'viewassets'  			=> 'Ogled dodeljenih sredstev',
     'website'               => 'Spletna stran',
     'welcome'				=> 'Dobrodošli, :ime',
@@ -237,14 +238,14 @@
     'zip'  					=> 'Pošta',
     'noimage'				=> 'Ni naložene slike ali slike ni mogoče najti.',
     'token_expired'         => 'Vaša seja je potekla. Prosimo, poizkusite ponovno.',
-    'login_enabled'         => 'Login Enabled',
-    'audit_due'             => 'Due for Audit',
-    'audit_overdue'         => 'Overdue for Audit',
-    'accept'                => 'Accept :asset',
-    'i_accept'              => 'I accept',
-    'i_decline'             => 'I decline',
-    'sign_tos'              => 'Sign below to indicate that you agree to the terms of service:',
-    'clear_signature'       => 'Clear Signature',
-    'show_help'             => 'Show help',
-    'hide_help'             => 'Hide help',
+    'login_enabled'         => 'Prijava omogočena',
+    'audit_due'             => 'Za revizijo',
+    'audit_overdue'         => 'Zamuda za revizijo',
+    'accept'                => 'Sprejmi :asset',
+    'i_accept'              => 'Sprejmem',
+    'i_decline'             => 'Zavračam',
+    'sign_tos'              => 'Podpiši spodaj za potrditev strinjanja s pogoji storitve:',
+    'clear_signature'       => 'Počisti podpise',
+    'show_help'             => 'Pokaži pomoč',
+    'hide_help'             => 'Skrij pomoč',
     ];
diff --git a/resources/lang/sl/help.php b/resources/lang/sl/help.php
index 4cb2354f89..ea1ea539a4 100644
--- a/resources/lang/sl/help.php
+++ b/resources/lang/sl/help.php
@@ -13,23 +13,23 @@ return array(
     |
     */
 
-    "more_info_title" => "More Info",
+    "more_info_title" => "Več informacij",
 
-    "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 is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.",
+    "audit_help" => "Če potrdite to polje, boste spremenili zapis sredstva, da bo odražal to novo lokacijo. Če je ne potrdite, boste lokacijo preprosto zabeležili v revizijskem dnevniku.<br><br>Upoštevajte, da če je to sredstvo izdano, to ne bo spremenilo lokacije osebe, sredstva ali lokacije, na katero je izdano.",
 
-    'assets' => 'Assets are items tracked by serial number or asset tag.  They tend to be higher value items where identifying a specific item matters.',
+    'assets' => 'Sredstva so stvari, ki so sledene po serijski številki ali oznaki sredstva. Ponavadi so stvari z višjo vrednostjo, pri katerih je opredelitev določenega predmeta pomembna.',
 
-    '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' => 'Kategorije vam pomagajo organizirati vaše predmete. Nekari primeri kategorij so &quot;Namizni računalniki&quot;, &quot;Prenosni računalniki&quot;, &quot;Mobilni telefoni&quot;, &quot;Tablice&quot;in tako naprej, vendar lahko kategorije uporabite kakor koli je smiselno za vas.',
 
-    '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' => 'Dodatki so vse stvari, ki se izdajajo uporabnikom, vendar niso vodeni kot osnovna sredstva (oziroma nimajo serijskih številk). Na primer, računalniške miške ali tipkovnice.',
 
-    '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'     => 'Podjetja je mogoče uporabiti kot polje za preprosto identifikacijo ali se jih lahko uporabi za omejitev prepoznavnosti sredstev, uporabnikov itd., če je v vaših skrbniških nastavitvah omogočena popolna podpora podjetja.',
 
-    'components'    => 'Components are items that are part of an asset, for example HDD, RAM, etc.',
+    'components'    => 'Komponente so stvari, ki so del sredstva. Na primer trdi disk, RAM, ipd.',
 
-    'consumables'   => 'Consumables are anything purchased that will be used up over time. For example, printer ink or copier paper.',
+    'consumables'   => 'Potrošni materiali so na primer karrtuše ali kopirni papir.',
 
-    'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.',
+    'depreciations' => 'Za amortizacijo sredstev lahko določite amortizacijo sredstev, ki temelji na enakomerni amortizaciji.',
 
 
 
diff --git a/resources/lang/sr-CS/admin/categories/general.php b/resources/lang/sr-CS/admin/categories/general.php
index 0ac263c0b4..d77190b3af 100644
--- a/resources/lang/sr-CS/admin/categories/general.php
+++ b/resources/lang/sr-CS/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'Ažuriraj Kategoriju',
     'use_default_eula'					=> 'Umesto toga upotrebite <a href="#" data-toggle="modal" data-target="#eulaModal">primarnu, default postavku EULA</a>.',
     'use_default_eula_disabled'			=> '<del>Upotrebi primarnu default EULA.</del> Nije postavljena primarna default EULA. Dodajte jednu u Postavke.',
+    'use_default_eula_column'			=> 'Use default EULA',
 
 );
diff --git a/resources/lang/sr-CS/admin/settings/general.php b/resources/lang/sr-CS/admin/settings/general.php
index 58aff19d16..d0a02c1275 100644
--- a/resources/lang/sr-CS/admin/settings/general.php
+++ b/resources/lang/sr-CS/admin/settings/general.php
@@ -61,9 +61,12 @@ return array(
     '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',
+    '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_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_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_server'               => 'LDAP Server',
diff --git a/resources/lang/sr-CS/admin/users/message.php b/resources/lang/sr-CS/admin/users/message.php
index e5e45b5d78..439e4073d1 100644
--- a/resources/lang/sr-CS/admin/users/message.php
+++ b/resources/lang/sr-CS/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
     'user_deleted_warning'      => 'Ovaj je korisnik izbrisan. Morate vratiti tog korisnika da biste ga uredili ili mu dodeliti novi resurs.',
     'ldap_not_configured'        => 'LDAP integracija nije konfigurisana za ovu instalaciju.',
     'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
+    'password_reset_sent'       => 'A password reset link has been sent to :email!',
 
 
     'success' => array(
diff --git a/resources/lang/sr-CS/button.php b/resources/lang/sr-CS/button.php
index d02af39694..ecebf48315 100644
--- a/resources/lang/sr-CS/button.php
+++ b/resources/lang/sr-CS/button.php
@@ -14,4 +14,5 @@ return array(
 	'select_file'				=> 'Odaberite datoteku...',
     'select_files'				=> 'Odaberite datoteke...',
     'generate_labels'           => '{1} Generate Label|[2,*] Generate Labels',
+    'send_password_link'       => 'Send Password Reset Link',
 );
diff --git a/resources/lang/sv-SE/admin/categories/general.php b/resources/lang/sv-SE/admin/categories/general.php
index f568b3db87..1dcde26972 100644
--- a/resources/lang/sv-SE/admin/categories/general.php
+++ b/resources/lang/sv-SE/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'Uppdatera kategori',
     'use_default_eula'					=> 'Använd <a href="#" data-toggle="modal" data-target="#eulaModal">standard-licensavtal, EULA</a> istället.',
     'use_default_eula_disabled'			=> '<del>Använd den primära licensavtalet, EULA:n, istället.</del> Inget primärt licensavtal, EULA, är satt. Vänligen lägg till en under Inställningar.',
+    'use_default_eula_column'			=> 'Use default EULA',
 
 );
diff --git a/resources/lang/sv-SE/admin/settings/general.php b/resources/lang/sv-SE/admin/settings/general.php
index bf09195502..27b9d585df 100644
--- a/resources/lang/sv-SE/admin/settings/general.php
+++ b/resources/lang/sv-SE/admin/settings/general.php
@@ -61,9 +61,12 @@ return array(
     'label_logo'                => 'Etikett logotyp',
     'label_logo_size'           => 'Fyrkantiga logotyper ser bäst ut - kommer att visas i det övre högra hörnet av varje tillgångsetikett. ',
     'laravel'                   => 'Laravel Version',
+    'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Certificate',
     'ldap_enabled'              => 'LDAP aktiverad',
     'ldap_integration'          => 'LDAP-integration',
     'ldap_settings'             => 'LDAP-inställningar',
+    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_login_test_help'      => 'Ange ett giltigt LDAP användarnamn och lösenord från basen DN du angav ovan för att testa om LDAP-inloggningen är korrekt konfigurerad. DU MÅSTE SPARA DINA UPPDATERADE LDAPINSTÄLLNINGAR FÖRST.',
     'ldap_login_sync_help'      => 'Detta testar bara att LDAP kan synkroniseras korrekt. Om din LDAP-autentiseringsfråga inte är korrekt kan användarna fortfarande inte logga in. DU MÅSTE SPARA DINA UPPDATERADE LDAPINSTÄLLNINGAR FÖRST.',
     'ldap_server'               => 'LDAP-server',
diff --git a/resources/lang/sv-SE/admin/users/message.php b/resources/lang/sv-SE/admin/users/message.php
index 6910b503ed..cd3b6f9c24 100644
--- a/resources/lang/sv-SE/admin/users/message.php
+++ b/resources/lang/sv-SE/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
     'user_deleted_warning'      => 'Den här användaren har raderats. Du måste återställa den här användaren för att redigera dem eller tilldela dem nya tillgångar.',
     'ldap_not_configured'        => 'LDAP-integrationen har inte konfigurerats för den här installationen.',
     'password_resets_sent'      => 'De valda användare som är aktiverade och har en giltig e-postadress har skickats en länk för att återställa lösenordet.',
+    'password_reset_sent'       => 'A password reset link has been sent to :email!',
 
 
     'success' => array(
diff --git a/resources/lang/sv-SE/button.php b/resources/lang/sv-SE/button.php
index 5da143d587..f978ed0381 100644
--- a/resources/lang/sv-SE/button.php
+++ b/resources/lang/sv-SE/button.php
@@ -14,4 +14,5 @@ return array(
 	'select_file'				=> 'Välj fil...',
     'select_files'				=> 'Välj filer...',
     'generate_labels'           => '{1} Generera etikett|[2,*]] Generera etiketter',
+    'send_password_link'       => 'Send Password Reset Link',
 );
diff --git a/resources/lang/ta/admin/categories/general.php b/resources/lang/ta/admin/categories/general.php
index fd7237afb9..ae26a98352 100644
--- a/resources/lang/ta/admin/categories/general.php
+++ b/resources/lang/ta/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'பகுப்பு புதுப்பிக்கவும்',
     'use_default_eula'					=> 'பதிலாக <a href="#" data-toggle="modal" data-target="#eulaModal">primary இயல்புநிலை EULA</a> ஐப் பயன்படுத்துக.',
     'use_default_eula_disabled'			=> '<del> முதன்மை இயல்புநிலை EULA ஐப் பயன்படுத்தவும் .</del> முதன்மை இயல்புநிலை EULA அமைக்கப்படவில்லை. அமைப்புகளில் ஒன்றைச் சேர்க்கவும்.',
+    'use_default_eula_column'			=> 'Use default EULA',
 
 );
diff --git a/resources/lang/ta/admin/settings/general.php b/resources/lang/ta/admin/settings/general.php
index 056ed7395d..67c836ed0f 100644
--- a/resources/lang/ta/admin/settings/general.php
+++ b/resources/lang/ta/admin/settings/general.php
@@ -61,9 +61,12 @@ return array(
     'label_logo'                => 'Label Logo',
     'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
     'laravel'                   => 'லாரேவல் பதிப்பு',
+    'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Certificate',
     'ldap_enabled'              => 'LDAP இயக்கப்பட்டது',
     'ldap_integration'          => 'LDAP ஒருங்கிணைப்பு',
     'ldap_settings'             => 'LDAP அமைப்புகள்',
+    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_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_server'               => 'LDAP சேவையகம்',
diff --git a/resources/lang/ta/admin/users/message.php b/resources/lang/ta/admin/users/message.php
index 597d86bc05..c53e6b35b7 100644
--- a/resources/lang/ta/admin/users/message.php
+++ b/resources/lang/ta/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
     'user_deleted_warning'      => 'இந்த பயனர் நீக்கப்பட்டது. நீங்கள் அவற்றை திருத்தவோ அல்லது புதிய சொத்துகளை ஒதுக்கவோ இந்த பயனரை மீட்டெடுக்க வேண்டும்.',
     'ldap_not_configured'        => 'இந்த நிறுவலுக்கு LDAP ஒருங்கிணைப்பு கட்டமைக்கப்படவில்லை.',
     'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
+    'password_reset_sent'       => 'A password reset link has been sent to :email!',
 
 
     'success' => array(
diff --git a/resources/lang/ta/button.php b/resources/lang/ta/button.php
index 5018a21ea1..e83502f9f5 100644
--- a/resources/lang/ta/button.php
+++ b/resources/lang/ta/button.php
@@ -14,4 +14,5 @@ return array(
 	'select_file'				=> 'கோப்பு தேர்ந்தெடு ...',
     'select_files'				=> 'Select Files...',
     'generate_labels'           => '{1} Generate Label|[2,*] Generate Labels',
+    'send_password_link'       => 'Send Password Reset Link',
 );
diff --git a/resources/lang/th/admin/categories/general.php b/resources/lang/th/admin/categories/general.php
index 317db41f00..2e2302a828 100644
--- a/resources/lang/th/admin/categories/general.php
+++ b/resources/lang/th/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'ปรับปรุงแก้ไขหมวดหมู่',
     'use_default_eula'					=> 'ใช้<a href="#" data-toggle="modal" data-target="#eulaModal">เป็นข้อกำหนดการใช้งานหลัก</a>แทน.',
     'use_default_eula_disabled'			=> '<del>ใช้ค่าเริ่มต้นข้อกำหนดการใช้งานหลักแทน</del> ค่าเริ่มต้นหลักของข้อกำหนดการใช้งานไม่ได้ถูกตั้งค่าไว้ กรุณาเพิ่มในการตั้งค่า',
+    'use_default_eula_column'			=> 'ใช้ค่าเริ่มต้น EULA',
 
 );
diff --git a/resources/lang/th/admin/depreciations/general.php b/resources/lang/th/admin/depreciations/general.php
index 7910e6e64e..610c19e336 100644
--- a/resources/lang/th/admin/depreciations/general.php
+++ b/resources/lang/th/admin/depreciations/general.php
@@ -8,6 +8,6 @@ return array(
     'depreciation_name'  					=> 'ชื่อค่าเสื่อมราคา',
     'number_of_months'  					=> 'จำนวนเดือน',
     'update'  					            => 'อัปเดตค่าเสื่อมราคา',
-    'depreciation_min'                      => 'Minimum Value after Depreciation'
+    'depreciation_min'                      => 'มูลค่าขั้นต่ำหลังค่าเสื่อมราคา'
 
 );
diff --git a/resources/lang/th/admin/hardware/general.php b/resources/lang/th/admin/hardware/general.php
index 91ac1e79e0..d5e2982584 100644
--- a/resources/lang/th/admin/hardware/general.php
+++ b/resources/lang/th/admin/hardware/general.php
@@ -10,7 +10,7 @@ return array(
     'checkout'  				=> 'ตรวจสอบสินทรัพย์',
     'clone'  					=> 'คัดลอกแบบสินทรัพย์',
     'deployable'  				=> 'สามารถใช้งานได้',
-    'deleted'  					=> 'This asset has been deleted.',
+    'deleted'  					=> 'สินทรัพย์นี้ถูกลบไปแล้ว',
     'edit'  					=> 'แก้ไขสินทรัพย์',
     'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
     'requestable'               => 'ร้องขอได้',
diff --git a/resources/lang/th/admin/locations/table.php b/resources/lang/th/admin/locations/table.php
index af3f45ebe7..4863d5b49f 100644
--- a/resources/lang/th/admin/locations/table.php
+++ b/resources/lang/th/admin/locations/table.php
@@ -11,8 +11,8 @@ return array(
     'country'                   => 'ประเทศ',
     'create'                    => 'สร้างสถานที่',
     'update'                    => 'อัพเดทสถานที่',
-    'print_assigned'            => 'Print Assigned',
-    'print_all_assigned'        => 'Print All Assigned',
+    'print_assigned'            => 'พิมพ์ งานที่มอบหมาย',
+    'print_all_assigned'        => 'พิมพ์ งานที่มอบหมาย ทั้งหมด',
     'name'                      => 'ชื่อสถานที่',
     'address'                   => 'ที่อยู่',
     'zip'                       => 'รหัสไปรษณีย์',
diff --git a/resources/lang/th/admin/settings/general.php b/resources/lang/th/admin/settings/general.php
index 6aed253c37..4fa7721890 100644
--- a/resources/lang/th/admin/settings/general.php
+++ b/resources/lang/th/admin/settings/general.php
@@ -61,9 +61,12 @@ return array(
     'label_logo'                => 'โลโก้ฉลาก',
     'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
     'laravel'                   => 'เวอร์ชั่น Laravel',
+    'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Certificate',
     'ldap_enabled'              => 'เปิดใช้งาน LDAP แล้ว',
     'ldap_integration'          => 'การรวม LDAP',
     'ldap_settings'             => 'การตั้งค่า LDAP',
+    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_login_test_help'      => 'ป้อนชื่อผู้ใช้และรหัสผ่าน LDAP ที่ถูกต้องจากฐานข้อมูล DN ที่คุณระบุไว้ด้านบนเพื่อทดสอบว่าการเข้าสู่ระบบ LDAP ของคุณมีการกำหนดค่าอย่างถูกต้องหรือไม่ คุณต้องบันทึกการตั้งค่า LDAP ที่อัปเดตก่อน',
     'ldap_login_sync_help'      => 'นี่เป็นการทดสอบว่า LDAP สามารถซิงค์ได้อย่างถูกต้อง หากแบบสอบถามการตรวจสอบสิทธิ์ LDAP ของคุณไม่ถูกต้องผู้ใช้อาจยังไม่สามารถเข้าสู่ระบบได้ คุณต้องบันทึกการตั้งค่า LDAP ที่อัปเดตก่อน',
     'ldap_server'               => 'เซิร์ฟเวอร์ LDAP',
diff --git a/resources/lang/th/admin/users/message.php b/resources/lang/th/admin/users/message.php
index c51b52eab5..f991d21c68 100644
--- a/resources/lang/th/admin/users/message.php
+++ b/resources/lang/th/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
     'user_deleted_warning'      => 'ผู้ใช้งานนี้ถูกลบแล้ว คุณจำเป็นต้องกู้คืนผู้ใช้งานก่อนแก้ไข',
     'ldap_not_configured'        => 'การทำงานร่วมกับ LDAP ไม่ได้ถูกตั้งค่าไว้สำหรับการติดตั้งนี้',
     'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
+    'password_reset_sent'       => 'A password reset link has been sent to :email!',
 
 
     'success' => array(
diff --git a/resources/lang/th/button.php b/resources/lang/th/button.php
index c3701367e4..1422f2d400 100644
--- a/resources/lang/th/button.php
+++ b/resources/lang/th/button.php
@@ -14,4 +14,5 @@ return array(
 	'select_file'				=> 'เลือกไฟล์...',
     'select_files'				=> 'เลือกไฟล์...',
     'generate_labels'           => '{1} Generate Label|[2,*] Generate Labels',
+    'send_password_link'       => 'ส่งลิงก์รีเซ็ตรหัสผ่าน',
 );
diff --git a/resources/lang/th/general.php b/resources/lang/th/general.php
index 72f4f2284e..9ed34cb998 100644
--- a/resources/lang/th/general.php
+++ b/resources/lang/th/general.php
@@ -241,10 +241,10 @@
     'audit_due'             => 'Due for Audit',
     'audit_overdue'         => 'Overdue for Audit',
     'accept'                => 'Accept :asset',
-    'i_accept'              => 'I accept',
-    'i_decline'             => 'I decline',
+    'i_accept'              => 'ยอมรับ',
+    'i_decline'             => 'ปฏิเสธ',
     'sign_tos'              => 'Sign below to indicate that you agree to the terms of service:',
-    'clear_signature'       => 'Clear Signature',
-    'show_help'             => 'Show help',
-    'hide_help'             => 'Hide help',
+    'clear_signature'       => 'ล้างลายเซ็น',
+    'show_help'             => 'เปิดการช่วยเหลือ',
+    'hide_help'             => 'ซ่อนการช่วยเหลือ',
     ];
diff --git a/resources/lang/th/mail.php b/resources/lang/th/mail.php
index f2037691f3..e9c6d58137 100644
--- a/resources/lang/th/mail.php
+++ b/resources/lang/th/mail.php
@@ -9,7 +9,7 @@ return array(
     'asset' => 'ทรัพย์สิน:',
     'asset_name' => 'ชื่อสินทรัพย์:',
     'asset_requested' => 'สินทรัพย์ที่ขอ',
-    'asset_tag' => 'Asset Tag',
+    'asset_tag' => 'แท็กทรัพย์สิน',
     'assigned_to' => 'ได้รับมอบหมายให้',
     'best_regards' => 'ด้วยความเคารพ,',
     'canceled' => 'ยกเลิก:',
@@ -18,12 +18,12 @@ return array(
     'click_to_confirm' => 'โปรดคลิกลิงก์ต่อไปนี้เพื่อยืนยันข้อมูล: บัญชีเว็บ:',
     'click_on_the_link_accessory' => 'โปรดคลิกที่ลิงค์ด้านล่างเพื่อยืนยันว่าคุณได้รับอุปกรณ์เสริมแล้ว',
     'click_on_the_link_asset' => 'โปรดคลิกลิงก์ที่ด้านล่างเพื่อยืนยันว่าคุณได้รับเนื้อหาแล้ว',
-    'Confirm_Asset_Checkin' => 'Asset checkin confirmation',
-    'Confirm_Accessory_Checkin' => 'Accessory checkin confirmation',
-    'Confirm_accessory_delivery' => 'Accessory delivery confirmation',
-    'Confirm_license_delivery' => 'License delivery confirmation',
-    'Confirm_asset_delivery' => 'Asset delivery confirmation',
-    'Confirm_consumable_delivery' => 'Consumable delivery confirmation',
+    'Confirm_Asset_Checkin' => 'ยืนยันการเช็คอินสินทรัพย์',
+    'Confirm_Accessory_Checkin' => 'ยืนยันการเช็คอินอุปกรณ์เสริม',
+    'Confirm_accessory_delivery' => 'ยืนยันการจัดส่งอุปกรณ์เสริม',
+    'Confirm_license_delivery' => 'การยืนยันการส่งมอบใบอนุญาต',
+    'Confirm_asset_delivery' => 'ยืนยันการจัดส่งสินทรัพย์',
+    'Confirm_consumable_delivery' => 'ยืนยันการจัดส่งวัสดุสิ้นเปลือง',
     'current_QTY' => 'QTY ปัจจุบัน',
     'Days' => 'วัน',
     'days' => 'วัน',
@@ -69,11 +69,11 @@ return array(
     'welcome' => 'ยินดีต้อนรับ: ชื่อ',
     'welcome_to' => 'ยินดีต้อนรับสู่: web!',
     'your_credentials' => 'ข้อมูลรับรอง Snipe-IT ของคุณ',
-    'Accessory_Checkin_Notification' => 'Accessory checked in',
-    'Asset_Checkin_Notification' => 'Asset checked in',
-    'License_Checkin_Notification' => 'License checked in',
+    'Accessory_Checkin_Notification' => 'เช็คอินอุปกรณ์เสริมแล้ว',
+    'Asset_Checkin_Notification' => 'เช็คอินสินทรัพย์แล้ว',
+    'License_Checkin_Notification' => 'เช็คอินใบอนุญาตแล้ว',
     'Expected_Checkin_Report' => 'Expected asset checkin report',
-    'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching',
+    'Expected_Checkin_Notification' => 'เตือนความจำ :: ใกล้หมดเวลาเช็คอิน',
     'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date',
-    'your_assets' => 'View Your Assets'
+    'your_assets' => 'ดูสินทรัพย์ที่มี'
 );
diff --git a/resources/lang/tl/admin/categories/general.php b/resources/lang/tl/admin/categories/general.php
index 7741b7da62..52e936d0b6 100644
--- a/resources/lang/tl/admin/categories/general.php
+++ b/resources/lang/tl/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'Update Category',
     'use_default_eula'					=> 'Use the <a href="#" data-toggle="modal" data-target="#eulaModal">primary default EULA</a> instead.',
     'use_default_eula_disabled'			=> '<del>Use the primary default EULA instead.</del> No primary default EULA is set. Please add one in Settings.',
+    'use_default_eula_column'			=> 'Use default EULA',
 
 );
diff --git a/resources/lang/tl/admin/settings/general.php b/resources/lang/tl/admin/settings/general.php
index 2c5c667db2..7ee77311e1 100644
--- a/resources/lang/tl/admin/settings/general.php
+++ b/resources/lang/tl/admin/settings/general.php
@@ -61,9 +61,12 @@ return array(
     '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',
+    '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_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_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_server'               => 'LDAP Server',
diff --git a/resources/lang/tl/admin/users/message.php b/resources/lang/tl/admin/users/message.php
index e517cd113b..85d016f04a 100644
--- a/resources/lang/tl/admin/users/message.php
+++ b/resources/lang/tl/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
     'user_deleted_warning'      => 'This user has been deleted. You will have to restore this user to edit them or assign them new assets.',
     'ldap_not_configured'        => 'LDAP integration has not been configured for this installation.',
     'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
+    'password_reset_sent'       => 'A password reset link has been sent to :email!',
 
 
     'success' => array(
@@ -38,10 +39,10 @@ return array(
         'asset_already_accepted' => 'This asset has already been accepted.',
         'accept_or_decline' => 'You must either accept or decline this asset.',
         'incorrect_user_accepted' => 'The asset you have attempted to accept was not checked out to you.',
-        'ldap_could_not_connect' => 'Could not connect to the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD <br>Error from LDAP Server:',
-        'ldap_could_not_bind' => 'Could not bind to the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD<br>Error from LDAP Server: ',
-        'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD and any Locations that may have additional OUs associated with them. <br>Error from LDAP Server:',
-        'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD and any Locations that may have additional OUs associated with them. <br>Error from LDAP Server:',
+        'ldap_could_not_connect' => 'Could not connect to the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
+        'ldap_could_not_bind' => 'Could not bind to the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server: ',
+        'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
+        'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
         'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ',
     ),
 
diff --git a/resources/lang/tl/button.php b/resources/lang/tl/button.php
index 2b97223250..27131e5fc6 100644
--- a/resources/lang/tl/button.php
+++ b/resources/lang/tl/button.php
@@ -14,4 +14,5 @@ return array(
 	'select_file'				=> 'Select File...',
     'select_files'				=> 'Select Files...',
     'generate_labels'           => '{1} Generate Label|[2,*] Generate Labels',
+    'send_password_link'       => 'Send Password Reset Link',
 );
diff --git a/resources/lang/tr/admin/categories/general.php b/resources/lang/tr/admin/categories/general.php
index efd705f2b2..5b4c548f7b 100644
--- a/resources/lang/tr/admin/categories/general.php
+++ b/resources/lang/tr/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'Kategori güncelle',
     'use_default_eula'					=> '<a href="#" data-toggle="modal" data-target="#eulaModal">\'yı Varsayılan Sözleşme</a> yerine kullan.',
     'use_default_eula_disabled'			=> '<del>Varsayılan sözleşmeyi kullan</del> Varsayılan sözleşme tanımlı değil. Lütfen Ayarlar\'dan ekleyiniz.',
+    'use_default_eula_column'			=> 'Varsayılan sözleşmeyi kullan',
 
 );
diff --git a/resources/lang/tr/admin/hardware/general.php b/resources/lang/tr/admin/hardware/general.php
index a0c19c4863..45869edd21 100644
--- a/resources/lang/tr/admin/hardware/general.php
+++ b/resources/lang/tr/admin/hardware/general.php
@@ -10,9 +10,9 @@ return array(
     'checkout'  				=> 'Ödenme Öğe',
     'clone'  					=> 'Demirbaşı Kopyala',
     'deployable'  				=> 'Dağıtılabilir',
-    'deleted'  					=> 'This asset has been deleted.',
+    'deleted'  					=> 'Bu varlık silindi.',
     'edit'  					=> 'Demirbaşı Düzenle',
-    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
+    'model_deleted'  			=> 'Bu varlık modeli silindi. Varlığı geri almak için modelini geri almalısınız.',
     'requestable'               => 'Talep edilebilir',
     'requested'				    => 'Talep edildi',
     'restore'  					=> 'Demirbaşı Geri Getir',
diff --git a/resources/lang/tr/admin/models/general.php b/resources/lang/tr/admin/models/general.php
index f0b5a27d1e..854d3fae0c 100644
--- a/resources/lang/tr/admin/models/general.php
+++ b/resources/lang/tr/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Varlık Modelleri Hakkında',
     'about_models_text'           => 'Varlık Modelleri, özdeş varlıkları gruplamanın bir yoludur. Örn: "Tiny M73", "Samsung A7", vb.',
-    'deleted'  					        => 'This model has been deleted.',
+    'deleted'  					        => 'Bu model silindi.',
     'bulk_delete'               => 'Varlık Modellerini Toplu Silme',
     'bulk_delete_help'               => 'Seçilen varlık modelleri silme işlemini onaylamak için aşağıdaki onay kutularını kullanın. Başka bir varlık modeli ile ilişkilendirilmiş olan varlık modelleri, başka bir varlık modeli ile ilişkilendirilmeden silinemez.',
     'bulk_delete_warn'          => ':model_count varlık modellerini silmek üzeresiniz.',
diff --git a/resources/lang/tr/admin/settings/general.php b/resources/lang/tr/admin/settings/general.php
index a0082a6206..c867506d70 100644
--- a/resources/lang/tr/admin/settings/general.php
+++ b/resources/lang/tr/admin/settings/general.php
@@ -14,8 +14,8 @@ return array(
     'alerts_enabled'			=> 'Uyarılar etkinleştirildi',
     'alert_interval'			=> 'Uyarı bitiş zamanı (gün içinde)',
     'alert_inv_threshold'		=> 'Son uyarı zamanı',
-    'allow_user_skin'           => 'Allow user skin',
-    'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' ,
+    'allow_user_skin'           => 'Kullanıcı temasına izin ver',
+    'allow_user_skin_help_text' => 'Bu kutuyu işaretlemek, kullanıcının UI kaplamasını farklı bir kaplamayla geçersiz kılmasına olanak tanır.' ,
     'asset_ids'					=> 'Demirbaş No',
     'audit_interval'            => 'Denetim Aralığı',
     'audit_interval_help'       => 'Varlıklarınızı düzenli olarak fiziksel olarak denetlemeniz gerekiyorsa, aralığı ay olarak girin.',
@@ -61,9 +61,12 @@ return array(
     'label_logo'                => 'Etiket Logosu',
     'label_logo_size'           => 'En güzel görünen logolar kare şeklindeki logolardır - her ürün etiketinin sağ üst bölümünde görüntülenir. ',
     'laravel'                   => 'Laravel Version',
+    'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Sertifikası',
     'ldap_enabled'              => 'LDAP etkin',
     'ldap_integration'          => 'LDAP Entegrasyonu',
     'ldap_settings'             => 'LDAP Ayarları',
+    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_login_test_help'      => 'LDAP ayarlarınızı doğru yapılandırıp yapılandırmadığınızı test etmek yukarıda belirttiğiniz DN için geçerli bir LDAP kullanıcı adı ve parolası giriniz. ÖNCE GÜNCEL LDAP AYARLARINI KAYDETMELİSİN.',
     'ldap_login_sync_help'      => 'Bu sadece LDAP\'ın doğru şekilde senkron edilebildiğini test eder. Eğer LDAP Kimlik Doğrulama sorgunuz doğru değilse, kullanıcılar giriş yapamayabilirler. ÖNCE GÜNCEL LDAP AYARLARINI KAYDETMELİSİN.',
     'ldap_server'               => 'LDAP Sunucu',
@@ -74,10 +77,10 @@ return array(
     'ldap_tls'                  => 'TLS Kullan',
     'ldap_tls_help'             => 'Yalnızca LDAP sunucunuzda STARTTLS çalıştırıyorsanız bu kutuyu işaretleyin. ',
     'ldap_uname'                => 'LDAP Bind Kullanıcı Adı',
-    'ldap_dept'                 => 'LDAP Department',
-    'ldap_phone'                => 'LDAP Telephone Number',
-    'ldap_jobtitle'             => 'LDAP Job Title',
-    'ldap_country'              => 'LDAP Country',
+    'ldap_dept'                 => 'LDAP Departman',
+    'ldap_phone'                => 'LDAP Telefon Numarası',
+    'ldap_jobtitle'             => 'LDAP İş Unvanı',
+    'ldap_country'              => 'LDAP Ülke',
     'ldap_pword'                => 'LDAP Bind Parola',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP filtre',
@@ -89,7 +92,7 @@ return array(
     'ldap_auth_filter_query'    => 'LDAP kimlik doğrulama sorgu',
     'ldap_version'              => 'LDAP versiyon',
     'ldap_active_flag'          => 'LDAP etkin bayrak',
-    'ldap_activated_flag_help'  => 'This flag is used to determine whether a user can login to Snipe-IT and does not affect the ability to check items in or out to them.',
+    'ldap_activated_flag_help'  => 'Bu bayrak, bir kullanıcının Snipe-IT\'de oturum açıp açamayacağını belirlemek için kullanılır ve öğelerin içeri veya dışarı teslim edilmesini etkilemez.',
     'ldap_emp_num'              => 'LDAP Çalışan Numarası',
     'ldap_email'                => 'LDAP Mail',
     'license'                  => 'Yazılım Lisansı',
@@ -105,7 +108,7 @@ return array(
     'login_remote_user_custom_logout_url_text' => 'Özel oturum kapatma URL',
     'login_remote_user_custom_logout_url_help' => 'Burada bir URL verilirse, kullanıcı Snipe-IT oturumunu kapattıktan sonra kullanıcılar bu URL\'ye yönlendirilir. Bu, Kimlik Doğrulama sağlayıcınızın kullanıcı oturumlarını doğru bir şekilde kapatmak için kullanışlıdır.',
     'login_remote_user_header_name_text' => 'Özelleştirilmiş kullanıcı adı başlığı',
-    'login_remote_user_header_name_help' => 'Use the specified header instead of REMOTE_USER',
+    'login_remote_user_header_name_help' => 'REMOTE_USER yerine belirtilen başlığı kullanın',
     'logo'                    	=> 'Logo',
     'logo_print_assets'         => 'Yazdırmada Kullan',
     'logo_print_assets_help'    => 'Yazdırılabilir varlık listelerinde marka kullan ',
@@ -120,37 +123,37 @@ return array(
     'pwd_secure_complexity'     => 'Şifre Karmaşıklığı',
     'pwd_secure_complexity_help' => 'Hangi şifre karmaşıklığı kurallarını uygulamak istediğinizi seçin.',
     'pwd_secure_min'            => 'Şifre minimum karakterleri',
-    'pwd_secure_min_help'       => 'Minimum permitted value is 8',
+    'pwd_secure_min_help'       => 'En kısa izin verilen değer 8',
     'pwd_secure_uncommon'       => 'Ortak şifreleri önle',
     'pwd_secure_uncommon_help'  => 'Bu, kullanıcıların ihlallerde bildirilen ilk 10.000 şifrelerden ortak şifreler kullanmasına izin vermez.',
     'qr_help'                   => 'Bu işlemi gerçekleştirmek için önce QR Kodlarını etkinleştirin',
     'qr_text'                   => 'QR Kodu Yazısı',
-    'saml_enabled'              => 'SAML enabled',
-    'saml_integration'          => 'SAML Integration',
-    'saml_sp_entityid'          => 'Entity ID',
-    'saml_sp_acs_url'           => 'Assertion Consumer Service (ACS) URL',
-    'saml_sp_sls_url'           => 'Single Logout Service (SLS) URL',
-    'saml_sp_x509cert'          => 'Public Certificate',
-    'saml_sp_metadata_url'      => 'Metadata URL',
-    'saml_idp_metadata'         => 'SAML IdP Metadata',
-    'saml_idp_metadata_help'    => 'You can specify the IdP metadata using a URL or XML file.',
-    'saml_attr_mapping_username' => 'Attribute Mapping - Username',
-    'saml_attr_mapping_username_help' => 'NameID will be used if attribute mapping is unspecified or invalid.',
-    'saml_forcelogin_label'     => 'SAML Force Login',
-    'saml_forcelogin'           => 'Make SAML the primary login',
-    'saml_forcelogin_help'      => 'You can use \'/login?nosaml\' to get to the normal login page.',
-    'saml_slo_label'            => 'SAML Single Log Out',
-    'saml_slo'                  => 'Send a LogoutRequest to IdP on Logout',
-    'saml_slo_help'             => 'This will cause the user to be first redirected to the IdP on logout. Leave unchecked if the IdP doesn\'t correctly support SP-initiated SAML SLO.',
-    'saml_custom_settings'      => 'SAML Custom Settings',
-    'saml_custom_settings_help' => 'You can specify additional settings to the onelogin/php-saml library. Use at your own risk.',
+    'saml_enabled'              => 'SAML etkinleştirildi',
+    'saml_integration'          => 'SAML Entegrasyonu',
+    'saml_sp_entityid'          => 'Varlık Kimliği',
+    'saml_sp_acs_url'           => 'Onay Tüketici Hizmeti (OTH) URL\'si',
+    'saml_sp_sls_url'           => 'Tek Oturum Kapatma Hizmeti (TOKH) URL\'si',
+    'saml_sp_x509cert'          => 'Genel Sertifika',
+    'saml_sp_metadata_url'      => 'Meta veri URL\'si',
+    'saml_idp_metadata'         => 'SAML IdP Meta Verileri',
+    'saml_idp_metadata_help'    => 'Bir URL veya XML dosyası kullanarak IDP meta verilerini belirtebilirsiniz.',
+    'saml_attr_mapping_username' => 'Öznitelik Eşleştirme - Kullanıcı adı',
+    'saml_attr_mapping_username_help' => 'Öznitelik eşlemesi belirtilmemiş veya geçersizse NameID kullanılacaktır.',
+    'saml_forcelogin_label'     => 'SAML Zorla Girişi',
+    'saml_forcelogin'           => 'SAML\'yi birincil giriş yapın',
+    'saml_forcelogin_help'      => 'Normal giriş sayfasına gitmek için \'/login?nosaml\' kullanabilirsiniz.',
+    'saml_slo_label'            => 'SAML Tek Oturum Kapatma',
+    'saml_slo'                  => 'Oturumu Kapatırken IdP\'ye bir Oturum Kapatma İsteği Gönderin',
+    'saml_slo_help'             => 'Bu, kullanıcının oturum kapatıldığında ilk olarak IdP\'ye yönlendirilmesine neden olur. IdP, SP tarafından başlatılan SAML SLO\'yu doğru şekilde desteklemiyorsa işaretlemeden bırakın.',
+    'saml_custom_settings'      => 'SAML Özel Ayarları',
+    'saml_custom_settings_help' => 'Onelogin/php-saml kitaplığına ek ayarlar belirleyebilirsiniz. Kendi sorumluluğunuzda kullanın.',
     'setting'                   => 'Ayar',
     'settings'                  => 'Ayarlar',
     'show_alerts_in_menu'       => 'Alarmları üst menüde göster',
     'show_archived_in_list'     => 'Arşivlenmiş Varlıklar',
     'show_archived_in_list_text'     => 'Arşivlenmiş varlıkları "Tüm Varlıklar" listesinde göster',
-    'show_assigned_assets'      => 'Show assets assigned to assets',
-    'show_assigned_assets_help' => 'Display assets which were assigned to the other assets in View User -> Assets, View User -> Info -> Print All Assigned and in Account -> View Assigned Assets.',
+    'show_assigned_assets'      => 'Varlıklara atanan varlıkları göster',
+    'show_assigned_assets_help' => 'Kullanıcıyı Görüntüle -> Varlıklar, Kullanıcıyı Görüntüle -> Bilgi -> Tüm Atananları Yazdır ve Hesapta -> Atanan Varlıkları Görüntüle\'de diğer varlıklara atanan varlıkları görüntüleyin.',
     'show_images_in_email'     => 'E-postalarda resimleri göster',
     'show_images_in_email_help'   => 'Snipe-IT kurulumunuz bir VPN\'in ya da kapalı bir ağın arkasındaysa ve ağ dışındaki kullanıcılar bu kurulumda sunulan görüntüleri e-postalarına yükleyemezse bu kutunun işaretini kaldırın.',
     'site_name'                 => 'Site Adı',
@@ -158,7 +161,7 @@ return array(
     'slack_channel'             => 'Slack Kanalı',
     'slack_endpoint'            => 'Slack Endpoint',
     'slack_integration'         => 'Slack Ayarları',
-    'slack_integration_help'    => 'Slack integration is optional, however the endpoint and channel are required if you wish to use it. To configure Slack integration, you must first <a href=":slack_link" target="_new" rel="noopener">create an incoming webhook</a> on your Slack account. Click on the <strong>Test Slack Integration</strong> button to confirm your settings are correct before saving. ',
+    'slack_integration_help'    => 'Slack entegrasyonu isteğe bağlıdır, ancak kullanmak istiyorsanız uç nokta ve kanal gereklidir. Slack entegrasyonunu yapılandırmak için önce Slack hesabınızda <a href=":slack_link" target="_new" rel="noopener">gelen bir web kancası oluşturmanız</a> gerekir. Kaydetmeden önce ayarlarınızın doğru olduğunu onaylamak için <strong>Slack Entegrasyonunu Test Et</strong> düğmesini tıklayın. ',
     'slack_integration_help_button'    => 'Slack bilgilerinizi kaydettikten sonra bir test düğmesi görünecektir.',
     'slack_test_help'           => 'Slack entegrasyonunuzun doğru yapılandırılıp yapılandırılmadığını test edin. İLK OLARAK GÜNCELLENMİŞ SLACK AYARLARINIZI KAYDETMELİSİNİZ.',
     'snipe_version'  			=> 'Snipe-IT version',
@@ -170,7 +173,7 @@ return array(
     'update'                    => 'Ayarları Güncelle',
     'value'                     => 'Değer',
     'brand'                     => 'Marka',
-    'web_brand'                 => 'Web Branding Type',
+    'web_brand'                 => 'Web Markalama Türü',
     'about_settings_title'      => 'Ayarlar Hakkında',
     'about_settings_text'       => 'Bu ayarlar, yüklemenizin belirli yönlerini özelleştirmenizi sağlar.',
     'labels_per_page'           => 'Sayfa Başına Etiketler',
@@ -225,5 +228,5 @@ return array(
     'unique_serial'                => 'Eşsiz seri numaraları',
     'unique_serial_help_text'                => 'Bu kutunun işaretlenmesi, varlık serileri üzerinde benzersiz bir kısıtlama uygular',
     'zerofill_count'        => 'Varlık etiketlerinin uzunluğu, boşluksuz olmak üzere',
-    '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.',
+    'username_format_help'   => 'Bu ayar, yalnızca bir kullanıcı adı sağlanmadıysa ve sizin için bir kullanıcı adı oluşturmamız gerekiyorsa içe aktarma işlemi tarafından kullanılacaktır.',
 );
diff --git a/resources/lang/tr/admin/users/general.php b/resources/lang/tr/admin/users/general.php
index 34ea6a80dc..0b4d510a8c 100644
--- a/resources/lang/tr/admin/users/general.php
+++ b/resources/lang/tr/admin/users/general.php
@@ -19,7 +19,7 @@ return array(
     'ldap_config_text'  => 'LDAP yapılandırma ayarları Yönetici> Ayarlar\'da bulunabilir. Seçilen yer (isteğe bağlı), tüm içe aktarılan kullanıcılar için ayarlanır.',
     'print_assigned'    => 'Atananların Tümünü Yazdır',
     'software_user'     => 'Yazılıma :name için çıkış yapılmış',
-    'send_email_help'   => 'You must provide an email address for this user to send them credentials. Emailing credentials can only be done on user creation. Passwords are stored in a one-way hash and cannot be retrieved once saved.',
+    'send_email_help'   => 'Bu kullanıcıya kimlik bilgilerini gönderebilmesi için bir e-posta adresi sağlamalısınız. E-posta kimlik bilgileri yalnızca kullanıcı oluşturulurken yapılabilir. Parolalar tek yönlü bir karmada saklanır ve bir kez kaydedildikten sonra geri alınamaz.',
     'view_user'         => 'Kullanıcıyı Görüntüle :name',
     'usercsv'           => 'CSV Dosyası',
     'two_factor_admin_optin_help' => 'Mevcut yönetici ayarlarınız, iki aşamalı kimlik doğrulamasının seçici olarak uygulanmasına izin verir.  ',
diff --git a/resources/lang/tr/admin/users/message.php b/resources/lang/tr/admin/users/message.php
index c0cd4558a0..a5efe62824 100644
--- a/resources/lang/tr/admin/users/message.php
+++ b/resources/lang/tr/admin/users/message.php
@@ -12,7 +12,8 @@ return array(
     'insufficient_permissions'  => 'Yetersiz izinler.',
     'user_deleted_warning'      => 'Bu kullanıcı silindi. Bunları düzenlemek veya onları yeni varlıklar atamak için bu kullanıcı geri yüklemek gerekir.',
     'ldap_not_configured'        => 'LDAP entegrasyonu bu yükleme için yapılandırılmamış.',
-    'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
+    'password_resets_sent'      => 'Etkinleştirilmiş ve geçerli bir e-posta adresine sahip seçilen kullanıcılara şifre sıfırlama bağlantısı gönderildi.',
+    'password_reset_sent'       => ':email! adresine bir şifre sıfırlama bağlantısı gönderildi!',
 
 
     'success' => array(
diff --git a/resources/lang/tr/auth/general.php b/resources/lang/tr/auth/general.php
index 7d8250176d..f8c5d76168 100644
--- a/resources/lang/tr/auth/general.php
+++ b/resources/lang/tr/auth/general.php
@@ -4,13 +4,13 @@ return [
     'send_password_link'	        => 'Parola sıfırlama bağlantısını gönder',
     'email_reset_password'			=> 'Email şifre sıfırlama',
     'reset_password'			    => 'Şifre sıfırla',
-    'saml_login'                    => 'Login via SAML',
+    'saml_login'                    => 'SAML ile giriş yapın',
     'login'                         => 'Giriş',
     'login_prompt'                  => 'Lütfen giriş yapın',
     'forgot_password'               => 'Şifremi unuttum',
-    'ldap_reset_password'           => 'Please click here to reset your LDAP password',
+    'ldap_reset_password'           => 'LDAP şifrenizi sıfırlamak için lütfen buraya tıklayın',
     'remember_me'                   => 'Beni hatırla',
     'username_help_top'                 => 'E-posta ile bir şifre sıfırlama bağlantısı almak için <strong> kullanıcı adınızı </strong> girin.',
-    'username_help_bottom'          => 'Your username and email address <em>may</em> be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator. <br><br><strong>Usernames without an associated email address will not be emailed a password reset link.</strong> ',
+    'username_help_bottom'          => 'Kullanıcı adınız ve e-posta adresiniz <em> olabilir</em> aynı olabilir, ancak yapılandırmanıza bağlı olarak olmayabilir. Kullanıcı adınızı hatırlayamıyorsanız, yöneticinize başvurun. <br><br><strong>İlişkili bir e-posta adresi olmayan kullanıcı adlarına e-postayla şifre sıfırlama bağlantısı gönderilmeyecektir.</strong> ',
     ];
 
diff --git a/resources/lang/tr/auth/message.php b/resources/lang/tr/auth/message.php
index b6f62f6353..0862bbb3d2 100644
--- a/resources/lang/tr/auth/message.php
+++ b/resources/lang/tr/auth/message.php
@@ -7,13 +7,13 @@ return array(
     'account_not_activated'  => 'Hesabınız aktif edilmemiş.',
     'account_suspended'      => 'Hesabınız durdurulmuş.',
     'account_banned'         => 'Hesabınız engellenmiş.',
-    'throttle'               => 'Too many failed login attempts. Please try again in :minutes minutes.',
+    'throttle'               => 'Çok fazla başarısız oturum açma girişimi. Lütfen :dakika dakika sonra tekrar deneyin.',
 
     'two_factor' => array(
-        'already_enrolled'      => 'Your device is already enrolled.',
-        'success'               => 'You have successfully logged in.',
-        'code_required'         => 'Two-factor code is required.',
-        'invalid_code'          => 'Two-factor code is invalid.',
+        'already_enrolled'      => 'Cihazınız zaten kayıtlı.',
+        'success'               => 'Başarıyla giriş yaptınız.',
+        'code_required'         => 'İki faktörlü kod gereklidir.',
+        'invalid_code'          => 'İki faktörlü kod geçersiz.',
     ),
 
     'signin' => array(
@@ -22,8 +22,8 @@ return array(
     ),
 
     'logout' => array(
-        'error'   => 'There was a problem while trying to log you out, please try again.',
-        'success' => 'You have successfully logged out.',
+        'error'   => 'Oturumunuzu kapatmaya çalışırken bir sorun oluştu, lütfen tekrar deneyin.',
+        'success' => 'Başarıyla çıkış yaptınız.',
     ),
 
     'signup' => array(
@@ -33,7 +33,7 @@ return array(
 
     'forgot-password' => array(
         'error'   => 'Şifre resetleme kodu oluştururken bir hata oluştu, lütfen tekrar deneyiniz.',
-        'success' => 'If that email address exists in our system, a password recovery email has been sent.',
+        'success' => 'Bu e-posta adresi sistemimizde mevcutsa, bir şifre kurtarma e-postası gönderilmiştir.',
     ),
 
     'forgot-password-confirm' => array(
diff --git a/resources/lang/tr/button.php b/resources/lang/tr/button.php
index 68fd7509e3..2a3e5b2a54 100644
--- a/resources/lang/tr/button.php
+++ b/resources/lang/tr/button.php
@@ -13,5 +13,6 @@ return array(
     'upload'                    => 'Yükle',
 	'select_file'				=> 'Dosya Seç...',
     'select_files'				=> 'Dosyaları seçin...',
-    'generate_labels'           => '{1} Generate Label|[2,*] Generate Labels',
+    'generate_labels'           => '{1} Etiket Oluştur|[2,*] Etiket Oluştur',
+    'send_password_link'       => 'Şifre Sıfırlama Bağlantısını Gönder',
 );
diff --git a/resources/lang/tr/general.php b/resources/lang/tr/general.php
index 4750b99c00..e9362d2644 100644
--- a/resources/lang/tr/general.php
+++ b/resources/lang/tr/general.php
@@ -179,7 +179,7 @@ Context | Request Context
     'remove_company'        => 'Firma bağlantısını sil',
     'reports'				=> 'Raporlar',
     'restored'				=> 'geri yüklendi',
-    'restore'				=> 'Restore',
+    'restore'				=> 'Geri Yükle',
     'requested'				=> 'Talep Edilen',
     'request_canceled'      => 'Talep iptal edildi',
     'save'  				=> 'Kaydet',
diff --git a/resources/lang/tr/mail.php b/resources/lang/tr/mail.php
index 8b3cf30e61..0f88ffa293 100644
--- a/resources/lang/tr/mail.php
+++ b/resources/lang/tr/mail.php
@@ -19,11 +19,11 @@ return array(
     'click_on_the_link_accessory' => 'Lütfen aşağıdaki bağlantıya tıklayarak aksesuar talebinizi onaylayın.',
     'click_on_the_link_asset' => 'Lütfen aşağıdaki bağlantıya tıklayarak varlık talebinizi onaylayın.',
     'Confirm_Asset_Checkin' => 'Varlık Kabul Onayı',
-    'Confirm_Accessory_Checkin' => 'Accessory checkin confirmation',
-    'Confirm_accessory_delivery' => 'Accessory delivery confirmation',
-    'Confirm_license_delivery' => 'License delivery confirmation',
+    'Confirm_Accessory_Checkin' => 'Aksesuar giriş onayı',
+    'Confirm_accessory_delivery' => 'Aksesuar teslimat onayı',
+    'Confirm_license_delivery' => 'Lisans teslim onayı',
     'Confirm_asset_delivery' => 'Varlık Kabul Onayı',
-    'Confirm_consumable_delivery' => 'Consumable delivery confirmation',
+    'Confirm_consumable_delivery' => 'Sarf malzemesi teslimat onayı',
     'current_QTY' => 'Mevcut miktar',
     'Days' => 'Günler',
     'days' => 'Günler',
@@ -64,7 +64,7 @@ return array(
     'license_expiring_alert' => 'Şu var: bir sonraki günlerde süren lisans sayımı: eşik günleri. | Şunlar var: bir sonraki günlerde süren sayım lisansları: eşik günleri.',
     'to_reset' => 'Şifre sıfırlamak için :web password, formu doldurun:',
     'type' => 'Tür',
-    'upcoming-audits' => 'There is :count asset that is coming up for audit within :threshold days.|There are :count assets that are coming up for audit within :threshold days.',
+    'upcoming-audits' => ':count gün içinde denetime yaklaşan :count varlık var.|Eşik gün içinde denetime yaklaşan :count varlık var.',
     'user' => 'Kullanıcı',
     'username' => 'Kullanıcı Adı',
     'welcome' => 'Hoşgeldiniz, :name',
@@ -73,8 +73,8 @@ return array(
     'Accessory_Checkin_Notification' => 'Aksesuar Zimmet Kabul',
     'Asset_Checkin_Notification' => 'Varlık Zimmet Kabul',
     'License_Checkin_Notification' => 'Lisans Zimmet Kabul',
-    'Expected_Checkin_Report' => 'Expected asset checkin report',
+    'Expected_Checkin_Report' => 'Beklenen varlık iade raporu',
     'Expected_Checkin_Notification' => 'Hatırlatma ::name Son seçim zamanı yaklaşıyor',
-    'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date',
+    'Expected_Checkin_Date' => 'Size teslim edilen bir varlık :date tarihinde tekrar teslim edilecektir',
     'your_assets' => 'Varlıkları Görüntüleme'
 );
diff --git a/resources/lang/tr/validation.php b/resources/lang/tr/validation.php
index fe667763d3..a1dbf8b9e9 100644
--- a/resources/lang/tr/validation.php
+++ b/resources/lang/tr/validation.php
@@ -89,7 +89,7 @@ return array(
     'uploaded'             => ': Özniteliği yüklenemedi.',
     'url'                  => ':attribute biçim geçersiz.',
     "unique_undeleted"     => ":attribute benzersiz olmalıdır.",
-    "non_circular"         => "The :attribute must not create a circular reference.",
+    "non_circular"         => ":attribute döngüsel bir başvuru oluşturmamalıdır.",
 
     /*
     |--------------------------------------------------------------------------
diff --git a/resources/lang/uk/admin/categories/general.php b/resources/lang/uk/admin/categories/general.php
index f3f393baa2..47dc9e01f2 100644
--- a/resources/lang/uk/admin/categories/general.php
+++ b/resources/lang/uk/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'Оновити категорію',
     'use_default_eula'					=> 'Використовувати <a href="#" data-toggle="modal" data-target="#eulaModal">основну EULA</a>.',
     'use_default_eula_disabled'			=> '<del>Use the primary default EULA instead.</del> No primary default EULA is set. Please add one in Settings.',
+    'use_default_eula_column'			=> 'Use default EULA',
 
 );
diff --git a/resources/lang/uk/admin/settings/general.php b/resources/lang/uk/admin/settings/general.php
index dcf07b14f9..609993ccfe 100644
--- a/resources/lang/uk/admin/settings/general.php
+++ b/resources/lang/uk/admin/settings/general.php
@@ -61,9 +61,12 @@ return array(
     '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',
+    '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_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_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_server'               => 'LDAP Server',
diff --git a/resources/lang/uk/admin/users/message.php b/resources/lang/uk/admin/users/message.php
index 678f8a9a75..4e89e13e13 100644
--- a/resources/lang/uk/admin/users/message.php
+++ b/resources/lang/uk/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
     'user_deleted_warning'      => 'This user has been deleted. You will have to restore this user to edit them or assign them new assets.',
     'ldap_not_configured'        => 'LDAP integration has not been configured for this installation.',
     'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
+    'password_reset_sent'       => 'A password reset link has been sent to :email!',
 
 
     'success' => array(
@@ -38,10 +39,10 @@ return array(
         'asset_already_accepted' => 'This asset has already been accepted.',
         'accept_or_decline' => 'You must either accept or decline this asset.',
         'incorrect_user_accepted' => 'The asset you have attempted to accept was not checked out to you.',
-        'ldap_could_not_connect' => 'Could not connect to the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD <br>Error from LDAP Server:',
-        'ldap_could_not_bind' => 'Could not bind to the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD<br>Error from LDAP Server: ',
-        'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD and any Locations that may have additional OUs associated with them. <br>Error from LDAP Server:',
-        'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD and any Locations that may have additional OUs associated with them. <br>Error from LDAP Server:',
+        'ldap_could_not_connect' => 'Could not connect to the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
+        'ldap_could_not_bind' => 'Could not bind to the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server: ',
+        'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
+        'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
         'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ',
     ),
 
diff --git a/resources/lang/uk/button.php b/resources/lang/uk/button.php
index 505f63e512..900623664f 100644
--- a/resources/lang/uk/button.php
+++ b/resources/lang/uk/button.php
@@ -14,4 +14,5 @@ return array(
 	'select_file'				=> 'Обрати файл...',
     'select_files'				=> 'Select Files...',
     'generate_labels'           => '{1} Generate Label|[2,*] Generate Labels',
+    'send_password_link'       => 'Send Password Reset Link',
 );
diff --git a/resources/lang/ur-PK/admin/categories/general.php b/resources/lang/ur-PK/admin/categories/general.php
index 7741b7da62..52e936d0b6 100644
--- a/resources/lang/ur-PK/admin/categories/general.php
+++ b/resources/lang/ur-PK/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'Update Category',
     'use_default_eula'					=> 'Use the <a href="#" data-toggle="modal" data-target="#eulaModal">primary default EULA</a> instead.',
     'use_default_eula_disabled'			=> '<del>Use the primary default EULA instead.</del> No primary default EULA is set. Please add one in Settings.',
+    'use_default_eula_column'			=> 'Use default EULA',
 
 );
diff --git a/resources/lang/ur-PK/admin/settings/general.php b/resources/lang/ur-PK/admin/settings/general.php
index e15162210e..fb268f39f0 100644
--- a/resources/lang/ur-PK/admin/settings/general.php
+++ b/resources/lang/ur-PK/admin/settings/general.php
@@ -61,9 +61,12 @@ return array(
     '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',
+    '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_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_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_server'               => 'LDAP Server',
diff --git a/resources/lang/ur-PK/admin/users/message.php b/resources/lang/ur-PK/admin/users/message.php
index e517cd113b..85d016f04a 100644
--- a/resources/lang/ur-PK/admin/users/message.php
+++ b/resources/lang/ur-PK/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
     'user_deleted_warning'      => 'This user has been deleted. You will have to restore this user to edit them or assign them new assets.',
     'ldap_not_configured'        => 'LDAP integration has not been configured for this installation.',
     'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
+    'password_reset_sent'       => 'A password reset link has been sent to :email!',
 
 
     'success' => array(
@@ -38,10 +39,10 @@ return array(
         'asset_already_accepted' => 'This asset has already been accepted.',
         'accept_or_decline' => 'You must either accept or decline this asset.',
         'incorrect_user_accepted' => 'The asset you have attempted to accept was not checked out to you.',
-        'ldap_could_not_connect' => 'Could not connect to the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD <br>Error from LDAP Server:',
-        'ldap_could_not_bind' => 'Could not bind to the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD<br>Error from LDAP Server: ',
-        'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD and any Locations that may have additional OUs associated with them. <br>Error from LDAP Server:',
-        'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD and any Locations that may have additional OUs associated with them. <br>Error from LDAP Server:',
+        'ldap_could_not_connect' => 'Could not connect to the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
+        'ldap_could_not_bind' => 'Could not bind to the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server: ',
+        'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
+        'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
         'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ',
     ),
 
diff --git a/resources/lang/ur-PK/button.php b/resources/lang/ur-PK/button.php
index 2b97223250..27131e5fc6 100644
--- a/resources/lang/ur-PK/button.php
+++ b/resources/lang/ur-PK/button.php
@@ -14,4 +14,5 @@ return array(
 	'select_file'				=> 'Select File...',
     'select_files'				=> 'Select Files...',
     'generate_labels'           => '{1} Generate Label|[2,*] Generate Labels',
+    'send_password_link'       => 'Send Password Reset Link',
 );
diff --git a/resources/lang/vi/admin/categories/general.php b/resources/lang/vi/admin/categories/general.php
index 418faa53b3..6d988cee46 100644
--- a/resources/lang/vi/admin/categories/general.php
+++ b/resources/lang/vi/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'Cập nhật hạng mục',
     'use_default_eula'					=> 'Sử dụng <a href="#" data-toggle="modal" data-target="#eulaModal">giá trị EULA mặc đinh</a> để thay vào.',
     'use_default_eula_disabled'			=> '<del>Sử dụng giá trị EULA mặc định để thay thế.</del> No primary default EULA is set. Please add one in Settings.',
+    'use_default_eula_column'			=> 'Use default EULA',
 
 );
diff --git a/resources/lang/vi/admin/settings/general.php b/resources/lang/vi/admin/settings/general.php
index ead4260f73..8f18971b8e 100644
--- a/resources/lang/vi/admin/settings/general.php
+++ b/resources/lang/vi/admin/settings/general.php
@@ -61,9 +61,12 @@ return array(
     'label_logo'                => 'Nhãn Logo',
     'label_logo_size'           => 'Biểu trưng hình vuông ưa nhìn - sẽ được hiển thị ở trên cùng bên phải của mỗi nhãn nội dung. ',
     'laravel'                   => 'Phiên bản Laravel',
+    'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Certificate',
     'ldap_enabled'              => 'Bật LDAP',
     'ldap_integration'          => 'Tích hợp LDAP',
     'ldap_settings'             => 'Cài đặt LDAP',
+    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_login_test_help'      => 'Nhập một ngày hợp lệ LDAP tên người dùng và mật khẩu từ cơ sở DN bạn đã nêu trên để kiểm tra xem LDAP đăng nhập của bạn được cấu hình đúng. BẠN PHẢI LƯU THIẾT ĐẶT CẬP NHẬT LDAP CỦA BẠN ĐẦU TIÊN.',
     'ldap_login_sync_help'      => 'Này chỉ kiểm tra LDAP có thể đồng bộ một cách chính xác. Nếu truy vấn xác thực LDAP của bạn không đúng, người sử dụng vẫn không thể đăng nhập. BẠN PHẢI LƯU THIẾT ĐẶT CẬP NHẬT LDAP CỦA BẠN ĐẦU TIÊN.',
     'ldap_server'               => 'Máy chủ LDAP',
diff --git a/resources/lang/vi/admin/users/message.php b/resources/lang/vi/admin/users/message.php
index 5a92d97c39..a834719c99 100644
--- a/resources/lang/vi/admin/users/message.php
+++ b/resources/lang/vi/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
     'user_deleted_warning'      => 'Người dùng này đã bị xóa. Bạn sẽ phải phục hồi người dùng này để chỉnh sửa nó hoặc khởi gán nó đến tài sản mới.',
     'ldap_not_configured'        => 'Tích hợp LDAP thì chưa được cấu hình cho cài đặt này.',
     'password_resets_sent'      => 'Những người dùng với trạng thái kích hoạt đã chọn và có địa chỉ email hợp lệ sẽ nhận được liên kết đặt lại mật khẩu.',
+    'password_reset_sent'       => 'A password reset link has been sent to :email!',
 
 
     'success' => array(
diff --git a/resources/lang/vi/button.php b/resources/lang/vi/button.php
index 10ede648f4..d2514ca435 100644
--- a/resources/lang/vi/button.php
+++ b/resources/lang/vi/button.php
@@ -14,4 +14,5 @@ return array(
 	'select_file'				=> 'Chọn tập tin...',
     'select_files'				=> 'Chọn files...',
     'generate_labels'           => '{1} Nhãn Chung|[2,*] Nhiều Nhãn Chung',
+    'send_password_link'       => 'Send Password Reset Link',
 );
diff --git a/resources/lang/zh-CN/admin/categories/general.php b/resources/lang/zh-CN/admin/categories/general.php
index 66a641509f..ab4a224706 100644
--- a/resources/lang/zh-CN/admin/categories/general.php
+++ b/resources/lang/zh-CN/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> '更新分类',
     'use_default_eula'					=> '用<a href="#" data-toggle="modal" data-target="#eulaModal">默认EULA（最终用户许可协议）</a>进行替换',
     'use_default_eula_disabled'			=> '<del>使用默认EULA（最终用户许可协议）替换.</del>没有设置默认EULA（最终用户许可协议），请在设置中增加一个。',
+    'use_default_eula_column'			=> 'Use default EULA',
 
 );
diff --git a/resources/lang/zh-CN/admin/settings/general.php b/resources/lang/zh-CN/admin/settings/general.php
index 2134f9c7b3..7c98eca1c6 100644
--- a/resources/lang/zh-CN/admin/settings/general.php
+++ b/resources/lang/zh-CN/admin/settings/general.php
@@ -61,9 +61,12 @@ return array(
     'label_logo'                => '标签标志',
     'label_logo_size'           => '方形标志看起来最好——将显示在每个资产标签的右上角。 ',
     'laravel'                   => 'Laravel版本',
+    'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Certificate',
     'ldap_enabled'              => '启用LDAP验证',
     'ldap_integration'          => 'LDAP集成',
     'ldap_settings'             => 'LDAP 设置',
+    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_login_test_help'      => '根据你指定的base DN，输入有效的LDAP用户名和密码，以测试您的LDAP登录是否配置正确。当然您必须先保存您更改的LDAP设置。',
     'ldap_login_sync_help'      => '这只证明了LDAP同步正确。如果您的LDAP身份验证查询设置不正确，用户可能仍然无法登录。当然您必须先保存您的LDAP设置。',
     'ldap_server'               => 'LDAP 服务器',
diff --git a/resources/lang/zh-CN/admin/users/message.php b/resources/lang/zh-CN/admin/users/message.php
index 353d262f8d..3e36080318 100644
--- a/resources/lang/zh-CN/admin/users/message.php
+++ b/resources/lang/zh-CN/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
     'user_deleted_warning'      => '用户已经被删除，你需要恢复这个用户编辑他或者重新指定新资产。',
     'ldap_not_configured'        => '安装过程中未启用LDAP集成的功能。',
     'password_resets_sent'      => '被选中的已激活并拥有有效电子邮件地址的用户已经收到了一个密码重置链接。',
+    'password_reset_sent'       => 'A password reset link has been sent to :email!',
 
 
     'success' => array(
diff --git a/resources/lang/zh-CN/button.php b/resources/lang/zh-CN/button.php
index 3e506ad204..fff4199f11 100644
--- a/resources/lang/zh-CN/button.php
+++ b/resources/lang/zh-CN/button.php
@@ -14,4 +14,5 @@ return array(
 	'select_file'				=> '选择文件...',
     'select_files'				=> '选择文件...',
     'generate_labels'           => '{1} 生成标签|[2,*] 生成标签',
+    'send_password_link'       => '发送密码重置链接',
 );
diff --git a/resources/lang/zh-HK/admin/categories/general.php b/resources/lang/zh-HK/admin/categories/general.php
index 7741b7da62..52e936d0b6 100644
--- a/resources/lang/zh-HK/admin/categories/general.php
+++ b/resources/lang/zh-HK/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'Update Category',
     'use_default_eula'					=> 'Use the <a href="#" data-toggle="modal" data-target="#eulaModal">primary default EULA</a> instead.',
     'use_default_eula_disabled'			=> '<del>Use the primary default EULA instead.</del> No primary default EULA is set. Please add one in Settings.',
+    'use_default_eula_column'			=> 'Use default EULA',
 
 );
diff --git a/resources/lang/zh-HK/admin/settings/general.php b/resources/lang/zh-HK/admin/settings/general.php
index e15162210e..fb268f39f0 100644
--- a/resources/lang/zh-HK/admin/settings/general.php
+++ b/resources/lang/zh-HK/admin/settings/general.php
@@ -61,9 +61,12 @@ return array(
     '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',
+    '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_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_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_server'               => 'LDAP Server',
diff --git a/resources/lang/zh-HK/admin/users/message.php b/resources/lang/zh-HK/admin/users/message.php
index e517cd113b..85d016f04a 100644
--- a/resources/lang/zh-HK/admin/users/message.php
+++ b/resources/lang/zh-HK/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
     'user_deleted_warning'      => 'This user has been deleted. You will have to restore this user to edit them or assign them new assets.',
     'ldap_not_configured'        => 'LDAP integration has not been configured for this installation.',
     'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
+    'password_reset_sent'       => 'A password reset link has been sent to :email!',
 
 
     'success' => array(
@@ -38,10 +39,10 @@ return array(
         'asset_already_accepted' => 'This asset has already been accepted.',
         'accept_or_decline' => 'You must either accept or decline this asset.',
         'incorrect_user_accepted' => 'The asset you have attempted to accept was not checked out to you.',
-        'ldap_could_not_connect' => 'Could not connect to the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD <br>Error from LDAP Server:',
-        'ldap_could_not_bind' => 'Could not bind to the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD<br>Error from LDAP Server: ',
-        'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD and any Locations that may have additional OUs associated with them. <br>Error from LDAP Server:',
-        'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD and any Locations that may have additional OUs associated with them. <br>Error from LDAP Server:',
+        'ldap_could_not_connect' => 'Could not connect to the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
+        'ldap_could_not_bind' => 'Could not bind to the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server: ',
+        'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
+        'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
         'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ',
     ),
 
diff --git a/resources/lang/zh-HK/button.php b/resources/lang/zh-HK/button.php
index 2b97223250..27131e5fc6 100644
--- a/resources/lang/zh-HK/button.php
+++ b/resources/lang/zh-HK/button.php
@@ -14,4 +14,5 @@ return array(
 	'select_file'				=> 'Select File...',
     'select_files'				=> 'Select Files...',
     'generate_labels'           => '{1} Generate Label|[2,*] Generate Labels',
+    'send_password_link'       => 'Send Password Reset Link',
 );
diff --git a/resources/lang/zh-TW/admin/categories/general.php b/resources/lang/zh-TW/admin/categories/general.php
index 403a585b63..52426ec838 100644
--- a/resources/lang/zh-TW/admin/categories/general.php
+++ b/resources/lang/zh-TW/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> '更新類別',
     'use_default_eula'					=> '用<a href="#" data-toggle="modal" data-target="#eulaModal">預設EULA（最終使用者許可協議）</a> 進行替換。',
     'use_default_eula_disabled'			=> '<del>使用預設EULA（最終使用者許可協議）替換。</del>沒有找到預設EULA（最終使用者許可協議）。請在設定中增加一個。',
+    'use_default_eula_column'			=> '使用預設的 EULA',
 
 );
diff --git a/resources/lang/zh-TW/admin/hardware/general.php b/resources/lang/zh-TW/admin/hardware/general.php
index 39607dbf0d..11db49e13e 100644
--- a/resources/lang/zh-TW/admin/hardware/general.php
+++ b/resources/lang/zh-TW/admin/hardware/general.php
@@ -10,9 +10,9 @@ return array(
     'checkout'  				=> '借出資產',
     'clone'  					=> '複製資產',
     'deployable'  				=> '可部署',
-    'deleted'  					=> 'This asset has been deleted.',
+    'deleted'  					=> '此資產已被刪除.',
     'edit'  					=> '編輯資產',
-    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
+    'model_deleted'  			=> '此資產模板已被刪除. 你必須先還原資產模板才可還原資產.',
     'requestable'               => '可申領',
     'requested'				    => '已申領',
     'restore'  					=> '還原資產',
diff --git a/resources/lang/zh-TW/admin/hardware/table.php b/resources/lang/zh-TW/admin/hardware/table.php
index 545d89ca9b..d15c9252d5 100644
--- a/resources/lang/zh-TW/admin/hardware/table.php
+++ b/resources/lang/zh-TW/admin/hardware/table.php
@@ -20,6 +20,6 @@ return array(
     'title'      	=> '資產',
     'image'		=> '設備圖片',
     'days_without_acceptance' => '過期天數',
-    'monthly_depreciation' => 'Monthly Depreciation'
+    'monthly_depreciation' => '每月折舊'
 
 );
diff --git a/resources/lang/zh-TW/admin/licenses/message.php b/resources/lang/zh-TW/admin/licenses/message.php
index 3ab1f56e0f..ec91312323 100644
--- a/resources/lang/zh-TW/admin/licenses/message.php
+++ b/resources/lang/zh-TW/admin/licenses/message.php
@@ -8,7 +8,7 @@ return array(
     'owner_doesnt_match_asset' => '您正在授權的資產已被其他人佔用，請重新選擇。',
     'assoc_users'	 => '此授權已分配給某個使用者，目前不能被刪除，請檢查後重試。',
     'select_asset_or_person' => '您必須選擇資產或用戶，但不能同時選擇兩者。',
-    'not_found' => 'License not found',
+    'not_found' => '找不到授權',
 
 
     'create' => array(
diff --git a/resources/lang/zh-TW/admin/settings/general.php b/resources/lang/zh-TW/admin/settings/general.php
index 8d2129e5bb..c7e2a434cf 100644
--- a/resources/lang/zh-TW/admin/settings/general.php
+++ b/resources/lang/zh-TW/admin/settings/general.php
@@ -61,9 +61,12 @@ return array(
     'label_logo'                => 'Label Logo',
     'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
     'laravel'                   => 'Laravel版本',
+    'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Certificate',
     'ldap_enabled'              => '啟用LDAP驗證',
     'ldap_integration'          => 'LDAP整合',
     'ldap_settings'             => 'LDAP設定',
+    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_login_test_help'      => '從上方指定的 DN 中輸入有效的 LDAP 使用者名和密碼, 以測試是否正確配置了 LDAP 登錄。您必須先保存更新的 LDAP 設置。',
     'ldap_login_sync_help'      => '這僅測試 LDAP 可以正確同步。如果 LDAP 身份驗證查詢不正確, 使用者可能仍無法登錄。您必須先保存更新的 LDAP 設置。',
     'ldap_server'               => 'LDAP伺服器',
diff --git a/resources/lang/zh-TW/admin/users/message.php b/resources/lang/zh-TW/admin/users/message.php
index a37c02021f..1f8eb19944 100644
--- a/resources/lang/zh-TW/admin/users/message.php
+++ b/resources/lang/zh-TW/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
     'user_deleted_warning'      => '此使用者已被刪除。您必須先還原此使用者才能進行編輯或分配新的資產。',
     'ldap_not_configured'        => 'LDAP 整合尚未設定',
     'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
+    'password_reset_sent'       => 'A password reset link has been sent to :email!',
 
 
     'success' => array(
diff --git a/resources/lang/zh-TW/button.php b/resources/lang/zh-TW/button.php
index 4261594c72..554374546f 100644
--- a/resources/lang/zh-TW/button.php
+++ b/resources/lang/zh-TW/button.php
@@ -13,5 +13,6 @@ return array(
     'upload'                    => '上傳',
 	'select_file'				=> '選擇檔案…',
     'select_files'				=> '選擇檔案…',
-    'generate_labels'           => '{1} Generate Label|[2,*] Generate Labels',
+    'generate_labels'           => '{1} 產製標籤|[2,*] 產製標籤',
+    'send_password_link'       => '發送密碼重設連結',
 );
diff --git a/resources/lang/zh-TW/general.php b/resources/lang/zh-TW/general.php
index 21762dad2c..f2a000c73c 100644
--- a/resources/lang/zh-TW/general.php
+++ b/resources/lang/zh-TW/general.php
@@ -133,11 +133,11 @@
     'licenses'				=> '授權',
     'list_all'				=> '列出全部',
     'loading'				=> '載入中',
-    'lock_passwords'        => 'This field value will not be saved in a demo installation.',
+    'lock_passwords'        => '此欄位值不會儲存在 Demo 安裝.',
     'feature_disabled'      => '演示模式下禁用此功能',
     'location'              => '位置',
     'locations'				=> '位置',
-    'logo_size'				=> 'Square logos look best with Logo + Text. Logo maximum display size is 50px high x 500px wide.  ',
+    'logo_size'				=> '正方形 logos 最適合 Logo + Text 顯示. Logo 最大顯示尺寸是 50px 高 x 500px 寬.  ',
     'logout'				=> '登出',
     'lookup_by_tag'     => '尋找資產標籤',
     'maintenances'          => '維護',
@@ -176,7 +176,7 @@
     'remove_company'        => '移除公司關聯',
     'reports'				=> '報告',
     'restored'				=> '還原',
-    'restore'				=> 'Restore',
+    'restore'				=> '還原',
     'requested'				=> '已申請',
     'request_canceled'      => '取消申請',
     'save'  				=> '儲存',
@@ -200,7 +200,7 @@
     'sign_in'				=> '登入',
     'signature'             => '簽名',
     'skin'       			=> '主題',
-    'slack_test_msg'        => 'Oh hai! Looks like your Slack integration with Snipe-IT is working!',
+    'slack_test_msg'        => '看起來 Slack 已成功整合到 Snipe-IT 了!',
     'some_features_disabled' => '演示模式︰ 此安裝禁用某些功能。',
     'site_name'				=> '網站名稱',
     'state'  				=> '省份',
@@ -221,7 +221,7 @@
     'unknown_admin'			=> '未知管理員',
     'username_format'		=> '使用者名稱格式',
     'update'                => '更新',
-    'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
+    'upload_filetypes_help'      => '允許的檔案類別為 png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf 與 rar. 最大允許上傳的大小是 :size.',
     'uploaded'              => '已上傳',
     'user'					=> '使用者',
     'accepted'			    => '已接受',
@@ -237,14 +237,14 @@
     'zip'  					=> 'Zip',
     'noimage'				=> '圖片未上傳或無法找到',
     'token_expired'         => '表單已過期，請重新送出',
-    'login_enabled'         => 'Login Enabled',
-    'audit_due'             => 'Due for Audit',
-    'audit_overdue'         => 'Overdue for Audit',
-    'accept'                => 'Accept :asset',
+    'login_enabled'         => '登入已啟用',
+    'audit_due'             => '審核到期',
+    'audit_overdue'         => '審核過期',
+    'accept'                => '接受 :asset',
     'i_accept'              => '我接受',
     'i_decline'             => '我拒絕',
-    'sign_tos'              => 'Sign below to indicate that you agree to the terms of service:',
-    'clear_signature'       => 'Clear Signature',
-    'show_help'             => 'Show help',
-    'hide_help'             => 'Hide help',
+    'sign_tos'              => '請在下面簽署來表示您同意服務條款:',
+    'clear_signature'       => '清除簽名',
+    'show_help'             => '顯示幫助',
+    'hide_help'             => '隱藏幫助',
     ];
diff --git a/resources/lang/zh-TW/mail.php b/resources/lang/zh-TW/mail.php
index 38bdbf4659..2b813e2356 100644
--- a/resources/lang/zh-TW/mail.php
+++ b/resources/lang/zh-TW/mail.php
@@ -9,7 +9,7 @@ return array(
     'asset' => '資產：',
     'asset_name' => '資產名稱：',
     'asset_requested' => '申請資產',
-    'asset_tag' => 'Asset Tag',
+    'asset_tag' => '資產標籤',
     'assigned_to' => '分配給',
     'best_regards' => 'Best regards,',
     'canceled' => '取消：',
@@ -18,12 +18,12 @@ return array(
     'click_to_confirm' => '請點擊鏈結啟用您 :web 的帳戶：',
     'click_on_the_link_accessory' => '請點擊鏈結確認您已收到配件。',
     'click_on_the_link_asset' => '請點擊鏈結確認您已收到資產。',
-    'Confirm_Asset_Checkin' => 'Asset checkin confirmation',
-    'Confirm_Accessory_Checkin' => 'Accessory checkin confirmation',
-    'Confirm_accessory_delivery' => 'Accessory delivery confirmation',
-    'Confirm_license_delivery' => 'License delivery confirmation',
-    'Confirm_asset_delivery' => 'Asset delivery confirmation',
-    'Confirm_consumable_delivery' => 'Consumable delivery confirmation',
+    'Confirm_Asset_Checkin' => '確認資產繳回',
+    'Confirm_Accessory_Checkin' => '確認配件繳回',
+    'Confirm_accessory_delivery' => '確認交付配件',
+    'Confirm_license_delivery' => '確認交付授權',
+    'Confirm_asset_delivery' => '確認交付資產',
+    'Confirm_consumable_delivery' => '確認交付耗材',
     'current_QTY' => '目前數量',
     'Days' => '日',
     'days' => '日',
@@ -69,11 +69,11 @@ return array(
     'welcome' => '歡迎您 :name',
     'welcome_to' => '歡迎來到 :web！',
     'your_credentials' => '您的 Snipe-IT 憑證',
-    'Accessory_Checkin_Notification' => 'Accessory checked in',
-    'Asset_Checkin_Notification' => 'Asset checked in',
-    'License_Checkin_Notification' => 'License checked in',
-    'Expected_Checkin_Report' => 'Expected asset checkin report',
-    'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching',
+    'Accessory_Checkin_Notification' => '配件繳回',
+    'Asset_Checkin_Notification' => '資產繳回',
+    'License_Checkin_Notification' => '授權繳回',
+    'Expected_Checkin_Report' => '預計資產繳回報告',
+    'Expected_Checkin_Notification' => '提醒: :name 接近繳回最後期限',
     'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date',
     'your_assets' => '查看您的資產'
 );
diff --git a/resources/lang/zu/admin/categories/general.php b/resources/lang/zu/admin/categories/general.php
index eef7ee80fe..8eed85a897 100644
--- a/resources/lang/zu/admin/categories/general.php
+++ b/resources/lang/zu/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
     'update'  							=> 'Isigaba sokuvuselela',
     'use_default_eula'					=> 'Sebenzisa okungu-<a href="#" data-toggle="modal" data-target="#eulaModal">kuzenzakalela okuzenzakalelayo ku-EULA</a> kunalokho.',
     'use_default_eula_disabled'			=> '<del>Sebenzisa i-EULA eyinhloko yokuzenzakalela esikhundleni.</del> Ayikho i-EULA eyimilayezo eyisisekelo esethiwe. Sicela ungeze eyodwa kuzilungiselelo.',
+    'use_default_eula_column'			=> 'Use default EULA',
 
 );
diff --git a/resources/lang/zu/admin/settings/general.php b/resources/lang/zu/admin/settings/general.php
index 9bd8be50a1..95af5ba789 100644
--- a/resources/lang/zu/admin/settings/general.php
+++ b/resources/lang/zu/admin/settings/general.php
@@ -61,9 +61,12 @@ return array(
     'label_logo'                => 'Label Logo',
     'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
     'laravel'                   => 'Inguqulo yeLaravel',
+    'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Certificate',
     'ldap_enabled'              => 'I-LDAP inikwe amandla',
     'ldap_integration'          => 'Ukuhlanganiswa kwe-LDAP',
     'ldap_settings'             => 'Izilungiselelo ze-LDAP',
+    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+     'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_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_server'               => 'Iseva ye-LDAP',
diff --git a/resources/lang/zu/admin/users/message.php b/resources/lang/zu/admin/users/message.php
index 028cae65aa..5a8bc7bbe0 100644
--- a/resources/lang/zu/admin/users/message.php
+++ b/resources/lang/zu/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
     'user_deleted_warning'      => 'Lo msebenzisi ususiwe. Kuzodingeka ubuyisele lo msebenzisi ukuwahlela noma ubanikeze amafa amasha.',
     'ldap_not_configured'        => 'Ukuhlanganiswa kwe-LDAP akulungiselelwe lokhu kufakwa.',
     'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
+    'password_reset_sent'       => 'A password reset link has been sent to :email!',
 
 
     'success' => array(
diff --git a/resources/lang/zu/button.php b/resources/lang/zu/button.php
index 6e84e86782..9258054445 100644
--- a/resources/lang/zu/button.php
+++ b/resources/lang/zu/button.php
@@ -14,4 +14,5 @@ return array(
 	'select_file'				=> 'Khetha Ifayela ...',
     'select_files'				=> 'Select Files...',
     'generate_labels'           => '{1} Generate Label|[2,*] Generate Labels',
+    'send_password_link'       => 'Send Password Reset Link',
 );

From 9d5d1a9f9aae2c8baee48551185da5de0cdb62c2 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 13 Dec 2021 12:03:03 -0800
Subject: [PATCH 35/39] Added escape to assigned_to API response

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Transformers/AssetsTransformer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Transformers/AssetsTransformer.php b/app/Http/Transformers/AssetsTransformer.php
index 0da314002f..e9abca65e1 100644
--- a/app/Http/Transformers/AssetsTransformer.php
+++ b/app/Http/Transformers/AssetsTransformer.php
@@ -170,7 +170,7 @@ class AssetsTransformer
         }
         return $asset->assigned ? [
             'id' => $asset->assigned->id,
-            'name' => $asset->assigned->display_name,
+            'name' => e($asset->assigned->display_name),
             'type' => $asset->assignedType()
         ] : null;
     }

From 02be4773de6d918239d54fc6bcf2ad40162f3211 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 13 Dec 2021 12:07:34 -0800
Subject: [PATCH 36/39] 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 5a86cbbeba..911f4bb133 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v5.3.4',
-  'full_app_version' => 'v5.3.4 - build 6550-g39b0dc136',
-  'build_version' => '6550',
+  'app_version' => 'v5.3.5',
+  'full_app_version' => 'v5.3.5 - build 6558-gc988d8427',
+  'build_version' => '6558',
   'prerelease_version' => '',
-  'hash_version' => 'g39b0dc136',
-  'full_hash' => 'v5.3.4-17-g39b0dc136',
+  'hash_version' => 'gc988d8427',
+  'full_hash' => 'v5.3.5-2-gc988d8427',
   'branch' => 'master',
 );
\ No newline at end of file

From c80aa2a2899ccad4cd18c8f77a449c39901a0c98 Mon Sep 17 00:00:00 2001
From: Ivan Nieto Vivanco <inietov@gmail.com>
Date: Tue, 14 Dec 2021 12:05:33 -0600
Subject: [PATCH 37/39] Add title column to custom reports

---
 app/Http/Controllers/ReportsController.php | 13 ++++++++++++-
 resources/views/reports/custom.blade.php   | 10 +++++++---
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php
index 45806435e6..d3d4438843 100644
--- a/app/Http/Controllers/ReportsController.php
+++ b/app/Http/Controllers/ReportsController.php
@@ -515,6 +515,10 @@ class ReportsController extends Controller
                 $header[] = trans('general.department');
             }
 
+            if ($request->filled('title')) {
+                $header[] = trans('admin/users/table.title');
+            }
+
             if ($request->filled('status')) {
                 $header[] = trans('general.status');
             }
@@ -754,7 +758,6 @@ class ReportsController extends Controller
                         }
                     }
 
-
                     if ($request->filled('department')) {
                         if ($asset->checkedOutToUser()) {
                             $row[] = (($asset->assignedto) && ($asset->assignedto->department)) ? $asset->assignedto->department->name : '';
@@ -763,6 +766,14 @@ class ReportsController extends Controller
                         }
                     }
 
+                    if ($request->filled('title')) {
+                        if ($asset->checkedOutToUser()) {
+                            $row[] = ($asset->assignedto) ? $asset->assignedto->jobtitle : '';
+                        } else {
+                            $row[] = ''; // Empty string if unassigned
+                        }
+                    }
+
                     if ($request->filled('status')) {
                         $row[] = ($asset->assetstatus) ? $asset->assetstatus->name.' ('.$asset->present()->statusMeta.')' : '';
                     }
diff --git a/resources/views/reports/custom.blade.php b/resources/views/reports/custom.blade.php
index 7bd1ba424e..afee0fcedd 100644
--- a/resources/views/reports/custom.blade.php
+++ b/resources/views/reports/custom.blade.php
@@ -235,9 +235,13 @@
               </label>
             </div>
 
-
-
-
+            <div class="checkbox col-md-12">
+              <label>
+                {{ Form::checkbox('title', '1', '1', ['class' => 'minimal']) }}
+                {{ trans('admin/users/table.title') }}
+              </label>
+            </div>
+            
 
             @if ($customfields->count() > 0)
               <div class="checkbox col-md-12">

From dbdc1c7f3fbb0bf6822abd006e549eb5af52f3f6 Mon Sep 17 00:00:00 2001
From: Bradley Coudriet <brad@exula.net>
Date: Wed, 15 Dec 2021 10:38:51 -0500
Subject: [PATCH 38/39] Update SettingsController.php to save Slack Settings

This goes with #10438 that I just submitted about Slack Settings not saving.

This adds the necessary code to actually save the Slack Settings,
As they are already validated by the SlackSettingsRequest, this seems like an easy and low-impact fix.
---
 app/Http/Controllers/SettingsController.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
index 76dfd21fef..a0851867e2 100755
--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -674,6 +674,10 @@ class SettingsController extends Controller
             return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error'));
         }
 
+        $setting->slack_endpoint = $request->input('slack_endpoint');
+        $setting->slack_channel = $request->input('slack_channel');
+        $setting->slack_botname = $request->input('slack_botname');
+        
         if ($setting->save()) {
             return redirect()->route('settings.index')
                 ->with('success', trans('admin/settings/message.update.success'));

From a05fe9c1f7bb68ccb98c5a651d0b21e01e0232e4 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 15 Dec 2021 09:30:36 -0800
Subject: [PATCH 39/39] Add @exula as a contributor

---
 .all-contributorsrc | 9 +++++++++
 README.md           | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.all-contributorsrc b/.all-contributorsrc
index e30880abfe..ff040eb33c 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -2513,6 +2513,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "exula",
+      "name": "Bradley Coudriet",
+      "avatar_url": "https://avatars.githubusercontent.com/u/3842948?v=4",
+      "profile": "http://bjcpgd.cias.rit.edu",
+      "contributions": [
+        "code"
+      ]
     }
   ]
 }
diff --git a/README.md b/README.md
index ae12b18599..106b27b6cd 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 ![Build Status](https://app.chipperci.com/projects/0e5f8979-31eb-4ee6-9abf-050b76ab0383/status/master) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/snipe-it/localized.svg)](https://crowdin.com/project/snipe-it) [![Docker Pulls](https://img.shields.io/docker/pulls/snipe/snipe-it.svg)](https://hub.docker.com/r/snipe/snipe-it/) [![Twitter Follow](https://img.shields.io/twitter/follow/snipeitapp.svg?style=social)](https://twitter.com/snipeitapp)  [![Codacy Badge](https://api.codacy.com/project/badge/Grade/553ce52037fc43ea99149785afcfe641)](https://www.codacy.com/app/snipe/snipe-it?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=snipe/snipe-it&amp;utm_campaign=Badge_Grade)
-[![All Contributors](https://img.shields.io/badge/all_contributors-276-orange.svg?style=flat-square)](#contributors) [![Discord](https://badgen.net/badge/icon/discord?icon=discord&label)](https://discord.gg/yZFtShAcKk) [![huntr](https://cdn.huntr.dev/huntr_security_badge_mono.svg)](https://huntr.dev)
+[![All Contributors](https://img.shields.io/badge/all_contributors-277-orange.svg?style=flat-square)](#contributors) [![Discord](https://badgen.net/badge/icon/discord?icon=discord&label)](https://discord.gg/yZFtShAcKk) [![huntr](https://cdn.huntr.dev/huntr_security_badge_mono.svg)](https://huntr.dev)
 
 ## Snipe-IT - Open Source Asset Management System
 
@@ -130,7 +130,7 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken
 | [<img src="https://avatars.githubusercontent.com/u/11823649?v=4" width="110px;"/><br /><sub>Renee Margaret McConahy</sub>](https://github.com/nepella)<br />[💻](https://github.com/snipe/snipe-it/commits?author=nepella "Code") | [<img src="https://avatars.githubusercontent.com/u/5553884?v=4" width="110px;"/><br /><sub>JohnnyPicnic</sub>](https://github.com/JohnnyPicnic)<br />[💻](https://github.com/snipe/snipe-it/commits?author=JohnnyPicnic "Code") | [<img src="https://avatars.githubusercontent.com/u/8799594?v=4" width="110px;"/><br /><sub>markbrule</sub>](https://github.com/markbrule)<br />[💻](https://github.com/snipe/snipe-it/commits?author=markbrule "Code") | [<img src="https://avatars.githubusercontent.com/u/1962801?v=4" width="110px;"/><br /><sub>Mike Campbell</sub>](https://github.com/mikecmpbll)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mikecmpbll "Code") | [<img src="https://avatars.githubusercontent.com/u/11973217?v=4" width="110px;"/><br /><sub>tbrconnect</sub>](https://github.com/tbrconnect)<br />[💻](https://github.com/snipe/snipe-it/commits?author=tbrconnect "Code") | [<img src="https://avatars.githubusercontent.com/u/12447225?v=4" width="110px;"/><br /><sub>kcoyo</sub>](https://github.com/kcoyo)<br />[💻](https://github.com/snipe/snipe-it/commits?author=kcoyo "Code") | [<img src="https://avatars.githubusercontent.com/u/494017?v=4" width="110px;"/><br /><sub>Travis Miller</sub>](https://travismiller.com/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=travismiller "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/8735148?v=4" width="110px;"/><br /><sub>Petri Asikainen</sub>](https://github.com/PetriAsi)<br />[💻](https://github.com/snipe/snipe-it/commits?author=PetriAsi "Code") | [<img src="https://avatars.githubusercontent.com/u/11424540?v=4" width="110px;"/><br /><sub>derdeagle</sub>](https://github.com/derdeagle)<br />[💻](https://github.com/snipe/snipe-it/commits?author=derdeagle "Code") | [<img src="https://avatars.githubusercontent.com/u/176950?v=4" width="110px;"/><br /><sub>Mike Frysinger</sub>](https://wh0rd.org/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=vapier "Code") | [<img src="https://avatars.githubusercontent.com/u/22044358?v=4" width="110px;"/><br /><sub>ALPHA</sub>](https://github.com/AL4AL)<br />[💻](https://github.com/snipe/snipe-it/commits?author=AL4AL "Code") | [<img src="https://avatars.githubusercontent.com/u/1042587?v=4" width="110px;"/><br /><sub>FliegenKLATSCH</sub>](https://www.ifern.de)<br />[💻](https://github.com/snipe/snipe-it/commits?author=FliegenKLATSCH "Code") | [<img src="https://avatars.githubusercontent.com/u/442138?v=4" width="110px;"/><br /><sub>Jeremy Price</sub>](https://github.com/jerm)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jerm "Code") | [<img src="https://avatars.githubusercontent.com/u/84392209?v=4" width="110px;"/><br /><sub>Toreg87</sub>](https://github.com/Toreg87)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Toreg87 "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/67638596?v=4" width="110px;"/><br /><sub>Matthew Nickson</sub>](https://github.com/Computroniks)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Computroniks "Code") | [<img src="https://avatars.githubusercontent.com/u/1646397?v=4" width="110px;"/><br /><sub>Jethro Nederhof</sub>](https://jethron.id.au)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jethron "Code") | [<img src="https://avatars.githubusercontent.com/u/23289826?v=4" width="110px;"/><br /><sub>Oskar Stenberg</sub>](https://github.com/01ste02)<br />[💻](https://github.com/snipe/snipe-it/commits?author=01ste02 "Code") | [<img src="https://avatars.githubusercontent.com/u/82208283?v=4" width="110px;"/><br /><sub>Robert-Azelis</sub>](https://github.com/Robert-Azelis)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Robert-Azelis "Code") | [<img src="https://avatars.githubusercontent.com/u/60648387?v=4" width="110px;"/><br /><sub>Alexander William Smith</sub>](https://github.com/alwism)<br />[💻](https://github.com/snipe/snipe-it/commits?author=alwism "Code") | [<img src="https://avatars.githubusercontent.com/u/24418301?v=4" width="110px;"/><br /><sub>LEITWERK AG</sub>](https://www.leitwerk.de/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=leitwerk-ag "Code") | [<img src="https://avatars.githubusercontent.com/u/1911435?v=4" width="110px;"/><br /><sub>Adam</sub>](http://www.aboutcher.co.uk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=adamboutcher "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/16104273?v=4" width="110px;"/><br /><sub>Ian</sub>](https://snksrv.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sneak-it "Code") | [<img src="https://avatars.githubusercontent.com/u/4023909?v=4" width="110px;"/><br /><sub>Shao Yu-Lung (Allen)</sub>](http://blog.bestlong.idv.tw/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=bestlong "Code") | [<img src="https://avatars.githubusercontent.com/u/76475453?v=4" width="110px;"/><br /><sub>Haxatron</sub>](https://github.com/Haxatron)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Haxatron "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/16104273?v=4" width="110px;"/><br /><sub>Ian</sub>](https://snksrv.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sneak-it "Code") | [<img src="https://avatars.githubusercontent.com/u/4023909?v=4" width="110px;"/><br /><sub>Shao Yu-Lung (Allen)</sub>](http://blog.bestlong.idv.tw/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=bestlong "Code") | [<img src="https://avatars.githubusercontent.com/u/76475453?v=4" width="110px;"/><br /><sub>Haxatron</sub>](https://github.com/Haxatron)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Haxatron "Code") | [<img src="https://avatars.githubusercontent.com/u/3842948?v=4" width="110px;"/><br /><sub>Bradley Coudriet</sub>](http://bjcpgd.cias.rit.edu)<br />[💻](https://github.com/snipe/snipe-it/commits?author=exula "Code") |
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!