Merge remote-tracking branch 'origin/develop'

Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php

config/version.php

@@ -1,10 +1,10 @@
 <?php
 return array (
   'app_version' => 'v6.4.1',
-  'full_app_version' => 'v6.4.1 - build 13386-g4642f50d6b',
+  'full_app_version' => 'v6.4.1 - build 13458-gf2cc9ec1dd',
-  'build_version' => '13386',
+  'build_version' => '13458',
   'prerelease_version' => '',
-  'hash_version' => 'g4642f50d6b',
+  'hash_version' => 'gf2cc9ec1dd',
-  'full_hash' => 'v6.4.1-31-g4642f50d6b',
+  'full_hash' => 'v6.4.1-68-gf2cc9ec1dd',
   'branch' => 'master',
 );

resources/lang/aa-ER/admin/hardware/message.php

@@ -4,8 +4,11 @@ return [
 
     'undeployable' 		=> 'crwdns1173:0crwdne1173:0',
     'does_not_exist' 	=> 'crwdns740:0crwdne740:0',
+    'does_not_exist_var'=> 'crwdns12188:0crwdne12188:0',
+    'no_tag' 	        => 'crwdns12190:0crwdne12190:0',
     'does_not_exist_or_not_requestable' => 'crwdns6581:0crwdne6581:0',
     'assoc_users'	 	=> 'crwdns741:0crwdne741:0',
+    'warning_audit_date_mismatch' 	=> 'crwdns12192:0crwdne12192:0',
 
     'create' => [
         'error'   		=> 'crwdns742:0crwdne742:0',
@@ -16,6 +19,7 @@ return [
     'update' => [
         'error'   			=> 'crwdns744:0crwdne744:0',
         'success' 			=> 'crwdns745:0crwdne745:0',
+        'encrypted_warning' => 'crwdns12168:0crwdne12168:0',
         'nothing_updated'	=>  'crwdns1186:0crwdne1186:0',
         'no_assets_selected'  =>  'crwdns6810:0crwdne6810:0',
         'assets_do_not_exist_or_are_invalid' => 'crwdns12132:0crwdne12132:0',
@@ -29,7 +33,7 @@ return [
     ],
 
     'audit' => [
-        'error'   		=> 'crwdns1906:0crwdne1906:0',
+        'error'   		=> 'crwdns12194:0crwdne12194:0',
         'success' 		=> 'crwdns1907:0crwdne1907:0',
     ],
 

resources/lang/aa-ER/admin/licenses/message.php

@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'crwdns10556:0crwdne10556:0',
-    'user_does_not_exist' => 'crwdns935:0crwdne935:0',
+    'user_does_not_exist' => 'crwdns12164:0crwdne12164:0',
     'asset_does_not_exist' 	=> 'crwdns936:0crwdne936:0',
     'owner_doesnt_match_asset' => 'crwdns937:0crwdne937:0',
     'assoc_users'	 => 'crwdns938:0crwdne938:0',

resources/lang/aa-ER/admin/licenses/table.php

@@ -4,6 +4,7 @@ return array(
 
     'assigned_to'   	=> 'crwdns923:0crwdne923:0',
     'checkout'   		=> 'crwdns924:0crwdne924:0',
+    'deleted_at'        => 'crwdns12170:0crwdne12170:0',
     'id'      			=> 'crwdns925:0crwdne925:0',
     'license_email'   	=> 'crwdns926:0crwdne926:0',
     'license_name'   	=> 'crwdns927:0crwdne927:0',

resources/lang/aa-ER/admin/settings/general.php

@@ -49,6 +49,7 @@ return [
     'default_eula_text'			=> 'crwdns1259:0crwdne1259:0',
     'default_language'			=> 'crwdns1581:0crwdne1581:0',
     'default_eula_help_text'	=> 'crwdns1260:0crwdne1260:0',
+    'acceptance_note'           => 'crwdns12186:0crwdne12186:0',
     'display_asset_name'        => 'crwdns828:0crwdne828:0',
     'display_checkout_date'     => 'crwdns829:0crwdne829:0',
     'display_eol'               => 'crwdns1118:0crwdne1118:0',

resources/lang/aa-ER/admin/users/table.php

@@ -20,6 +20,7 @@ return array(
     'lock_passwords'		=> 'crwdns1262:0crwdne1262:0',
     'manager' 				=> 'crwdns778:0crwdne778:0',
     'managed_locations'     => 'crwdns1887:0crwdne1887:0',
+    'managed_users'         => 'crwdns12182:0crwdne12182:0',
     'name' 					=> 'crwdns779:0crwdne779:0',
     'nogroup'               => 'crwdns11906:0crwdne11906:0',
     'notes'                 => 'crwdns1268:0crwdne1268:0',

resources/lang/aa-ER/general.php

@@ -176,7 +176,7 @@ return [
     'last_name'             => 'crwdns1059:0crwdne1059:0',
     'license'				=> 'crwdns1060:0crwdne1060:0',
     'license_report'        => 'crwdns1141:0crwdne1141:0',
-    'licenses_available'	=> 'crwdns1061:0crwdne1061:0',
+    'licenses_available'	=> 'crwdns12172:0crwdne12172:0',
     'licenses'				=> 'crwdns1062:0crwdne1062:0',
     'list_all'				=> 'crwdns1063:0crwdne1063:0',
     'loading'				=> 'crwdns6135:0crwdne6135:0',
@@ -202,6 +202,8 @@ return [
     'new_password'          => 'crwdns6141:0crwdne6141:0',
     'next'					=> 'crwdns1275:0crwdne1275:0',
     'next_audit_date'		=> 'crwdns1919:0crwdne1919:0',
+    'next_audit_date_help'  => 'crwdns12196:0crwdne12196:0',
+    'audit_images_help'     => 'crwdns12198:0crwdne12198:0',
     'no_email'              => 'crwdns12130:0crwdne12130:0',
     'last_audit'		    => 'crwdns1920:0crwdne1920:0',
     'new'					=> 'crwdns1668:0crwdne1668:0',
@@ -245,6 +247,7 @@ return [
     'select_all'            => 'crwdns6155:0crwdne6155:0',
     'search'				=> 'crwdns1290:0crwdne1290:0',
     'select_category'       => 'crwdns1663:0crwdne1663:0',
+    'select_datasource' => 'crwdns12166:0crwdne12166:0',
     'select_department'     => 'crwdns1880:0crwdne1880:0',
     'select_depreciation'	=> 'crwdns1282:0crwdne1282:0',
     'select_location'		=> 'crwdns1283:0crwdne1283:0',
@@ -294,6 +297,7 @@ return [
     'user'					=> 'crwdns1095:0crwdne1095:0',
     'accepted'			    => 'crwdns1342:0crwdne1342:0',
     'declined'			    => 'crwdns1343:0crwdne1343:0',
+    'declined_note'         => 'crwdns12184:0crwdne12184:0',
     'unassigned'            => 'crwdns11769:0crwdne11769:0',
     'unaccepted_asset_report' => 'crwdns1409:0crwdne1409:0',
     'users'                 => 'crwdns1271:0crwdne1271:0',
@@ -312,6 +316,10 @@ return [
     'token_expired'         => 'crwdns1578:0crwdne1578:0',
     'login_enabled'         => 'crwdns5984:0crwdne5984:0',
     'audit_due'             => 'crwdns5986:0crwdne5986:0',
+    'audit_due_days'        => 'crwdns12174:0crwdne12174:0',
+    'checkin_due'           => 'crwdns12176:0crwdne12176:0',
+    'checkin_overdue'       => 'crwdns12178:0crwdne12178:0',
+    'checkin_due_days'      => 'crwdns12180:0crwdne12180:0',
     'audit_overdue'         => 'crwdns5988:0crwdne5988:0',
     'accept'                => 'crwdns6016:0crwdne6016:0',
     'i_accept'              => 'crwdns6018:0crwdne6018:0',
@@ -506,6 +514,9 @@ return [
     'or' => 'crwdns12024:0crwdne12024:0',
     'url'                   => 'crwdns12054:0crwdne12054:0',
     'edit_fieldset' => 'crwdns12092:0crwdne12092:0',
+    'permission_denied_superuser_demo' => 'crwdns12158:0crwdne12158:0',
+    'pwd_reset_not_sent' => 'crwdns12160:0crwdne12160:0',
+    'error_sending_email' => 'crwdns12162:0crwdne12162:0',
     'bulk' => [
             'delete' =>
                 [

resources/lang/af-ZA/admin/hardware/message.php

@@ -4,8 +4,11 @@ return [
 
     'undeployable' 		=> '<strong>Waarskuwing: </strong> Hierdie bate is gemerk as tans onbruikbaar. As hierdie status verander het, verander asseblief die batestatus.',
     'does_not_exist' 	=> 'Bate bestaan ​​nie.',
+    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
+    'no_tag' 	        => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'That asset does not exist or is not requestable.',
     'assoc_users'	 	=> 'Hierdie bate word tans na \'n gebruiker nagegaan en kan nie uitgevee word nie. Gaan asseblief die bate eers in, en probeer dan weer uitvee.',
+    'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
 
     'create' => [
         'error'   		=> 'Bate is nie geskep nie, probeer asseblief weer. :(',
@@ -16,6 +19,7 @@ return [
     'update' => [
         'error'   			=> 'Bate is nie opgedateer nie, probeer asseblief weer',
         'success' 			=> 'Bate is suksesvol opgedateer.',
+        'encrypted_warning' => 'Asset updated successfully, but encrypted custom fields were not due to permissions',
         'nothing_updated'	=>  'Geen velde is gekies nie, dus niks is opgedateer nie.',
         'no_assets_selected'  =>  'No assets were selected, so nothing was updated.',
         'assets_do_not_exist_or_are_invalid' => 'Selected assets cannot be updated.',
@@ -29,7 +33,7 @@ return [
     ],
 
     'audit' => [
-        'error'   		=> 'Bate-oudit was onsuksesvol. Probeer asseblief weer.',
+        'error'   		=> 'Asset audit unsuccessful: :error ',
         'success' 		=> 'Bate oudit suksesvol aangemeld.',
     ],
 

resources/lang/af-ZA/admin/licenses/message.php

@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'License does not exist or you do not have permission to view it.',
-    'user_does_not_exist' => 'Gebruiker bestaan ​​nie.',
+    'user_does_not_exist' => 'User does not exist or you do not have permission to view them.',
     'asset_does_not_exist' 	=> 'Die bate wat u met hierdie lisensie probeer assosieer, bestaan ​​nie.',
     'owner_doesnt_match_asset' => 'Die bate wat u met hierdie lisensie probeer assosieer, is in besit van ander as die persoon wat in die opdrag toegeken is.',
     'assoc_users'	 => 'Hierdie lisensie word tans na \'n gebruiker nagegaan en kan nie uitgevee word nie. Gaan asseblief die lisensie eers in, en probeer dan weer uitvee.',

resources/lang/af-ZA/admin/licenses/table.php

@@ -4,6 +4,7 @@ return array(
 
     'assigned_to'   	=> 'Toevertrou aan',
     'checkout'   		=> 'In uit',
+    'deleted_at'        => 'Deleted at',
     'id'      			=> 'ID',
     'license_email'   	=> 'Lisensie E-pos',
     'license_name'   	=> 'Gelisensieer om',

resources/lang/af-ZA/admin/settings/general.php

@@ -49,6 +49,7 @@ return [
     'default_eula_text'			=> 'Standaard EULA',
     'default_language'			=> 'Verstek taal',
     'default_eula_help_text'	=> 'U kan ook aangepaste EULA\'s aan spesifieke batekategorieë assosieer.',
+    'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'Wys bate naam',
     'display_checkout_date'     => 'Vertoon Checkout Date',
     'display_eol'               => 'Wys EOL in tabelweergawe',

resources/lang/af-ZA/admin/users/table.php

@@ -20,6 +20,7 @@ return array(
     'lock_passwords'		=> 'Login besonderhede kan nie op hierdie installasie verander word nie.',
     'manager' 				=> 'Bestuurder',
     'managed_locations'     => 'Bestuurde plekke',
+    'managed_users'         => 'Managed Users',
     'name' 					=> 'naam',
     'nogroup'               => 'No groups have been created yet. To add one, visit: ',
     'notes'                 => 'notas',

resources/lang/af-ZA/general.php

@@ -176,7 +176,7 @@ return [
     'last_name'             => 'Van',
     'license'				=> 'lisensie',
     'license_report'        => 'Lisensie Verslag',
-    'licenses_available'	=> 'lisensies beskikbaar',
+    'licenses_available'	=> 'Licenses available',
     'licenses'				=> 'lisensies',
     'list_all'				=> 'Lys almal',
     'loading'				=> 'Loading... please wait....',
@@ -202,6 +202,8 @@ return [
     'new_password'          => 'New Password',
     'next'					=> 'volgende',
     'next_audit_date'		=> 'Volgende ouditdatum',
+    'next_audit_date_help'  => 'If you use auditing in your organization, this is usually automatically calculated based on the asset&apos;s last audit date and audit frequency (in <code>Admin Settings &gt; Alerts</code>) and you can leave this blank. You can manually set this date here if you need to, but it must be later than the last audit date. ',
+    'audit_images_help'     => 'You can find audit images in the asset\'s history tab.',
     'no_email'              => 'No email address associated with this user',
     'last_audit'		    => 'Laaste Oudit',
     'new'					=> 'nuwe!',
@@ -245,6 +247,7 @@ return [
     'select_all'            => 'Select All',
     'search'				=> 'Soek',
     'select_category'       => 'Kies \'n kategorie',
+    'select_datasource' => 'Select a Datasource',
     'select_department'     => 'Kies \'n Departement',
     'select_depreciation'	=> 'Kies \'n waardeverminderingstipe',
     'select_location'		=> 'Kies \'n plek',
@@ -294,6 +297,7 @@ return [
     'user'					=> 'gebruiker',
     'accepted'			    => 'aanvaarde',
     'declined'			    => 'afgeneem',
+    'declined_note'         => 'Declined Notes',
     'unassigned'            => 'Unassigned',
     'unaccepted_asset_report' => 'Onaanvaarde Bates',
     'users'                 => 'gebruikers',
@@ -312,6 +316,10 @@ return [
     'token_expired'         => 'Jou vormsessie het verval. Probeer asseblief weer.',
     'login_enabled'         => 'Login Enabled',
     'audit_due'             => 'Due for Audit',
+    'audit_due_days'        => 'Assets Due for Audit Within :days Day|Assets Due for Audit Within :days Days',
+    'checkin_due'           => 'Due for Checkin',
+    'checkin_overdue'       => 'Overdue for Checkin',
+    'checkin_due_days'      => 'Assets Due for Checkin Within :days Day|Assets Due for Checkin Within :days Days',
     'audit_overdue'         => 'Overdue for Audit',
     'accept'                => 'Accept :asset',
     'i_accept'              => 'I accept',
@@ -507,6 +515,9 @@ return [
     'or' => 'or',
     'url'                   => 'URL',
     'edit_fieldset' => 'Edit fieldset fields and options',
+    'permission_denied_superuser_demo' => 'Permission denied. You cannot update user information for superadmins on the demo.',
+    'pwd_reset_not_sent' => 'User is not activated, is LDAP synced, or does not have an email address',
+    'error_sending_email' => 'Error sending email',
     'bulk' => [
             'delete' =>
                 [

resources/lang/am-ET/admin/hardware/message.php

@@ -5,8 +5,11 @@ return [
     'undeployable' 		=> '<strong>Warning: </strong> This asset has been marked as currently undeployable.
                         If this status has changed, please update the asset status.',
     'does_not_exist' 	=> 'Asset does not exist.',
+    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
+    'no_tag' 	        => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'That asset does not exist or is not requestable.',
     'assoc_users'	 	=> 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ',
+    'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
 
     'create' => [
         'error'   		=> 'Asset was not created, please try again. :(',
@@ -17,6 +20,7 @@ return [
     'update' => [
         'error'   			=> 'Asset was not updated, please try again',
         'success' 			=> 'Asset updated successfully.',
+        'encrypted_warning' => 'Asset updated successfully, but encrypted custom fields were not due to permissions',
         'nothing_updated'	=>  'No fields were selected, so nothing was updated.',
         'no_assets_selected'  =>  'No assets were selected, so nothing was updated.',
         'assets_do_not_exist_or_are_invalid' => 'Selected assets cannot be updated.',
@@ -30,7 +34,7 @@ return [
     ],
 
     'audit' => [
-        'error'   		=> 'Asset audit was unsuccessful. Please try again.',
+        'error'   		=> 'Asset audit unsuccessful: :error ',
         'success' 		=> 'Asset audit successfully logged.',
     ],
 

resources/lang/am-ET/admin/licenses/message.php

@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'License does not exist or you do not have permission to view it.',
-    'user_does_not_exist' => 'User does not exist.',
+    'user_does_not_exist' => 'User does not exist or you do not have permission to view them.',
     'asset_does_not_exist' 	=> 'The asset you are trying to associate with this license does not exist.',
     'owner_doesnt_match_asset' => 'The asset you are trying to associate with this license is owned by somene other than the person selected in the assigned to dropdown.',
     'assoc_users'	 => 'This license is currently checked out to a user and cannot be deleted. Please check the license in first, and then try deleting again. ',

resources/lang/am-ET/admin/licenses/table.php

@@ -4,6 +4,7 @@ return array(
 
     'assigned_to'   	=> 'Assigned To',
     'checkout'   		=> 'In/Out',
+    'deleted_at'        => 'Deleted at',
     'id'      			=> 'ID',
     'license_email'   	=> 'License Email',
     'license_name'   	=> 'Licensed To',

resources/lang/am-ET/admin/settings/general.php

@@ -49,6 +49,7 @@ return [
     'default_eula_text'			=> 'Default EULA',
     'default_language'			=> 'Default Language',
     'default_eula_help_text'	=> 'You can also associate custom EULAs to specific asset categories.',
+    'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'Display Asset Name',
     'display_checkout_date'     => 'Display Checkout Date',
     'display_eol'               => 'Display EOL in table view',

resources/lang/am-ET/admin/users/table.php

@@ -20,6 +20,7 @@ return array(
     'lock_passwords'		=> 'Login details cannot be changed on this installation.',
     'manager' 				=> 'Manager',
     'managed_locations'     => 'Managed Locations',
+    'managed_users'         => 'Managed Users',
     'name' 					=> 'Name',
     'nogroup'               => 'No groups have been created yet. To add one, visit: ',
     'notes'                 => 'Notes',

resources/lang/am-ET/general.php

@@ -176,7 +176,7 @@ return [
     'last_name'             => 'Last Name',
     'license'				=> 'License',
     'license_report'        => 'License Report',
-    'licenses_available'	=> 'licenses available',
+    'licenses_available'	=> 'Licenses available',
     'licenses'				=> 'Licenses',
     'list_all'				=> 'List All',
     'loading'				=> 'Loading... please wait....',
@@ -202,6 +202,8 @@ return [
     'new_password'          => 'New Password',
     'next'					=> 'Next',
     'next_audit_date'		=> 'Next Audit Date',
+    'next_audit_date_help'  => 'If you use auditing in your organization, this is usually automatically calculated based on the asset&apos;s last audit date and audit frequency (in <code>Admin Settings &gt; Alerts</code>) and you can leave this blank. You can manually set this date here if you need to, but it must be later than the last audit date. ',
+    'audit_images_help'     => 'You can find audit images in the asset\'s history tab.',
     'no_email'              => 'No email address associated with this user',
     'last_audit'		    => 'Last Audit',
     'new'					=> 'new!',
@@ -245,6 +247,7 @@ return [
     'select_all'            => 'Select All',
     'search'				=> 'Search',
     'select_category'       => 'Select a Category',
+    'select_datasource' => 'Select a Datasource',
     'select_department'     => 'Select a Department',
     'select_depreciation'	=> 'Select a Depreciation Type',
     'select_location'		=> 'Select a Location',
@@ -294,6 +297,7 @@ return [
     'user'					=> 'User',
     'accepted'			    => 'accepted',
     'declined'			    => 'declined',
+    'declined_note'         => 'Declined Notes',
     'unassigned'            => 'Unassigned',
     'unaccepted_asset_report' => 'Unaccepted Assets',
     'users'                 => 'Users',
@@ -312,6 +316,10 @@ return [
     'token_expired'         => 'Your form session has expired. Please try again.',
     'login_enabled'         => 'Login Enabled',
     'audit_due'             => 'Due for Audit',
+    'audit_due_days'        => 'Assets Due for Audit Within :days Day|Assets Due for Audit Within :days Days',
+    'checkin_due'           => 'Due for Checkin',
+    'checkin_overdue'       => 'Overdue for Checkin',
+    'checkin_due_days'      => 'Assets Due for Checkin Within :days Day|Assets Due for Checkin Within :days Days',
     'audit_overdue'         => 'Overdue for Audit',
     'accept'                => 'Accept :asset',
     'i_accept'              => 'I accept',
@@ -507,6 +515,9 @@ return [
     'or' => 'or',
     'url'                   => 'URL',
     'edit_fieldset' => 'Edit fieldset fields and options',
+    'permission_denied_superuser_demo' => 'Permission denied. You cannot update user information for superadmins on the demo.',
+    'pwd_reset_not_sent' => 'User is not activated, is LDAP synced, or does not have an email address',
+    'error_sending_email' => 'Error sending email',
     'bulk' => [
             'delete' =>
                 [

resources/lang/ar-SA/admin/hardware/message.php

@@ -4,8 +4,11 @@ return [
 
     'undeployable' 		=> '<strong> تحذير: </strong> تم تحديد الحالة لهذا الأصل بانه غير قابل للتوزيع حاليا. إذا تغيرت هذه الحالة، يرجى تحديث حالة الأصل.',
     'does_not_exist' 	=> 'الأصل غير موجود.',
+    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
+    'no_tag' 	        => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'ذالك الأصل غير موجود أو غير قابل للطلب.',
     'assoc_users'	 	=> 'هذا الأصل مخرج حاليا لمستخدم ولا يمكن حذفه. يرجى التحقق من الأصل أولا، ثم حاول الحذف مرة أخرى. ',
+    'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
 
     'create' => [
         'error'   		=> 'لم يتم إنشاء الأصل، يرجى إعادة المحاولة. :(',
@@ -16,6 +19,7 @@ return [
     'update' => [
         'error'   			=> 'لم يتم تحديث الأصل، يرجى إعادة المحاولة',
         'success' 			=> 'تم تحديث الأصل بنجاح.',
+        'encrypted_warning' => 'تم تحديث الأصل بنجاح، ولكن الحقول المخصصة المشفرة لم تكن بسبب الأذونات',
         'nothing_updated'	=>  'لم يتم اختيار أي حقول، لذلك لم يتم تحديث أي شيء.',
         'no_assets_selected'  =>  'لم يتم اختيار أي أصول، لذلك لم يتم تحديث أي شيء.',
         'assets_do_not_exist_or_are_invalid' => 'لا يمكن تحديث الأصول المحددة.',
@@ -29,7 +33,7 @@ return [
     ],
 
     'audit' => [
-        'error'   		=> 'لم تنجح مراجعة الأصل. حاول مرة اخرى.',
+        'error'   		=> 'Asset audit unsuccessful: :error ',
         'success' 		=> 'تم تسجيل تدقيق الأصل بنجاح.',
     ],
 

resources/lang/ar-SA/admin/licenses/message.php

@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'الترخيص غير موجود أو ليس لديك الصلاحية لعرضه.',
-    'user_does_not_exist' => 'المستخدم غير موجود.',
+    'user_does_not_exist' => 'المستخدم غير موجود أو ليس لديك الصلاحية لعرضها.',
     'asset_does_not_exist' 	=> 'الأصل اللذي تحاول ربطه مع هذا الترخيص غير موجود.',
     'owner_doesnt_match_asset' => 'الأصل اللذي تحاول ربطه مع هذا الترخيص حاليا مملوك لشخص اخر غير اللذي تم اختياره من القائمة المنسدلة.',
     'assoc_users'	 => 'هذا الترخيص حاليا مخرج لمستخدم ولا يمكن حذفه. يرجى التحقق من الترخيص في البداية، ثم محاولة الحذف مرة أخرى. ',

resources/lang/ar-SA/admin/licenses/table.php

@@ -4,6 +4,7 @@ return array(
 
     'assigned_to'   	=> 'عينت الى',
     'checkout'   		=> 'داخل\\خارج',
+    'deleted_at'        => 'تم الحذف في',
     'id'      			=> 'رقم التعريف',
     'license_email'   	=> 'البريد الإلكتروني للترخيص',
     'license_name'   	=> 'مرخص الى',

resources/lang/ar-SA/admin/settings/general.php

@@ -49,6 +49,7 @@ return [
     'default_eula_text'			=> 'اتفاقية ترخيص المستخدم النهائي الافتراضية',
     'default_language'			=> 'اللغة الافتراضية',
     'default_eula_help_text'	=> 'يمكنك أيضا ربط (اتفاقية ترخيص المستخدم) لاصناف محددة من الاصول.',
+    'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'عرض اسم مادة العرض',
     'display_checkout_date'     => 'عرض تاريخ الخروج',
     'display_eol'               => 'عرض نهاية العمر على شكل جدول',

resources/lang/ar-SA/admin/users/table.php

@@ -20,6 +20,7 @@ return array(
     'lock_passwords'		=> 'لا يمكن تغيير تفاصيل الدخول بالنسبة لهذا التنصيب.',
     'manager' 				=> 'المدير',
     'managed_locations'     => 'المواقع المدارة',
+    'managed_users'         => 'المستخدمين المدراء',
     'name' 					=> 'الاسم',
     'nogroup'               => 'لم يتم إنشاء أي مجموعات حتى الآن. لإضافة مجموعة واحدة، قم بزيارة: ',
     'notes'                 => 'مُلاحظات',

resources/lang/ar-SA/general.php

@@ -202,6 +202,8 @@ return [
     'new_password'          => 'كلمة المرور الجديدة',
     'next'					=> 'التالى',
     'next_audit_date'		=> 'تاريخ التدقيق التالي',
+    'next_audit_date_help'  => 'If you use auditing in your organization, this is usually automatically calculated based on the asset&apos;s last audit date and audit frequency (in <code>Admin Settings &gt; Alerts</code>) and you can leave this blank. You can manually set this date here if you need to, but it must be later than the last audit date. ',
+    'audit_images_help'     => 'You can find audit images in the asset\'s history tab.',
     'no_email'              => 'لا يوجد عنوان بريد إلكتروني مرتبط بهذا المستخدم',
     'last_audit'		    => 'آخر مراجعة',
     'new'					=> 'الجديد!',
@@ -245,6 +247,7 @@ return [
     'select_all'            => 'اختر الكل',
     'search'				=> 'بحث',
     'select_category'       => 'اختر تصنيف',
+    'select_datasource' => 'حدد سجل البيانات',
     'select_department'     => 'حدد قسم',
     'select_depreciation'	=> 'حدد نوع الاستهلاك',
     'select_location'		=> 'حدد موقعا',
@@ -294,6 +297,7 @@ return [
     'user'					=> 'المستخدم',
     'accepted'			    => 'قبلت',
     'declined'			    => 'رفض',
+    'declined_note'         => 'Declined Notes',
     'unassigned'            => 'غير مسند',
     'unaccepted_asset_report' => 'الأصول غير المقبولة',
     'users'                 => 'المستخدمين',
@@ -312,6 +316,10 @@ return [
     'token_expired'         => 'انتهت صلاحية جلسة النموذج. حاول مرة اخرى.',
     'login_enabled'         => 'تسجيل الدخول مفعل',
     'audit_due'             => 'الواجب مراجعته',
+    'audit_due_days'        => 'الأصول المستحقة للمراجعة خلال :أيام الأصول اليومية المستحقة للمراجعة خلال :أيام',
+    'checkin_due'           => 'من المقرر تسجيل الدخول',
+    'checkin_overdue'       => 'تأخر في تسجيل الدخول',
+    'checkin_due_days'      => 'الأصول المستحقة للتسجيل في غضون :أيام الأصول اليومية المستحقة للتسجيل في غضون :أيام',
     'audit_overdue'         => 'مراجعة الحسابات المتأخرة',
     'accept'                => 'قبول :asset',
     'i_accept'              => 'قبول',
@@ -507,6 +515,9 @@ return [
     'or' => 'أو',
     'url'                   => 'URL',
     'edit_fieldset' => 'تحرير حقول مجموعة الحقول والخيارات',
+    'permission_denied_superuser_demo' => 'تم رفض الإذن. لا يمكنك تحديث معلومات المستخدم للمديرين الخارقين في العرض التجريبي.',
+    'pwd_reset_not_sent' => 'المستخدم غير مفعل، أو مزامنة LDAP أو ليس لديه عنوان بريد إلكتروني',
+    'error_sending_email' => 'خطأ في إرسال البريد الإلكتروني',
     'bulk' => [
             'delete' =>
                 [

resources/lang/bg-BG/admin/hardware/message.php

@@ -4,8 +4,11 @@ return [
 
     'undeployable' 		=> '<strong>Внимание:</strong> Този актив е маркиран като невъзможен за предоставяне. Ако статусът е променен, моля обновете актива.',
     'does_not_exist' 	=> 'Активът не съществува.',
+    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
+    'no_tag' 	        => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'Актива не съществува или не може да бъде предоставян.',
     'assoc_users'	 	=> 'Активът е изписан на потребител и не може да бъде изтрит. Моля впишете го обратно и след това опитайте да го изтриете отново.',
+    'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
 
     'create' => [
         'error'   		=> 'Активът не беше създаден. Моля опитайте отново.',
@@ -16,6 +19,7 @@ return [
     'update' => [
         'error'   			=> 'Активът не беше обновен. Моля опитайте отново.',
         'success' 			=> 'Активът обновен успешно.',
+        'encrypted_warning' => 'Asset updated successfully, but encrypted custom fields were not due to permissions',
         'nothing_updated'	=>  'Няма избрани полета, съответно нищо не беше обновено.',
         'no_assets_selected'  =>  'Няма избрани активи, така че нищо не бе обновено.',
         'assets_do_not_exist_or_are_invalid' => 'Избраните активи не могат да се обновят.',
@@ -29,7 +33,7 @@ return [
     ],
 
     'audit' => [
-        'error'   		=> 'Одитът на активи бе неуспешен. Моля, опитайте отново.',
+        'error'   		=> 'Asset audit unsuccessful: :error ',
         'success' 		=> 'Активният одит бе успешно регистриран.',
     ],
 

resources/lang/bg-BG/admin/licenses/message.php

@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'Лиценза не съществува или нямата права да го видите.',
-    'user_does_not_exist' => 'Потребителят не съществува.',
+    'user_does_not_exist' => 'Потребителят не съществува или нямате разрешение да го видите.',
     'asset_does_not_exist' 	=> 'Активът, който се опитвате да свържете с този лиценз не съществува.',
     'owner_doesnt_match_asset' => 'Активът, който се опитвате да свържете с този лиценз е притежание на друго лице, различно от това, което е определено в падащия списък.',
     'assoc_users'	 => 'Този лиценз понастоящем е изписан на потребител и не може да бъде изтрит. Моля, първо впишете лиценза и тогава опитайте отново да го изтриете. ',

resources/lang/bg-BG/admin/licenses/table.php

@@ -4,6 +4,7 @@ return array(
 
     'assigned_to'   	=> 'Предоставен на',
     'checkout'   		=> 'Предоставяне',
+    'deleted_at'        => 'Изтрито в',
     'id'      			=> 'ID',
     'license_email'   	=> 'Лицензиран на Email',
     'license_name'   	=> 'Лицензиран на',

resources/lang/bg-BG/admin/settings/general.php

@@ -49,6 +49,7 @@ return [
     'default_eula_text'			=> 'EULA по подразбиране',
     'default_language'			=> 'Език по подразбиране',
     'default_eula_help_text'	=> 'Можете да асоциирате специфична EULA към всяка избрана категория.',
+    'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'Визуализиране на актив',
     'display_checkout_date'     => 'Визуализиране на дата на изписване',
     'display_eol'               => 'Визуализиране на EOL в таблиците',

resources/lang/bg-BG/admin/users/table.php

@@ -20,6 +20,7 @@ return array(
     'lock_passwords'		=> 'Настройките за вход не могат да бъдат променяни в текущата инсталация.',
     'manager' 				=> 'Ръководител',
     'managed_locations'     => 'Управлявани места',
+    'managed_users'         => 'Управлявани потребители',
     'name' 					=> 'Име',
     'nogroup'               => 'Няма създадени групи все още. За да създадете една отидете на: ',
     'notes'                 => 'Бележки',

resources/lang/bg-BG/general.php

@@ -176,7 +176,7 @@ return [
     'last_name'             => 'Фамилия',
     'license'				=> 'Лиценз',
     'license_report'        => 'Справка за лицензите',
-    'licenses_available'	=> 'налични лицензи',
+    'licenses_available'	=> 'Налични лицензи',
     'licenses'				=> 'Лицензи',
     'list_all'				=> 'Преглед на всички',
     'loading'				=> 'Зареждане... моля изчакайте....',
@@ -202,6 +202,8 @@ return [
     'new_password'          => 'Нова парола',
     'next'					=> 'Следващ',
     'next_audit_date'		=> 'Следваща дата на одита',
+    'next_audit_date_help'  => 'If you use auditing in your organization, this is usually automatically calculated based on the asset&apos;s last audit date and audit frequency (in <code>Admin Settings &gt; Alerts</code>) and you can leave this blank. You can manually set this date here if you need to, but it must be later than the last audit date. ',
+    'audit_images_help'     => 'You can find audit images in the asset\'s history tab.',
     'no_email'              => 'Няма е-майл адрес към този потребител',
     'last_audit'		    => 'Последният одит',
     'new'					=> 'new!',
@@ -245,6 +247,7 @@ return [
     'select_all'            => 'Избери Всички',
     'search'				=> 'Търсене',
     'select_category'       => 'Изберете категория',
+    'select_datasource' => 'Изберете източник на данни',
     'select_department'     => 'Изберете отдела',
     'select_depreciation'	=> 'Избор на вид амортизация',
     'select_location'		=> 'Избор на местоположение',
@@ -294,6 +297,7 @@ return [
     'user'					=> 'Потребител',
     'accepted'			    => 'приет',
     'declined'			    => 'отказан',
+    'declined_note'         => 'Declined Notes',
     'unassigned'            => 'Не е асоциирано',
     'unaccepted_asset_report' => 'Неприети активи',
     'users'                 => 'Потребители',
@@ -312,6 +316,10 @@ return [
     'token_expired'         => 'Вашата сесия за формуляр изтече. Моля опитайте отново.',
     'login_enabled'         => 'Разрешен вход',
     'audit_due'             => 'За Одит',
+    'audit_due_days'        => 'Активи, подлежащи на одит в рамките на :days Ден|Активи, подлежащи на одит в рамките на :days дни',
+    'checkin_due'           => 'Предстои проверка',
+    'checkin_overdue'       => 'Просрочен срок за регистрация',
+    'checkin_due_days'      => 'Активи, дължими за проверка в рамките на :days ден|Активи, дължими за проверка в рамките на :days дни',
     'audit_overdue'         => 'Просрочен Одит',
     'accept'                => 'Приеми :asset',
     'i_accept'              => 'Съгласен съм',
@@ -507,6 +515,9 @@ return [
     'or' => 'или',
     'url'                   => 'URL адрес',
     'edit_fieldset' => 'Редактирайте набор от полета и настройки',
+    'permission_denied_superuser_demo' => 'Разрешението е отказано. Не можете да актуализирате потребителска информация за суперадминистратори в демо версията.',
+    'pwd_reset_not_sent' => 'Потребителят не е активиран, синхронизиран е с LDAP или няма имейл адрес',
+    'error_sending_email' => 'Възникна грешка при изпращане на имейл',
     'bulk' => [
             'delete' =>
                 [

resources/lang/bg-BG/localizations.php

@@ -4,197 +4,197 @@ return [
 
     'select_language' => 'Избор на език',
     'languages' => [
-        'en-US'=> 'English, US',
+        'en-US'=> 'Английски, САЩ',
-        'en-GB'=> 'English, UK',
+        'en-GB'=> 'Английски, Великобритания',
-        'am-ET' => 'Amharic',
+        'am-ET' => 'Амхарски',
-        'af-ZA'=> 'Afrikaans',
+        'af-ZA'=> 'Африкански',
-        'ar-SA'=> 'Arabic',
+        'ar-SA'=> 'Арабски',
-        'bg-BG'=> 'Bulgarian',
+        'bg-BG'=> 'Български',
-        'zh-CN'=> 'Chinese Simplified',
+        'zh-CN'=> 'Опростен китайски',
-        'zh-TW'=> 'Chinese Traditional',
+        'zh-TW'=> 'Традиционен китайски',
-        'ca-ES' => 'Catalan',
+        'ca-ES' => 'Каталонски',
-        'hr-HR'=> 'Croatian',
+        'hr-HR'=> 'Хърватски',
-        'cs-CZ'=> 'Czech',
+        'cs-CZ'=> 'Чешки',
-        'da-DK'=> 'Danish',
+        'da-DK'=> 'Датски',
-        'nl-NL'=> 'Dutch',
+        'nl-NL'=> 'Холандски',
-        'en-ID'=> 'English, Indonesia',
+        'en-ID'=> 'Английски, Индонезия',
-        'et-EE'=> 'Estonian',
+        'et-EE'=> 'Естонски',
-        'fil-PH'=> 'Filipino',
+        'fil-PH'=> 'Филипински',
-        'fi-FI'=> 'Finnish',
+        'fi-FI'=> 'Финландски',
-        'fr-FR'=> 'French',
+        'fr-FR'=> 'Френски',
-        'de-DE'=> 'German',
+        'de-DE'=> 'Немски',
-        'de-if'=> 'German (Informal)',
+        'de-if'=> 'Немски (неофициален)',
-        'el-GR'=> 'Greek',
+        'el-GR'=> 'Гръцки',
-        'he-IL'=> 'Hebrew',
+        'he-IL'=> 'Иврит',
-        'hu-HU'=> 'Hungarian',
+        'hu-HU'=> 'Унгарски',
-        'is-IS' => 'Icelandic',
+        'is-IS' => 'Исландски',
-        'id-ID'=> 'Indonesian',
+        'id-ID'=> 'Индонезийски',
-        'ga-IE'=> 'Irish',
+        'ga-IE'=> 'Ирландски',
-        'it-IT'=> 'Italian',
+        'it-IT'=> 'Италиански',
-        'ja-JP'=> 'Japanese',
+        'ja-JP'=> 'Японски',
-        'km-KH'=>'Khmer',
+        'km-KH'=>'Кхмерски',
-        'ko-KR'=> 'Korean',
+        'ko-KR'=> 'Корейски',
-        'lt-LT'=>'Lithuanian',
+        'lt-LT'=>'Литовски',
-        'lv-LV'=> 'Latvian',
+        'lv-LV'=> 'Латвийски',
-        'mk-MK'=> 'Macedonian',
+        'mk-MK'=> 'Македонски',
-        'ms-MY'=> 'Malay',
+        'ms-MY'=> 'Малайски',
-        'mi-NZ'=> 'Maori',
+        'mi-NZ'=> 'Маори',
-        'mn-MN'=> 'Mongolian',
+        'mn-MN'=> 'Монголски',
-        'no-NO'=> 'Norwegian',
+        'no-NO'=> 'Норвежки',
-        'fa-IR'=> 'Persian',
+        'fa-IR'=> 'Персийски',
-        'pl-PL'=> 'Polish',
+        'pl-PL'=> 'Полски',
-        'pt-PT'=> 'Portuguese',
+        'pt-PT'=> 'Португалски',
-        'pt-BR'=> 'Portuguese, Brazilian',
+        'pt-BR'=> 'Португалски, Бразилия',
-        'ro-RO'=> 'Romanian',
+        'ro-RO'=> 'Румънски',
-        'ru-RU'=> 'Russian',
+        'ru-RU'=> 'Руски',
-        'sr-CS' => 'Serbian (Latin)',
+        'sr-CS' => 'Сръбски (латиница)',
-        'sk-SK'=> 'Slovak',
+        'sk-SK'=> 'Словашки',
-        'sl-SI'=> 'Slovenian',
+        'sl-SI'=> 'Словенски',
-        'so-SO'=> 'Somali',
+        'so-SO'=> 'Сомалийски',
-        'es-ES'=> 'Spanish',
+        'es-ES'=> 'Испански',
-        'es-CO'=> 'Spanish, Colombia',
+        'es-CO'=> 'Испански, Кулумбия',
-        'es-MX'=> 'Spanish, Mexico',
+        'es-MX'=> 'Испански, Мексико',
-        'es-VE'=> 'Spanish, Venezuela',
+        'es-VE'=> 'Испански, Венецуела',
-        'sv-SE'=> 'Swedish',
+        'sv-SE'=> 'Шведски',
-        'tl-PH'=> 'Tagalog',
+        'tl-PH'=> 'Тагалог',
-        'ta-IN'=> 'Tamil',
+        'ta-IN'=> 'Тамилски',
-        'th-TH'=> 'Thai',
+        'th-TH'=> 'Тайландски',
-        'tr-TR'=> 'Turkish',
+        'tr-TR'=> 'Турски',
-        'uk-UA'=> 'Ukranian',
+        'uk-UA'=> 'Украински',
-        'vi-VN'=> 'Vietnamese',
+        'vi-VN'=> 'Виетнамски',
-        'cy-GB'=> 'Welsh',
+        'cy-GB'=> 'Уелски',
-        'zu-ZA'=> 'Zulu',
+        'zu-ZA'=> 'Зулу',
     ],
 
-    'select_country' => 'Select a country',
+    'select_country' => 'Изберете държава',
     
     'countries' => [
-        'AC'=>'Ascension Island',
+        'AC'=>'Остров Възнесение',
-        'AD'=>'Andorra',
+        'AD'=>'Андора',
-        'AE'=>'United Arab Emirates',
+        'AE'=>'Обединени арабски емирства',
-        'AF'=>'Afghanistan',
+        'AF'=>'Авганистан',
-        'AG'=>'Antigua And Barbuda',
+        'AG'=>'Антигуа и Барбуда',
-        'AI'=>'Anguilla',
+        'AI'=>'Ангуила',
-        'AL'=>'Albania',
+        'AL'=>'Албания',
-        'AM'=>'Armenia',
+        'AM'=>'Армения',
-        'AN'=>'Netherlands Antilles',
+        'AN'=>'Холандски Антили',
-        'AO'=>'Angola',
+        'AO'=>'Ангола',
-        'AQ'=>'Antarctica',
+        'AQ'=>'Антарктика',
-        'AR'=>'Argentina',
+        'AR'=>'Аржентина',
-        'AS'=>'American Samoa',
+        'AS'=>'Американска Самоа',
-        'AT'=>'Austria',
+        'AT'=>'Австрия',
-        'AU'=>'Australia',
+        'AU'=>'Австралия',
-        'AW'=>'Aruba',
+        'AW'=>'Аруба',
-        'AX'=>'Ã…land',
+        'AX'=>'Ã…земя',
-        'AZ'=>'Azerbaijan',
+        'AZ'=>'Азербайджан',
-        'BA'=>'Bosnia And Herzegovina',
+        'BA'=>'Босна и Херцеговина',
-        'BB'=>'Barbados',
+        'BB'=>'Барбадос',
-        'BE'=>'Belgium',
+        'BE'=>'Белгия',
-        'BD'=>'Bangladesh',
+        'BD'=>'Бангладеш',
-        'BF'=>'Burkina Faso',
+        'BF'=>'Буркина Фасо',
-        'BG'=>'Bulgaria',
+        'BG'=>'България',
-        'BH'=>'Bahrain',
+        'BH'=>'Бахрейн',
-        'BI'=>'Burundi',
+        'BI'=>'Бурунди',
-        'BJ'=>'Benin',
+        'BJ'=>'Бенин',
-        'BM'=>'Bermuda',
+        'BM'=>'Бермуда',
-        'BN'=>'Brunei Darussalam',
+        'BN'=>'Бруней Даруссалам',
-        'BO'=>'Bolivia',
+        'BO'=>'Боливия',
-        'BR'=>'Brazil',
+        'BR'=>'Бразилия',
-        'BS'=>'Bahamas',
+        'BS'=>'Бахамите',
-        'BT'=>'Bhutan',
+        'BT'=>'Бутан',
-        'BV'=>'Bouvet Island',
+        'BV'=>'Остров Буве',
-        'BW'=>'Botswana',
+        'BW'=>'Ботсвана',
-        'BY'=>'Belarus',
+        'BY'=>'Беларус',
-        'BZ'=>'Belize',
+        'BZ'=>'Белиз',
-        'CA'=>'Canada',
+        'CA'=>'Канада',
-        'CC'=>'Cocos (Keeling) Islands',
+        'CC'=>'Кокосови (Кийлинг) острови',
-        'CD'=>'Congo (Democratic Republic)',
+        'CD'=>'Конго (демократична република)',
-        'CF'=>'Central African Republic',
+        'CF'=>'Централноафриканска република',
-        'CG'=>'Congo (Republic)',
+        'CG'=>'Конго (република)',
-        'CH'=>'Switzerland',
+        'CH'=>'Швейцария',
-        'CI'=>'Côte d\'Ivoire',
+        'CI'=>'Бряг на слоновата кост',
-        'CK'=>'Cook Islands',
+        'CK'=>'Острови Кук',
-        'CL'=>'Chile',
+        'CL'=>'Чиле',
-        'CM'=>'Cameroon',
+        'CM'=>'Камерун',
-        'CN'=>'People\'s Republic of China',
+        'CN'=>'Китайска народна република',
-        'CO'=>'Colombia',
+        'CO'=>'Колумбия',
-        'CR'=>'Costa Rica',
+        'CR'=>'Коста Рика',
-        'CU'=>'Cuba',
+        'CU'=>'Куба',
-        'CV'=>'Cape Verde',
+        'CV'=>'Кабо Верде',
-        'CX'=>'Christmas Island',
+        'CX'=>'Коледен остров',
-        'CY'=>'Cyprus',
+        'CY'=>'Кипър',
-        'CZ'=>'Czech Republic',
+        'CZ'=>'Чехия',
-        'DE'=>'Germany',
+        'DE'=>'Германия',
-        'DJ'=>'Djibouti',
+        'DJ'=>'Джибути',
-        'DK'=>'Denmark',
+        'DK'=>'Дания',
-        'DM'=>'Dominica',
+        'DM'=>'Доминика',
-        'DO'=>'Dominican Republic',
+        'DO'=>'Доминиканска република',
-        'DZ'=>'Algeria',
+        'DZ'=>'Алжир',
-        'EC'=>'Ecuador',
+        'EC'=>'Еквадор',
-        'EE'=>'Estonia',
+        'EE'=>'Естония',
-        'EG'=>'Egypt',
+        'EG'=>'Египет',
-        'ER'=>'Eritrea',
+        'ER'=>'Еритрея',
-        'ES'=>'Spain',
+        'ES'=>'Испания',
-        'ET'=>'Ethiopia',
+        'ET'=>'Етиопия',
-        'EU'=>'European Union',
+        'EU'=>'Европейски съюз',
-        'FI'=>'Finland',
+        'FI'=>'Финландия',
-        'FJ'=>'Fiji',
+        'FJ'=>'Фиджи',
-        'FK'=>'Falkland Islands (Malvinas)',
+        'FK'=>'Фолкландски (Малвински) острови',
-        'FM'=>'Micronesia, Federated States Of',
+        'FM'=>'Микронезия, Федерални щати',
-        'FO'=>'Faroe Islands',
+        'FO'=>'Фарьорските острови',
-        'FR'=>'France',
+        'FR'=>'Франция',
-        'GA'=>'Gabon',
+        'GA'=>'Габон',
-        'GD'=>'Grenada',
+        'GD'=>'Гренада',
-        'GE'=>'Georgia',
+        'GE'=>'Грузия',
-        'GF'=>'French Guiana',
+        'GF'=>'Френска Гвиана',
-        'GG'=>'Guernsey',
+        'GG'=>'Гърнси',
-        'GH'=>'Ghana',
+        'GH'=>'Гана',
-        'GI'=>'Gibraltar',
+        'GI'=>'Гибралтар',
-        'GL'=>'Greenland',
+        'GL'=>'Гренландия',
-        'GM'=>'Gambia',
+        'GM'=>'Гамбия',
-        'GN'=>'Guinea',
+        'GN'=>'Гвинея',
-        'GP'=>'Guadeloupe',
+        'GP'=>'Гваделупа',
-        'GQ'=>'Equatorial Guinea',
+        'GQ'=>'Екваториална Гвинея',
-        'GR'=>'Greece',
+        'GR'=>'Гърция',
-        'GS'=>'South Georgia And The South Sandwich Islands',
+        'GS'=>'Южна Джорджия и Южните Сандвичеви острови',
-        'GT'=>'Guatemala',
+        'GT'=>'Гватемала',
-        'GU'=>'Guam',
+        'GU'=>'Гуам',
-        'GW'=>'Guinea-Bissau',
+        'GW'=>'Гвинея-Бисау',
-        'GY'=>'Guyana',
+        'GY'=>'Хърд и островите Макдоналд',
-        'HK'=>'Hong Kong',
+        'HK'=>'Хонг Конг',
-        'HM'=>'Heard And Mc Donald Islands',
+        'HM'=>'Хърд и островите Макдоналд',
-        'HN'=>'Honduras',
+        'HN'=>'Хондурас',
-        'HR'=>'Croatia (local name: Hrvatska)',
+        'HR'=>'Хърватия (местно име: Hrvatska)',
-        'HT'=>'Haiti',
+        'HT'=>'Хаити',
-        'HU'=>'Hungary',
+        'HU'=>'Унгария',
-        'ID'=>'Indonesia',
+        'ID'=>'Индонезия',
-        'IE'=>'Ireland',
+        'IE'=>'Ирландия',
-        'IL'=>'Israel',
+        'IL'=>'Израел',
-        'IM'=>'Isle of Man',
+        'IM'=>'Остров Ман',
-        'IN'=>'India',
+        'IN'=>'Индия',
-        'IO'=>'British Indian Ocean Territory',
+        'IO'=>'Британска територия в Индийския океан',
-        'IQ'=>'Iraq',
+        'IQ'=>'Ирак',
-        'IR'=>'Iran, Islamic Republic Of',
+        'IR'=>'Иран, Ислямска република',
-        'IS'=>'Iceland',
+        'IS'=>'Исландия',
-        'IT'=>'Italy',
+        'IT'=>'Италия',
-        'JE'=>'Jersey',
+        'JE'=>'Джърси',
-        'JM'=>'Jamaica',
+        'JM'=>'Ямайка',
-        'JO'=>'Jordan',
+        'JO'=>'Йордания',
-        'JP'=>'Japan',
+        'JP'=>'Япония',
-        'KE'=>'Kenya',
+        'KE'=>'Кения',
-        'KG'=>'Kyrgyzstan',
+        'KG'=>'Киргистан',
-        'KH'=>'Cambodia',
+        'KH'=>'Камбоджа',
-        'KI'=>'Kiribati',
+        'KI'=>'Кирибати',
-        'KM'=>'Comoros',
+        'KM'=>'Коморски острови',
-        'KN'=>'Saint Kitts And Nevis',
+        'KN'=>'Сейнт Китс и Невис',
-        'KR'=>'Korea, Republic Of',
+        'KR'=>'Корея, Република',
-        'KW'=>'Kuwait',
+        'KW'=>'Кувейт',
-        'KY'=>'Cayman Islands',
+        'KY'=>'Кайманови острови',
-        'KZ'=>'Kazakhstan',
+        'KZ'=>'Казахстан',
         'LA'=>'Lao People\'s Democratic Republic',
-        'LB'=>'Lebanon',
+        'LB'=>'Ливан',
-        'LC'=>'Saint Lucia',
+        'LC'=>'Сейнт Лусия',
-        'LI'=>'Liechtenstein',
+        'LI'=>'Лихтенщайн',
         'LK'=>'Sri Lanka',
         'LR'=>'Liberia',
         'LS'=>'Lesotho',
@@ -212,13 +212,13 @@ return [
         'ML'=>'Mali',
         'MM'=>'Myanmar',
         'MN'=>'Mongolia',
-        'MO'=>'Macau',
+        'MO'=>'Макао',
-        'MP'=>'Northern Mariana Islands',
+        'MP'=>'Северни Мариански острови',
-        'MQ'=>'Martinique',
+        'MQ'=>'Мартиника',
-        'MR'=>'Mauritania',
+        'MR'=>'Мавритания',
-        'MS'=>'Montserrat',
+        'MS'=>'Монсерат',
-        'MT'=>'Malta',
+        'MT'=>'Малта',
-        'MU'=>'Mauritius',
+        'MU'=>'Мавриций',
         'MV'=>'Maldives',
         'MW'=>'Malawi',
         'MX'=>'Mexico',
@@ -227,53 +227,53 @@ return [
         'NA'=>'Namibia',
         'NC'=>'New Caledonia',
         'NE'=>'Niger',
-        'NF'=>'Norfolk Island',
+        'NF'=>'Остров Норфолк',
-        'NG'=>'Nigeria',
+        'NG'=>'Нигерия',
-        'NI'=>'Nicaragua',
+        'NI'=>'Никарагуа',
-        'NL'=>'Netherlands',
+        'NL'=>'Холандия',
-        'NO'=>'Norway',
+        'NO'=>'Норвегия',
-        'NP'=>'Nepal',
+        'NP'=>'Непал',
-        'NR'=>'Nauru',
+        'NR'=>'Науру',
-        'NU'=>'Niue',
+        'NU'=>'Ниуе',
         'NZ'=>'New Zealand',
-        'OM'=>'Oman',
+        'OM'=>'Оман',
-        'PA'=>'Panama',
+        'PA'=>'Панама',
-        'PE'=>'Peru',
+        'PE'=>'Перу',
-        'PF'=>'French Polynesia',
+        'PF'=>'Френска Полинезия',
-        'PG'=>'Papua New Guinea',
+        'PG'=>'Папуа - Нова Гвинея',
-        'PH'=>'Philippines, Republic of the',
+        'PH'=>'Филипини, Република',
-        'PK'=>'Pakistan',
+        'PK'=>'Пакистан',
-        'PL'=>'Poland',
+        'PL'=>'Полша',
-        'PM'=>'St. Pierre And Miquelon',
+        'PM'=>'Сен Пиер и Микелон',
-        'PN'=>'Pitcairn',
+        'PN'=>'Питкерн',
-        'PR'=>'Puerto Rico',
+        'PR'=>'Пуерто Рико',
-        'PS'=>'Palestine',
+        'PS'=>'Палестина',
-        'PT'=>'Portugal',
+        'PT'=>'Португалия',
-        'PW'=>'Palau',
+        'PW'=>'Палау',
-        'PY'=>'Paraguay',
+        'PY'=>'Парагвай',
-        'QA'=>'Qatar',
+        'QA'=>'Катар',
-        'RE'=>'Reunion',
+        'RE'=>'Обединение',
-        'RO'=>'Romania',
+        'RO'=>'Румъния',
-        'RS'=>'Serbia',
+        'RS'=>'Сърбия',
-        'RU'=>'Russian Federation',
+        'RU'=>'Руска федерация',
-        'RW'=>'Rwanda',
+        'RW'=>'Руанда',
-        'SA'=>'Saudi Arabia',
+        'SA'=>'Саудитска Арабия',
-        'UK'=>'Scotland',
+        'UK'=>'Шотландия',
-        'SB'=>'Solomon Islands',
+        'SB'=>'Соломонови острови',
-        'SC'=>'Seychelles',
+        'SC'=>'Сейшелските острови',
-        'SS'=>'South Sudan',
+        'SS'=>'Южен Судан',
-        'SD'=>'Sudan',
+        'SD'=>'Судан',
-        'SE'=>'Sweden',
+        'SE'=>'Швеция',
-        'SG'=>'Singapore',
+        'SG'=>'Сингапур',
-        'SH'=>'St. Helena',
+        'SH'=>'Св. Елена',
-        'SI'=>'Slovenia',
+        'SI'=>'Словения',
-        'SJ'=>'Svalbard And Jan Mayen Islands',
+        'SJ'=>'Острови Свалбард и Ян Майен',
-        'SK'=>'Slovakia (Slovak Republic)',
+        'SK'=>'Словакия (Словашка република)',
-        'SL'=>'Sierra Leone',
+        'SL'=>'Сиера Леоне',
         'SM'=>'San Marino',
         'SN'=>'Senegal',
         'SO'=>'Somalia',
-        'SR'=>'Suriname',
+        'SR'=>'Суринам',
         'ST'=>'Sao Tome And Principe',
         'SU'=>'Soviet Union',
         'SV'=>'El Salvador',
@@ -293,13 +293,13 @@ return [
         'TP'=>'East Timor (old code)',
         'TR'=>'Turkey',
         'TT'=>'Trinidad And Tobago',
-        'TV'=>'Tuvalu',
+        'TV'=>'Тувалу',
-        'TW'=>'Taiwan',
+        'TW'=>'Тайван',
-        'TZ'=>'Tanzania, United Republic Of',
+        'TZ'=>'Обединена република Танзания',
-        'UA'=>'Ukraine',
+        'UA'=>'Украйна',
-        'UG'=>'Uganda',
+        'UG'=>'Уганда',
-        'UK'=>'United Kingdom',
+        'UK'=>'Великобритания',
-        'US'=>'United States',
+        'US'=>'САЩ',
         'UM'=>'United States Minor Outlying Islands',
         'UY'=>'Uruguay',
         'UZ'=>'Uzbekistan',
@@ -312,10 +312,10 @@ return [
         'VU'=>'Vanuatu',
         'WF'=>'Wallis And Futuna Islands',
         'WS'=>'Samoa',
-        'YE'=>'Yemen',
+        'YE'=>'Йемен',
-        'YT'=>'Mayotte',
+        'YT'=>'Майот',
-        'ZA'=>'South Africa',
+        'ZA'=>'Южна Африка',
-        'ZM'=>'Zambia',
+        'ZM'=>'Замбия',
-        'ZW'=>'Zimbabwe',
+        'ZW'=>'Зимбабве',
     ],
 ];

resources/lang/bg-BG/validation.php

@@ -105,8 +105,8 @@ return [
     'gte'                  => [
         'numeric'          => 'Стойността не може да бъде отрицателна'
     ],
-    'checkboxes'           => ':attribute contains invalid options.',
+    'checkboxes'           => ':attribute съдържа невалидни опции.',
-    'radio_buttons'        => ':attribute is invalid.',
+    'radio_buttons'        => ':attribute е невалиден.',
 
 
     /*
@@ -158,5 +158,5 @@ return [
     | Generic Validation Messages
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Invalid value included in this field',
+    'invalid_value_in_field' => 'В това поле е включена невалидна стойност',
 ];

resources/lang/ca-ES/admin/hardware/message.php

@@ -5,8 +5,11 @@ return [
     'undeployable' 		=> '<strong>Warning: </strong> This asset has been marked as currently undeployable.
                         If this status has changed, please update the asset status.',
     'does_not_exist' 	=> 'Asset does not exist.',
+    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
+    'no_tag' 	        => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'That asset does not exist or is not requestable.',
     'assoc_users'	 	=> 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ',
+    'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
 
     'create' => [
         'error'   		=> 'Asset was not created, please try again. :(',
@@ -17,6 +20,7 @@ return [
     'update' => [
         'error'   			=> 'Asset was not updated, please try again',
         'success' 			=> 'Asset updated successfully.',
+        'encrypted_warning' => 'Asset updated successfully, but encrypted custom fields were not due to permissions',
         'nothing_updated'	=>  'No fields were selected, so nothing was updated.',
         'no_assets_selected'  =>  'No assets were selected, so nothing was updated.',
         'assets_do_not_exist_or_are_invalid' => 'Selected assets cannot be updated.',
@@ -30,7 +34,7 @@ return [
     ],
 
     'audit' => [
-        'error'   		=> 'Asset audit was unsuccessful. Please try again.',
+        'error'   		=> 'Asset audit unsuccessful: :error ',
         'success' 		=> 'Asset audit successfully logged.',
     ],
 

resources/lang/ca-ES/admin/licenses/message.php

@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'License does not exist or you do not have permission to view it.',
-    'user_does_not_exist' => 'User does not exist.',
+    'user_does_not_exist' => 'User does not exist or you do not have permission to view them.',
     'asset_does_not_exist' 	=> 'The asset you are trying to associate with this license does not exist.',
     'owner_doesnt_match_asset' => 'The asset you are trying to associate with this license is owned by somene other than the person selected in the assigned to dropdown.',
     'assoc_users'	 => 'This license is currently checked out to a user and cannot be deleted. Please check the license in first, and then try deleting again. ',

resources/lang/ca-ES/admin/licenses/table.php

@@ -4,6 +4,7 @@ return array(
 
     'assigned_to'   	=> 'Assigned To',
     'checkout'   		=> 'In/Out',
+    'deleted_at'        => 'Deleted at',
     'id'      			=> 'ID',
     'license_email'   	=> 'License Email',
     'license_name'   	=> 'Licensed To',

resources/lang/ca-ES/admin/settings/general.php

@@ -49,6 +49,7 @@ return [
     'default_eula_text'			=> 'Default EULA',
     'default_language'			=> 'Default Language',
     'default_eula_help_text'	=> 'You can also associate custom EULAs to specific asset categories.',
+    'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'Display Asset Name',
     'display_checkout_date'     => 'Display Checkout Date',
     'display_eol'               => 'Display EOL in table view',

resources/lang/ca-ES/admin/users/table.php

@@ -20,6 +20,7 @@ return array(
     'lock_passwords'		=> 'Login details cannot be changed on this installation.',
     'manager' 				=> 'Manager',
     'managed_locations'     => 'Managed Locations',
+    'managed_users'         => 'Managed Users',
     'name' 					=> 'Name',
     'nogroup'               => 'No groups have been created yet. To add one, visit: ',
     'notes'                 => 'Notes',

resources/lang/ca-ES/general.php

@@ -176,7 +176,7 @@ return [
     'last_name'             => 'Last Name',
     'license'				=> 'License',
     'license_report'        => 'License Report',
-    'licenses_available'	=> 'licenses available',
+    'licenses_available'	=> 'Licenses available',
     'licenses'				=> 'Licenses',
     'list_all'				=> 'List All',
     'loading'				=> 'Loading... please wait....',
@@ -202,6 +202,8 @@ return [
     'new_password'          => 'New Password',
     'next'					=> 'Next',
     'next_audit_date'		=> 'Next Audit Date',
+    'next_audit_date_help'  => 'If you use auditing in your organization, this is usually automatically calculated based on the asset&apos;s last audit date and audit frequency (in <code>Admin Settings &gt; Alerts</code>) and you can leave this blank. You can manually set this date here if you need to, but it must be later than the last audit date. ',
+    'audit_images_help'     => 'You can find audit images in the asset\'s history tab.',
     'no_email'              => 'No email address associated with this user',
     'last_audit'		    => 'Last Audit',
     'new'					=> 'new!',
@@ -245,6 +247,7 @@ return [
     'select_all'            => 'Select All',
     'search'				=> 'Search',
     'select_category'       => 'Select a Category',
+    'select_datasource' => 'Select a Datasource',
     'select_department'     => 'Select a Department',
     'select_depreciation'	=> 'Select a Depreciation Type',
     'select_location'		=> 'Select a Location',
@@ -294,6 +297,7 @@ return [
     'user'					=> 'User',
     'accepted'			    => 'accepted',
     'declined'			    => 'declined',
+    'declined_note'         => 'Declined Notes',
     'unassigned'            => 'Unassigned',
     'unaccepted_asset_report' => 'Recursos no Acceptats',
     'users'                 => 'Users',
@@ -312,6 +316,10 @@ return [
     'token_expired'         => 'Your form session has expired. Please try again.',
     'login_enabled'         => 'Login Enabled',
     'audit_due'             => 'Due for Audit',
+    'audit_due_days'        => 'Assets Due for Audit Within :days Day|Assets Due for Audit Within :days Days',
+    'checkin_due'           => 'Due for Checkin',
+    'checkin_overdue'       => 'Overdue for Checkin',
+    'checkin_due_days'      => 'Assets Due for Checkin Within :days Day|Assets Due for Checkin Within :days Days',
     'audit_overdue'         => 'Overdue for Audit',
     'accept'                => 'Acceptar :recurs',
     'i_accept'              => 'I accept',
@@ -507,6 +515,9 @@ return [
     'or' => 'or',
     'url'                   => 'URL',
     'edit_fieldset' => 'Edit fieldset fields and options',
+    'permission_denied_superuser_demo' => 'Permission denied. You cannot update user information for superadmins on the demo.',
+    'pwd_reset_not_sent' => 'User is not activated, is LDAP synced, or does not have an email address',
+    'error_sending_email' => 'Error sending email',
     'bulk' => [
             'delete' =>
                 [

resources/lang/cs-CZ/admin/hardware/message.php

@@ -5,8 +5,11 @@ return [
     'undeployable' 		=> '<strong>Varování:</strong> Toto zařízení bylo označeno jako momentálně nepřiřaditelné.
                         Pokud se na jeho stavu něco změnilo, upravte jej.',
     'does_not_exist' 	=> 'Majetek nenalezen.',
+    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
+    'no_tag' 	        => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'Tento majetek neexistuje nebo jej nelze vyskladnit.',
     'assoc_users'	 	=> 'Majetek je předán svému uživateli a nelze jej odstranit. Před odstraněním jej nejprve převezměte. ',
+    'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
 
     'create' => [
         'error'   		=> 'Majetek se nepodařilo vytvořit, zkuste to prosím znovu.',
@@ -17,6 +20,7 @@ return [
     'update' => [
         'error'   			=> 'Majetek se nepodařilo upravit, zkuste to prosím znovu',
         'success' 			=> 'Majetek úspěšně aktualizován.',
+        'encrypted_warning' => 'Majetek byl úspěšně aktualizován, ale šifrovaná vlastní pole nebyla způsobena oprávněním',
         'nothing_updated'	=>  'Nebyla zvolena žádná pole, nic se tedy neupravilo.',
         'no_assets_selected'  =>  'Nebyl zvolen žádný majetek, nic se tedy neupravilo.',
         'assets_do_not_exist_or_are_invalid' => 'Vybrané položky nelze aktualizovat.',
@@ -30,7 +34,7 @@ return [
     ],
 
     'audit' => [
-        'error'   		=> 'Audit majetku byl neúspěšný. Prosím zkuste to znovu.',
+        'error'   		=> 'Asset audit unsuccessful: :error ',
         'success' 		=> 'Audit aktiv byl úspěšně zaznamenáván.',
     ],
 

resources/lang/cs-CZ/admin/licenses/message.php

@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'Licence neexistuje nebo nemáte oprávnění k jejímu zobrazení.',
-    'user_does_not_exist' => 'Uživatel neexistuje.',
+    'user_does_not_exist' => 'Uživatel neexistuje nebo nemáte oprávnění k jeho zobrazení.',
     'asset_does_not_exist' 	=> 'Majetek, který se pokoušíte spojit s touto licencí, neexistuje.',
     'owner_doesnt_match_asset' => 'Majetek, který se pokoušíte spojit s touto licencí, vlastní někdo jiný než osoba vybraná v rozbalovací nabídce k této licenci.',
     'assoc_users'	 => 'Licence je předána svému uživateli a nelze ji odstranit. Před odstraněním ji nejprve převezměte. ',

resources/lang/cs-CZ/admin/licenses/table.php

@@ -4,6 +4,7 @@ return array(
 
     'assigned_to'   	=> 'Přiděleno',
     'checkout'   		=> 'Stav',
+    'deleted_at'        => 'Smazáno v',
     'id'      			=> 'ID',
     'license_email'   	=> 'E-mail',
     'license_name'   	=> 'Registrováno na',

resources/lang/cs-CZ/admin/settings/general.php

@@ -49,6 +49,7 @@ return [
     'default_eula_text'			=> 'Výchozí EULA',
     'default_language'			=> 'Výchozí jazyk',
     'default_eula_help_text'	=> 'Můžete také spojit vlastní EULA se specifickými kategoriemi majetku.',
+    'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'Zobrazit název majetku',
     'display_checkout_date'     => 'Zobrazit den převzetí',
     'display_eol'               => 'Zobrazit EOL v tabulkovém zobrazení',

resources/lang/cs-CZ/admin/users/table.php

@@ -20,6 +20,7 @@ return array(
     'lock_passwords'		=> 'Přihlašovací údaje nelze v této instalaci měnit.',
     'manager' 				=> 'Nadřízený',
     'managed_locations'     => 'Spravovaná místa',
+    'managed_users'         => 'Spravovaní uživatelé',
     'name' 					=> 'Položka',
     'nogroup'               => 'Zatím nebyly vytvořeny žádné skupiny. Chcete-li přidat jednu skupinu, navštivte: ',
     'notes'                 => 'Poznámky',

resources/lang/cs-CZ/general.php

@@ -176,7 +176,7 @@ return [
     'last_name'             => 'Příjmení',
     'license'				=> 'Licence',
     'license_report'        => 'Report licencí',
-    'licenses_available'	=> 'dostupných licencí',
+    'licenses_available'	=> 'Dostupné licence',
     'licenses'				=> 'Licence',
     'list_all'				=> 'Vypsat vše',
     'loading'				=> 'Načítání, čekejte prosím...',
@@ -202,6 +202,8 @@ return [
     'new_password'          => 'Nové heslo',
     'next'					=> 'Další',
     'next_audit_date'		=> 'Další datum auditu',
+    'next_audit_date_help'  => 'If you use auditing in your organization, this is usually automatically calculated based on the asset&apos;s last audit date and audit frequency (in <code>Admin Settings &gt; Alerts</code>) and you can leave this blank. You can manually set this date here if you need to, but it must be later than the last audit date. ',
+    'audit_images_help'     => 'You can find audit images in the asset\'s history tab.',
     'no_email'              => 'K tomuto uživateli není přiřazena žádná e-mailová adresa',
     'last_audit'		    => 'Poslední audit',
     'new'					=> 'nový!',
@@ -245,6 +247,7 @@ return [
     'select_all'            => 'Vybrat vše',
     'search'				=> 'Hledat',
     'select_category'       => 'Vyberte kategorii',
+    'select_datasource' => 'Vyberte datový soubor',
     'select_department'     => 'Vyberte Oddělení',
     'select_depreciation'	=> 'Zvolit typ amortizace',
     'select_location'		=> 'Zvolit místo',
@@ -294,6 +297,7 @@ return [
     'user'					=> 'Uživatel',
     'accepted'			    => 'přijato',
     'declined'			    => 'zamítnuto',
+    'declined_note'         => 'Declined Notes',
     'unassigned'            => 'Nepřiřazeno',
     'unaccepted_asset_report' => 'Nepřijatelné majetky',
     'users'                 => 'Uživatelé',
@@ -312,6 +316,10 @@ return [
     'token_expired'         => 'Platnost relace formuláře vypršela. Prosím zkuste to znovu.',
     'login_enabled'         => 'Přihlášení povoleno',
     'audit_due'             => 'Ke inventuře',
+    'audit_due_days'        => 'Majetky splatné k auditu během :day|Majetky k auditu během :dní',
+    'checkin_due'           => 'Kvůli přihlášení',
+    'checkin_overdue'       => 'Po termínu pro přihlášení',
+    'checkin_due_days'      => 'Majetky splatné pro kontrolu během :day|Majetky pro kontrolu během :dní',
     'audit_overdue'         => 'Po termínu inventury',
     'accept'                => 'Přijmout :asset',
     'i_accept'              => 'Přijímám',
@@ -507,6 +515,9 @@ return [
     'or' => 'nebo',
     'url'                   => 'URL',
     'edit_fieldset' => 'Upravit pole a možnosti sady polí',
+    'permission_denied_superuser_demo' => 'Oprávnění bylo odepřeno. Nemůžete aktualizovat informace o uživateli pro superadminy na demo.',
+    'pwd_reset_not_sent' => 'Uživatel není aktivován, LDAP je synchronizován, nebo nemá e-mailovou adresu',
+    'error_sending_email' => 'Chyba při odesílání e-mailu',
     'bulk' => [
             'delete' =>
                 [

resources/lang/cy-GB/admin/hardware/message.php

@@ -5,8 +5,11 @@ return [
     'undeployable' 		=> '<strong> Rhybudd: </strong> Mae\'r ased hwn wedi\'i nodi fel un na ellir ei ddefnyddio ar hyn o bryd.
                         Os yw\'r statws hwn wedi newid, diweddarwch statws yr ased.',
     'does_not_exist' 	=> 'Nid yw\'r ased yn bodoli.',
+    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
+    'no_tag' 	        => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'That asset does not exist or is not requestable.',
     'assoc_users'	 	=> 'Ar hyn o bryd mae\'r ased yma allan gan ddefnyddiwr ac ni ellir ei ddileu. Cofnodwch yr ased yn ol i fewn yn gyntaf, ac yna ceisiwch ei ddileu eto. ',
+    'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
 
     'create' => [
         'error'   		=> 'Ni crewyd yr ased, ceisiwch eto o. g. y. dd. :(',
@@ -17,6 +20,7 @@ return [
     'update' => [
         'error'   			=> 'Ni diweddarwyd yr assed, ceisiwch eto o. g. y. dd',
         'success' 			=> 'Ased wedi diweddaru\'n llwyddiannus.',
+        'encrypted_warning' => 'Asset updated successfully, but encrypted custom fields were not due to permissions',
         'nothing_updated'	=>  'Dim newid mewn manylder, felly dim byd wedi\'i diweddaru.',
         'no_assets_selected'  =>  'No assets were selected, so nothing was updated.',
         'assets_do_not_exist_or_are_invalid' => 'Selected assets cannot be updated.',
@@ -30,7 +34,7 @@ return [
     ],
 
     'audit' => [
-        'error'   		=> 'Roedd archwiliad asedau yn aflwyddiannus. Ceisiwch eto o. g. y. dd.',
+        'error'   		=> 'Asset audit unsuccessful: :error ',
         'success' 		=> 'Cofnodwyd archwiliad asedau yn llwyddiannus.',
     ],
 

resources/lang/cy-GB/admin/licenses/message.php

@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'License does not exist or you do not have permission to view it.',
-    'user_does_not_exist' => 'Nid yw\'r defnyddiwr yn bodoli.',
+    'user_does_not_exist' => 'User does not exist or you do not have permission to view them.',
     'asset_does_not_exist' 	=> 'Nid yw\'r ased rydych yn ceisio perthnasu i\'r trwydded yma yn bodoli.',
     'owner_doesnt_match_asset' => 'Nid y defnyddiwr sydd wedi nodi yw perchenog yr ased rydych yn ceisio perthnasu ir trwydded yma.',
     'assoc_users'	 => 'Ar hyn o bryd mae\'r trwydded yma allan gan ddefnyddiwr ac ni ellir ei ddileu. Cofnodwch yr trwyddedyn ol i fewn yn gyntaf, ac yna ceisiwch ei ddileu eto. ',

resources/lang/cy-GB/admin/licenses/table.php

@@ -4,6 +4,7 @@ return array(
 
     'assigned_to'   	=> 'Wedi Neilltuo i',
     'checkout'   		=> 'Mewn/Allan',
+    'deleted_at'        => 'Deleted at',
     'id'      			=> 'Rhif Unigryw',
     'license_email'   	=> 'Ebost wedi trwyddedu',
     'license_name'   	=> 'Wedi Trwyddedi',

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

@@ -49,6 +49,7 @@ return [
     'default_eula_text'			=> 'CGTG Diofyn',
     'default_language'			=> 'Iaith Diofyn',
     'default_eula_help_text'	=> 'Yn ogystal, fedrwch perthnasu CTDT yn erbyn asedau penodol.',
+    'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'Dangos Enw Ased',
     'display_checkout_date'     => 'Dangos Dyddiad Allan',
     'display_eol'               => 'Dangos DB yn y tabl',

resources/lang/cy-GB/admin/users/table.php

@@ -20,6 +20,7 @@ return array(
     'lock_passwords'		=> 'Nid yw\'n bosib newid manylion mewngofnodi ar y system yma.',
     'manager' 				=> 'Rheolwr',
     'managed_locations'     => 'Lleoliadau a Reolir',
+    'managed_users'         => 'Managed Users',
     'name' 					=> 'Enw',
     'nogroup'               => 'No groups have been created yet. To add one, visit: ',
     'notes'                 => 'Nodiadau',

resources/lang/cy-GB/general.php

@@ -176,7 +176,7 @@ return [
     'last_name'             => 'Enw Olaf',
     'license'				=> 'Trwydded',
     'license_report'        => 'Adroddiad Trwydded',
-    'licenses_available'	=> 'trwyddedau ar gael',
+    'licenses_available'	=> 'Licenses available',
     'licenses'				=> 'Trwyddedau',
     'list_all'				=> 'Rhestru holl',
     'loading'				=> 'Loading... please wait....',
@@ -202,6 +202,8 @@ return [
     'new_password'          => 'New Password',
     'next'					=> 'Nesaf',
     'next_audit_date'		=> 'Dyddiad awdit nesaf',
+    'next_audit_date_help'  => 'If you use auditing in your organization, this is usually automatically calculated based on the asset&apos;s last audit date and audit frequency (in <code>Admin Settings &gt; Alerts</code>) and you can leave this blank. You can manually set this date here if you need to, but it must be later than the last audit date. ',
+    'audit_images_help'     => 'You can find audit images in the asset\'s history tab.',
     'no_email'              => 'No email address associated with this user',
     'last_audit'		    => 'Awdit diwethaf',
     'new'					=> 'newydd!',
@@ -245,6 +247,7 @@ return [
     'select_all'            => 'Dewis Popeth',
     'search'				=> 'Chwilio',
     'select_category'       => 'Dewis Categorï',
+    'select_datasource' => 'Select a Datasource',
     'select_department'     => 'Dewsi Adran',
     'select_depreciation'	=> 'Dewis math o dibrisiant',
     'select_location'		=> 'Dewis lleoliad',
@@ -294,6 +297,7 @@ return [
     'user'					=> 'Defnyddiwr',
     'accepted'			    => 'derbynnir',
     'declined'			    => 'gwrthod',
+    'declined_note'         => 'Declined Notes',
     'unassigned'            => 'Unassigned',
     'unaccepted_asset_report' => 'Asedau heb ei dderbyn',
     'users'                 => 'Defnyddwyr',
@@ -312,6 +316,10 @@ return [
     'token_expired'         => 'Mae eich sesiwn wedi dod i ben. Mewngofnodwch eto os gwelwch yn dda.',
     'login_enabled'         => 'Login Enabled',
     'audit_due'             => 'Due for Audit',
+    'audit_due_days'        => 'Assets Due for Audit Within :days Day|Assets Due for Audit Within :days Days',
+    'checkin_due'           => 'Due for Checkin',
+    'checkin_overdue'       => 'Overdue for Checkin',
+    'checkin_due_days'      => 'Assets Due for Checkin Within :days Day|Assets Due for Checkin Within :days Days',
     'audit_overdue'         => 'Overdue for Audit',
     'accept'                => 'Accept :asset',
     'i_accept'              => 'I accept',
@@ -507,6 +515,9 @@ return [
     'or' => 'or',
     'url'                   => 'URL',
     'edit_fieldset' => 'Edit fieldset fields and options',
+    'permission_denied_superuser_demo' => 'Permission denied. You cannot update user information for superadmins on the demo.',
+    'pwd_reset_not_sent' => 'User is not activated, is LDAP synced, or does not have an email address',
+    'error_sending_email' => 'Error sending email',
     'bulk' => [
             'delete' =>
                 [

resources/lang/da-DK/admin/hardware/message.php

@@ -4,8 +4,11 @@ return [
 
     'undeployable' 		=> '<strong>Advarsel: </strong> Dette aktiv er blevet markeret som uudnytteligt. Hvis denne status er ændret, skal du opdatere aktivstatus.',
     'does_not_exist' 	=> 'Asset eksisterer ikke.',
+    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
+    'no_tag' 	        => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'Dette aktiv findes ikke eller er ikke påkrævet.',
     'assoc_users'	 	=> 'Dette aktiv er i øjeblikket tjekket ud til en bruger og kan ikke slettes. Kontroller aktivet først, og prøv derefter at slette igen.',
+    'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
 
     'create' => [
         'error'   		=> 'Akten blev ikke oprettet, prøv igen. :(',
@@ -16,6 +19,7 @@ return [
     'update' => [
         'error'   			=> 'Akten blev ikke opdateret, prøv igen',
         'success' 			=> 'Asset opdateret med succes.',
+        'encrypted_warning' => 'Asset opdateret med succes, men krypterede brugerdefinerede felter skyldtes ikke tilladelser',
         'nothing_updated'	=>  'Ingen felter blev valgt, så intet blev opdateret.',
         'no_assets_selected'  =>  'Ingen aktiver blev valgt, så intet blev opdateret.',
         'assets_do_not_exist_or_are_invalid' => 'Valgte aktiver kan ikke opdateres.',
@@ -29,7 +33,7 @@ return [
     ],
 
     'audit' => [
-        'error'   		=> 'Assetrevision mislykkedes. Prøv igen.',
+        'error'   		=> 'Asset audit unsuccessful: :error ',
         'success' 		=> 'Asset audit succesfuldt logget.',
     ],
 

resources/lang/da-DK/admin/licenses/message.php

@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'Enten findes licensen ikke eller også har du ikke tilladelse til at se den.',
-    'user_does_not_exist' => 'Bruger eksisterer ikke.',
+    'user_does_not_exist' => 'Brugeren findes ikke, eller du har ikke tilladelse til at se dem.',
     'asset_does_not_exist' 	=> 'Aktivet, du forsøger at associere med denne licens, findes ikke.',
     'owner_doesnt_match_asset' => 'Aktivet, du forsøger at associere med denne licens, ejes af en anden end den person, der er valgt i Tildelt-rullemenuen.',
     'assoc_users'	 => 'Denne licens er i øjeblikket tjekket ud til en bruger og kan ikke slettes. Kontroller venligst licensen først, og prøv derefter at slette igen.',

resources/lang/da-DK/admin/licenses/table.php

@@ -4,6 +4,7 @@ return array(
 
     'assigned_to'   	=> 'Tildelt',
     'checkout'   		=> 'Ind ud',
+    'deleted_at'        => 'Slettet den',
     'id'      			=> 'ID',
     'license_email'   	=> 'Licens Email',
     'license_name'   	=> 'Licenseret til',

resources/lang/da-DK/admin/settings/general.php

@@ -49,6 +49,7 @@ return [
     'default_eula_text'			=> 'Standard EULA',
     'default_language'			=> 'Standard sprog',
     'default_eula_help_text'	=> 'Du kan også knytte brugerdefinerede EULA til specifikke aktivkategorier.',
+    'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'Vis aktivnavn',
     'display_checkout_date'     => 'Vis checkout dato',
     'display_eol'               => 'Vis EOL i tabelvisning',

resources/lang/da-DK/admin/users/table.php

@@ -20,6 +20,7 @@ return array(
     'lock_passwords'		=> 'Loginoplysninger kan ikke ændres på denne installation.',
     'manager' 				=> 'Manager',
     'managed_locations'     => 'Administrerede placeringer',
+    'managed_users'         => 'Administrerede Brugere',
     'name' 					=> 'Navn',
     'nogroup'               => 'Ingen grupper er blevet oprettet endnu. For at tilføje en, besøg: ',
     'notes'                 => 'Noter',

resources/lang/da-DK/general.php

@@ -202,6 +202,8 @@ return [
     'new_password'          => 'Ny adgangskode',
     'next'					=> 'Næste',
     'next_audit_date'		=> 'Næste revisionsdato',
+    'next_audit_date_help'  => 'If you use auditing in your organization, this is usually automatically calculated based on the asset&apos;s last audit date and audit frequency (in <code>Admin Settings &gt; Alerts</code>) and you can leave this blank. You can manually set this date here if you need to, but it must be later than the last audit date. ',
+    'audit_images_help'     => 'You can find audit images in the asset\'s history tab.',
     'no_email'              => 'Ingen e-mailadresse tilknyttet denne bruger',
     'last_audit'		    => 'Seneste revision',
     'new'					=> 'ny!',
@@ -245,6 +247,7 @@ return [
     'select_all'            => 'Vælg alle',
     'search'				=> 'Søg',
     'select_category'       => 'Vælg en kategori',
+    'select_datasource' => 'Vælg en datasource',
     'select_department'     => 'Vælg en afdeling',
     'select_depreciation'	=> 'Vælg en afskrivningstype',
     'select_location'		=> 'Vælg en placering',
@@ -294,6 +297,7 @@ return [
     'user'					=> 'Bruger',
     'accepted'			    => 'accepteret',
     'declined'			    => 'faldt',
+    'declined_note'         => 'Declined Notes',
     'unassigned'            => 'Utildelt',
     'unaccepted_asset_report' => 'Uaccepterede aktiver',
     'users'                 => 'Brugere',
@@ -312,6 +316,10 @@ return [
     'token_expired'         => 'Din form session er udløbet. Prøv igen.',
     'login_enabled'         => 'Login aktiveret',
     'audit_due'             => 'Forfalder til tilsyn',
+    'audit_due_days'        => 'Aktiver som er forfaldne for revision inden :days Dagsaktiver forfaldne for revision inden :days Dage',
+    'checkin_due'           => 'Forfalder til Checkin',
+    'checkin_overdue'       => 'Forfaldne til tjek',
+    'checkin_due_days'      => 'Aktiver forfalden for tjek inden :days Dagsaktiver forfalden for tjek inden :days Dage',
     'audit_overdue'         => 'Forfalden til tilsyn',
     'accept'                => 'Accepter :asset',
     'i_accept'              => 'Jeg accepterer',
@@ -507,6 +515,9 @@ return [
     'or' => 'eller',
     'url'                   => 'URL',
     'edit_fieldset' => 'Rediger feltsæt felter og indstillinger',
+    'permission_denied_superuser_demo' => 'Tilladelse nægtet. Du kan ikke opdatere brugerinformation for superadmins på demoen.',
+    'pwd_reset_not_sent' => 'Brugeren er ikke aktiveret, er LDAP-synkroniseret, eller har ikke en e-mailadresse',
+    'error_sending_email' => 'Fejl ved afsendelse af e-mail',
     'bulk' => [
             'delete' =>
                 [

resources/lang/de-DE/admin/hardware/message.php

@@ -5,8 +5,11 @@ return [
     'undeployable' 		=> '<strong>Achtung:</strong>Dieses Asset wurde kürzlich als nicht verteilbar markiert.
                         Falls sich dieser Status verändert hat, aktualisieren Sie bitte den Asset Status.',
     'does_not_exist' 	=> 'Asset existiert nicht.',
+    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
+    'no_tag' 	        => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'Dieses Asset existiert nicht oder kann nicht angefordert werden.',
     'assoc_users'	 	=> 'Dieses Asset ist im Moment an einen Benutzer herausgegeben und kann nicht entfernt werden. Bitte buchen sie das Asset wieder ein und versuchen Sie dann erneut es zu entfernen. ',
+    'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
 
     'create' => [
         'error'   		=> 'Asset wurde nicht erstellt. Bitte versuchen Sie es erneut. :(',
@@ -17,6 +20,7 @@ return [
     'update' => [
         'error'   			=> 'Asset wurde nicht aktualisiert. Bitte versuchen Sie es erneut',
         'success' 			=> 'Asset wurde erfolgreich aktualisiert.',
+        'encrypted_warning' => 'Das Asset wurde erfolgreich aktualisiert, aber verschlüsselte benutzerdefinierte Felder wurden aufgrund von Berechtigungen nicht aktualisiert',
         'nothing_updated'	=>  'Es wurden keine Felder ausgewählt, somit wurde auch nichts aktualisiert.',
         'no_assets_selected'  =>  'Es wurden keine Assets ausgewählt, somit wurde auch nichts aktualisiert.',
         'assets_do_not_exist_or_are_invalid' => 'Ausgewählte Assets können nicht aktualisiert werden.',
@@ -30,7 +34,7 @@ return [
     ],
 
     'audit' => [
-        'error'   		=> 'Asset Audit war nicht erfolgreich. Bitte versuche es erneut.',
+        'error'   		=> 'Asset audit unsuccessful: :error ',
         'success' 		=> 'Asset-Audit erfolgreich protokolliert.',
     ],
 

resources/lang/de-DE/admin/licenses/message.php

@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'Die Lizenz existiert nicht oder Sie haben keine Berechtigung, sie anzusehen.',
-    'user_does_not_exist' => 'Benutzer existiert nicht.',
+    'user_does_not_exist' => 'Benutzer existiert nicht oder Sie haben keine Berechtigung, ihn anzusehen.',
     'asset_does_not_exist' 	=> 'Das Asset, das Sie mit dieser Lizenz verknüpfen möchten, existiert nicht.',
     'owner_doesnt_match_asset' => 'Der Gegenstand, den Sie mit dieser Lizenz verknüpfen möchten, gehört jemand anderem als der im Dropdown-Feld ausgewählten Person.',
     'assoc_users'	 => 'Diese Lizenz ist derzeit mindestens einem Benutzer zugeordnet und kann nicht gelöscht werden. Bitte nehmen Sie die Lizenz zurück und versuchen Sie anschließend erneut diese zu löschen. ',

resources/lang/de-DE/admin/licenses/table.php

@@ -4,6 +4,7 @@ return array(
 
     'assigned_to'   	=> 'Zugewiesen an',
     'checkout'   		=> 'Zurücknehmen/Herausgeben',
+    'deleted_at'        => 'Gelöscht am',
     'id'      			=> 'ID',
     'license_email'   	=> 'Lizenziert für Email',
     'license_name'   	=> 'Lizenziert für',

resources/lang/de-DE/admin/settings/general.php

@@ -49,6 +49,7 @@ return [
     'default_eula_text'			=> 'Standard EULA',
     'default_language'			=> 'Standardsprache',
     'default_eula_help_text'	=> 'Sie können ebenfalls eigene EULA\'s mit spezifischen Asset Kategorien verknüpfen.',
+    'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'Zeige Assetname an',
     'display_checkout_date'     => 'Zeige Herausgabedatum',
     'display_eol'               => 'Zeige EOL in der Tabellenansicht',

resources/lang/de-DE/admin/users/table.php

@@ -20,6 +20,7 @@ return array(
     'lock_passwords'		=> 'Die Login-Daten können auf dieser Installation nicht geändert werden.',
     'manager' 				=> 'Manager',
     'managed_locations'     => 'Verwaltete Standorte',
+    'managed_users'         => 'Verwaltete Benutzer',
     'name' 					=> 'Name',
     'nogroup'               => 'Es wurden noch keine Gruppen erstellt. Um eine hinzuzufügen, besuchen Sie: ',
     'notes'                 => 'Notizen',

resources/lang/de-DE/general.php

@@ -202,6 +202,8 @@ return [
     'new_password'          => 'Neues Passwort',
     'next'					=> 'Nächste',
     'next_audit_date'		=> 'Nächstes Prüfungsdatum',
+    'next_audit_date_help'  => 'If you use auditing in your organization, this is usually automatically calculated based on the asset&apos;s last audit date and audit frequency (in <code>Admin Settings &gt; Alerts</code>) and you can leave this blank. You can manually set this date here if you need to, but it must be later than the last audit date. ',
+    'audit_images_help'     => 'You can find audit images in the asset\'s history tab.',
     'no_email'              => 'Es ist keine E-Mail-Adresse mit diesem Benutzer verknüpft',
     'last_audit'		    => 'Letzte Prüfung',
     'new'					=> 'Neu!',
@@ -245,6 +247,7 @@ return [
     'select_all'            => 'Alle markieren',
     'search'				=> 'Suche',
     'select_category'       => 'Kategorie auswählen',
+    'select_datasource' => 'Datenquelle auswählen',
     'select_department'     => 'Abteilung auswählen',
     'select_depreciation'	=> 'Wählen Sie einen Abschreibungstyp',
     'select_location'		=> 'Wählen Sie einen Standort',
@@ -294,6 +297,7 @@ return [
     'user'					=> 'Benutzer',
     'accepted'			    => 'angenommen',
     'declined'			    => 'abgelehnt',
+    'declined_note'         => 'Declined Notes',
     'unassigned'            => 'Nicht zugewiesen',
     'unaccepted_asset_report' => 'Nicht akzeptierte Assets',
     'users'                 => 'Benutzer',
@@ -312,6 +316,10 @@ return [
     'token_expired'         => 'Ihre Sitzung ist abgelaufen. Bitte versuchen Sie es erneut.',
     'login_enabled'         => 'Login aktiviert',
     'audit_due'             => 'Prüfung fällig',
+    'audit_due_days'        => 'Fällige Assets für Prüfung innerhalb von :days Tag|Fällige Assets für Prüfung innerhalb von :days',
+    'checkin_due'           => 'Fällig zum Check-in',
+    'checkin_overdue'       => 'Überfällig für den Check-in',
+    'checkin_due_days'      => 'Fällige Assets für den Check-in innerhalb von :days Tag|Fällige Assets für den Check-in innerhalb von :days',
     'audit_overdue'         => 'Prüfung überfällig',
     'accept'                => ':asset akzeptieren',
     'i_accept'              => 'Ich akzeptiere',
@@ -507,6 +515,9 @@ return [
     'or' => 'oder',
     'url'                   => 'URL',
     'edit_fieldset' => 'Felder und Optionen des Feldsatzes bearbeiten',
+    'permission_denied_superuser_demo' => 'Zugriff verweigert. Die Benutzerinformationen für Superadministratoren in der Demoinstallation können nicht aktualisiert werden.',
+    'pwd_reset_not_sent' => 'Benutzer ist nicht aktiviert, ist mit LDAP synchronisiert oder hat keine E-Mail-Adresse',
+    'error_sending_email' => 'Fehler beim Senden der E-Mail',
     'bulk' => [
             'delete' =>
                 [

resources/lang/de-if/admin/hardware/message.php

@@ -5,8 +5,11 @@ return [
     'undeployable' 		=> '<strong>Achtung:</strong>Dieses Asset wurde kürzlich als nicht verteilbar markiert.
                         Falls sich dieser Status verändert hat, aktualisiere bitte den Asset Status.',
     'does_not_exist' 	=> 'Asset existiert nicht.',
+    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
+    'no_tag' 	        => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'Dieses Asset existiert nicht oder kann nicht angefordert werden.',
     'assoc_users'	 	=> 'Dieses Asset ist im Moment an einen Benutzer herausgegeben und kann nicht entfernt werden. Bitte buche das Asset wieder ein und versuche dann erneut, es zu entfernen. ',
+    'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
 
     'create' => [
         'error'   		=> 'Asset wurde nicht erstellt. Bitte versuche es erneut. :(',
@@ -17,6 +20,7 @@ return [
     'update' => [
         'error'   			=> 'Asset wurde nicht aktualisiert. Bitte versuche es erneut',
         'success' 			=> 'Asset wurde erfolgreich aktualisiert.',
+        'encrypted_warning' => 'Das Asset wurde erfolgreich aktualisiert, aber verschlüsselte benutzerdefinierte Felder wurden aufgrund von Berechtigungen nicht aktualisiert',
         'nothing_updated'	=>  'Es wurden keine Felder ausgewählt, somit wurde auch nichts aktualisiert.',
         'no_assets_selected'  =>  'Es wurden keine Assets ausgewählt, somit wurde auch nichts aktualisiert.',
         'assets_do_not_exist_or_are_invalid' => 'Ausgewählte Assets können nicht aktualisiert werden.',
@@ -30,7 +34,7 @@ return [
     ],
 
     'audit' => [
-        'error'   		=> 'Asset Audit war nicht erfolgreich. Bitte versuche es erneut.',
+        'error'   		=> 'Asset audit unsuccessful: :error ',
         'success' 		=> 'Asset-Audit erfolgreich protokolliert.',
     ],
 

resources/lang/de-if/admin/licenses/message.php

@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'Die Lizenz existiert nicht oder Du hast keine Berechtigung, sie anzusehen.',
-    'user_does_not_exist' => 'Benutzer existiert nicht.',
+    'user_does_not_exist' => 'Benutzer existiert nicht oder Sie haben keine Berechtigung, sie anzusehen.',
     'asset_does_not_exist' 	=> 'Der Gegenstand, mit dem Du diese Lizenz verknüpfen möchtest, existiert nicht.',
     'owner_doesnt_match_asset' => 'Der Gegenstand, den Du mit dieser Lizenz verknüpfen möchtest, gehört jemand anderem als der im Dropdown-Feld ausgewählten Person.',
     'assoc_users'	 => 'Diese Lizenz ist derzeit einem Benutzer zugeordnet und kann nicht gelöscht werden. Bitte nimm die Lizenz zurück und versuche anschließend erneut, diese zu löschen. ',

resources/lang/de-if/admin/licenses/table.php

@@ -4,6 +4,7 @@ return array(
 
     'assigned_to'   	=> 'Zugewiesen an',
     'checkout'   		=> 'Eingang/Ausgang',
+    'deleted_at'        => 'Gelöscht am',
     'id'      			=> 'ID',
     'license_email'   	=> 'Lizenziert für Email',
     'license_name'   	=> 'Lizenziert für',

resources/lang/de-if/admin/settings/general.php

@@ -49,6 +49,7 @@ return [
     'default_eula_text'			=> 'Standard EULA',
     'default_language'			=> 'Standardsprache',
     'default_eula_help_text'	=> 'Du kannst ebenso benutzerdefinierte EULAs bestimmten Asset-Kategorien zuordnen.',
+    'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'Asset-Name anzeigen',
     'display_checkout_date'     => 'Checkout-Datum anzeigen',
     'display_eol'               => 'EOL in Tabellenansicht anzeigen',

resources/lang/de-if/admin/users/table.php

@@ -20,6 +20,7 @@ return array(
     'lock_passwords'		=> 'Anmeldedaten können bei dieser Installation nicht geändert werden.',
     'manager' 				=> 'Manager',
     'managed_locations'     => 'Verwaltete Standorte',
+    'managed_users'         => 'Verwaltete Benutzer',
     'name' 					=> 'Name',
     'nogroup'               => 'Es wurden noch keine Gruppen erstellt. Um eine hinzuzufügen, besuche: ',
     'notes'                 => 'Notizen',

resources/lang/de-if/general.php

@@ -202,6 +202,8 @@ return [
     'new_password'          => 'Neues Passwort',
     'next'					=> 'Nächste',
     'next_audit_date'		=> 'Nächstes Prüfdatum',
+    'next_audit_date_help'  => 'If you use auditing in your organization, this is usually automatically calculated based on the asset&apos;s last audit date and audit frequency (in <code>Admin Settings &gt; Alerts</code>) and you can leave this blank. You can manually set this date here if you need to, but it must be later than the last audit date. ',
+    'audit_images_help'     => 'You can find audit images in the asset\'s history tab.',
     'no_email'              => 'Keine E-Mail-Adresse mit diesem Benutzer verknüpft',
     'last_audit'		    => 'Letzte Prüfung',
     'new'					=> 'Neu!',
@@ -245,6 +247,7 @@ return [
     'select_all'            => 'Alle markieren',
     'search'				=> 'Suche',
     'select_category'       => 'Wähle eine Kategorie',
+    'select_datasource' => 'Datenquelle auswählen',
     'select_department'     => 'Wähle eine Abteilung',
     'select_depreciation'	=> 'Wähle einen Abschreibungstyp',
     'select_location'		=> 'Wähle einen Standort',
@@ -294,6 +297,7 @@ return [
     'user'					=> 'Benutzer',
     'accepted'			    => 'angenommen',
     'declined'			    => 'abgelehnt',
+    'declined_note'         => 'Declined Notes',
     'unassigned'            => 'Nicht zugewiesen',
     'unaccepted_asset_report' => 'Nicht akzeptierte Assets',
     'users'                 => 'Benutzer',
@@ -312,6 +316,10 @@ return [
     'token_expired'         => 'Deine Sitzung ist abgelaufen. Bitte versuche es erneut.',
     'login_enabled'         => 'Login aktiviert',
     'audit_due'             => 'Prüfung fällig',
+    'audit_due_days'        => 'Fällige Assets für Prüfung innerhalb von :days Tag|Fällige Assets für Prüfung innerhalb von :days',
+    'checkin_due'           => 'Fällig zum Check-in',
+    'checkin_overdue'       => 'Überfällig für den Check-in',
+    'checkin_due_days'      => 'Fällige Assets für den Check-in innerhalb von :days Tag|Fällige Assets für den Check-in innerhalb von :days',
     'audit_overdue'         => 'Prüfung überfällig',
     'accept'                => 'Erhalt bestätigen: :asset',
     'i_accept'              => 'Ich akzeptiere',
@@ -507,6 +515,9 @@ return [
     'or' => 'oder',
     'url'                   => 'URL',
     'edit_fieldset' => 'Felder und Optionen bearbeiten',
+    'permission_denied_superuser_demo' => 'Zugriff verweigert. Benutzerinformationen für Superadministratoren auf der Demo können nicht aktualisiert werden.',
+    'pwd_reset_not_sent' => 'Benutzer ist nicht aktiviert, ist LDAP-synchronisiert oder hat keine E-Mail-Adresse',
+    'error_sending_email' => 'Fehler beim Senden der E-Mail',
     'bulk' => [
             'delete' =>
                 [

resources/lang/el-GR/admin/hardware/message.php

@@ -5,8 +5,11 @@ return [
     'undeployable' 		=> '<strong>Warning: </strong> Το περιουσιακό αυτό στοιχείο έχει επισημανθεί ως επί του παρόντος undeployable.
                         Εάν αυτή η κατάσταση έχει αλλάξει, παρακαλούμε να ενημερώσετε την κατάσταση των περιουσιακών στοιχείων.',
     'does_not_exist' 	=> 'To πάγιο δεν υπάρχει.',
+    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
+    'no_tag' 	        => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'Αυτό το στοιχείο δεν υπάρχει ή δεν απαιτείται.',
     'assoc_users'	 	=> 'Αυτό το στοιχείο είναι συνήθως αποσυνδεδεμένο από έναν χρήστη και δεν μπορεί να διαγραφεί. Ελέγξτε πρώτα το στοιχείο και, στη συνέχεια, δοκιμάστε ξανά τη διαγραφή.',
+    'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
 
     'create' => [
         'error'   		=> 'Το περιουσιακού στοιχείο δεν δημιουργήθηκε, παρακαλώ προσπαθήστε ξανά. :(',
@@ -17,6 +20,7 @@ return [
     'update' => [
         'error'   			=> 'Το πάγιο δεν ενημερώθηκε, παρακαλώ προσπαθήστε ξανά',
         'success' 			=> 'Τα περιουσιακά στοιχεία ενημερώθηκαν επιτυχώς.',
+        'encrypted_warning' => 'Το πάγιο ενημερώθηκε επιτυχώς, αλλά τα κρυπτογραφημένα προσαρμοσμένα πεδία δεν οφείλονταν στα δικαιώματα',
         'nothing_updated'	=>  'Δεν επιλέχθηκαν πεδία, επομένως τίποτα δεν ενημερώθηκε.',
         'no_assets_selected'  =>  'Δεν επιλέχθηκαν στοιχεία ενεργητικού, επομένως τίποτα δεν ενημερώθηκε.',
         'assets_do_not_exist_or_are_invalid' => 'Τα επιλεγμένα περιουσιακά στοιχεία δεν μπορούν να ενημερωθούν.',
@@ -30,7 +34,7 @@ return [
     ],
 
     'audit' => [
-        'error'   		=> 'Ο έλεγχος στοιχείων ενεργητικού ήταν ανεπιτυχής. ΠΑΡΑΚΑΛΩ προσπαθησε ξανα.',
+        'error'   		=> 'Asset audit unsuccessful: :error ',
         'success' 		=> 'Ο έλεγχος περιουσιακών στοιχείων ολοκληρώθηκε με επιτυχία.',
     ],
 

resources/lang/el-GR/admin/licenses/message.php

@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'Η άδεια δεν υπάρχει ή δεν έχετε άδεια για να την δείτε.',
-    'user_does_not_exist' => 'Ο χρήστης δεν υπάρχει.',
+    'user_does_not_exist' => 'Ο χρήστης δεν υπάρχει ή δεν έχετε δικαίωμα να τον δείτε.',
     'asset_does_not_exist' 	=> 'Το πάγιο που προσπαθείτε να συσχετίσετε με αυτήν την άδεια δεν υπάρχει.',
     'owner_doesnt_match_asset' => 'Το περιουσιακό στοιχείο που προσπαθείτε να συσχετίσετε με αυτήν την άδεια ανήκει σε κάποιον άλλον εκτός από το άτομο που επιλέχθηκε στο αναπτυσσόμενο μενού.',
     'assoc_users'	 => 'Αυτήν τη στιγμή, αυτή η άδεια χρήσης αποστέλλεται στον χρήστη και δεν μπορεί να διαγραφεί. Ελέγξτε πρώτα την άδεια χρήσης και δοκιμάστε ξανά τη διαγραφή.',

resources/lang/el-GR/admin/licenses/table.php

@@ -4,6 +4,7 @@ return array(
 
     'assigned_to'   	=> 'Ανατέθηκε στον',
     'checkout'   		=> 'In/Out',
+    'deleted_at'        => 'Διαγράφηκε στις',
     'id'      			=> 'ID',
     'license_email'   	=> 'Άδεια χρήσης ηλεκτρονικού ταχυδρομείου',
     'license_name'   	=> 'Την άδεια να',

resources/lang/el-GR/admin/settings/general.php

@@ -49,6 +49,7 @@ return [
     'default_eula_text'			=> 'Προεπιλογή EULA',
     'default_language'			=> 'Προκαθορισμένη γλώσσα',
     'default_eula_help_text'	=> 'Μπορείτε επίσης να συσχετίσετε προσαρμοσμένες ΑΔΕΚ με συγκεκριμένες κατηγορίες περιουσιακών στοιχείων.',
+    'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'Εμφάνιση ονόματος παγίου',
     'display_checkout_date'     => 'Εμφάνιση ημερομηνίας αποχώρησης',
     'display_eol'               => 'Εμφάνιση του EOL στην προβολή πίνακα',

resources/lang/el-GR/admin/users/table.php

@@ -20,6 +20,7 @@ return array(
     'lock_passwords'		=> 'Οι λεπτομέρειες σύνδεσης δεν μπορούν να αλλάξουν σε αυτήν την εγκατάσταση.',
     'manager' 				=> 'Διευθυντής',
     'managed_locations'     => 'Διαχειριζόμενες τοποθεσίες',
+    'managed_users'         => 'Διαχειριζόμενοι Χρήστες',
     'name' 					=> 'Όνομα',
     'nogroup'               => 'Καμία ομάδα δεν έχει δημιουργηθεί ακόμα. Για να προσθέσετε μία, επισκεφθείτε: ',
     'notes'                 => 'Σημειώσεις',

resources/lang/el-GR/general.php

@@ -176,7 +176,7 @@ return [
     'last_name'             => 'Επίθετο',
     'license'				=> 'Άδεια Χρήσεως',
     'license_report'        => 'Αναφορά άδειας',
-    'licenses_available'	=> 'διαθέσιμες άδειες',
+    'licenses_available'	=> 'Διαθέσιμες άδειες',
     'licenses'				=> 'Άδειες',
     'list_all'				=> 'Λίστα όλων',
     'loading'				=> 'Φόρτωση... παρακαλώ περιμένετε...',
@@ -202,6 +202,8 @@ return [
     'new_password'          => 'Νέος Κωδικός Πρόσβασης',
     'next'					=> 'Επόμενο',
     'next_audit_date'		=> 'Επόμενη ημερομηνία ελέγχου',
+    'next_audit_date_help'  => 'If you use auditing in your organization, this is usually automatically calculated based on the asset&apos;s last audit date and audit frequency (in <code>Admin Settings &gt; Alerts</code>) and you can leave this blank. You can manually set this date here if you need to, but it must be later than the last audit date. ',
+    'audit_images_help'     => 'You can find audit images in the asset\'s history tab.',
     'no_email'              => 'Καμία διεύθυνση ηλεκτρονικού ταχυδρομείου δεν συσχετίζεται με αυτόν το χρήστη',
     'last_audit'		    => 'Τελευταίος Έλεγχος',
     'new'					=> 'νεό!',
@@ -245,6 +247,7 @@ return [
     'select_all'            => 'Επιλογή Όλων',
     'search'				=> 'Αναζήτηση',
     'select_category'       => 'Επιλέξτε μια κατηγορία',
+    'select_datasource' => 'Επιλέξτε ένα Datasource',
     'select_department'     => 'Επιλέξτε ένα Τμήμα',
     'select_depreciation'	=> 'Επιλέξτε τύπο απόσβεσης',
     'select_location'		=> 'Επιλέξτε τοποθεσία',
@@ -294,6 +297,7 @@ return [
     'user'					=> 'Χρήστης',
     'accepted'			    => 'αποδεκτή',
     'declined'			    => 'απορρίφθηκε',
+    'declined_note'         => 'Declined Notes',
     'unassigned'            => 'Ανεκχώρησε',
     'unaccepted_asset_report' => 'Μη αποδεκτά πάγια',
     'users'                 => 'Χρήστες',
@@ -312,6 +316,10 @@ return [
     'token_expired'         => 'Έχει λήξει η συνεδρία σας. Παρακαλώ συνδεθείτε ξανά.',
     'login_enabled'         => 'Ενεργοποίηση Σύνδεσης',
     'audit_due'             => 'Οφειλόμενη για έλεγχο',
+    'audit_due_days'        => 'Στοιχεία που οφείλονται για έλεγχο Εντός :days Ημερήσια Εξόφληση περιουσιακών στοιχείων για έλεγχο Εντός :days',
+    'checkin_due'           => 'Πληρωμή για Checkin',
+    'checkin_overdue'       => 'Εκπρόθεσμο για Checkin',
+    'checkin_due_days'      => 'Τα περιουσιακά στοιχεία που οφείλονται για Checkin Εντός :days Ημερήσια Πάγια Checkin Μέσα σε :days Ημέρες',
     'audit_overdue'         => 'Εκπρόθεσμο για έλεγχο',
     'accept'                => 'Αποδοχή :asset',
     'i_accept'              => 'Αποδέχομαι',
@@ -507,6 +515,9 @@ return [
     'or' => 'ή',
     'url'                   => 'URL',
     'edit_fieldset' => 'Επεξεργασία πεδίων και επιλογών',
+    'permission_denied_superuser_demo' => 'Δεν επιτρέπεται η χορήγηση άδειας. Δεν μπορείτε να ενημερώσετε τις πληροφορίες χρήστη για superadmins στο demo.',
+    'pwd_reset_not_sent' => 'Ο χρήστης δεν είναι ενεργοποιημένος, είναι LDAP συγχρονισμένος ή δεν έχει διεύθυνση ηλεκτρονικού ταχυδρομείου',
+    'error_sending_email' => 'Σφάλμα αποστολής email',
     'bulk' => [
             'delete' =>
                 [
@@ -521,12 +532,12 @@ return [
     'no_requestable' => 'Δεν υπάρχουν απαιτούμενα στοιχεία ενεργητικού ή μοντέλα στοιχείων ενεργητικού.',
 
     'countable' => [
-        'accessories'  => ':count Αξεσουάρ: Μετρήστε Αξεσουάρ',
+        'accessories'  => ':count Αξεσουάρ |:count Αξεσουάρ',
         'assets'  => ':count Ενεργητικό:count Περιουσιακών Στοιχείων',
         'licenses'  => ':count Άδεια Χρήσης:count Άδειες',
-        'license_seats'  => ':count Άδεια Θέση:count Καθίσματα Άδειας',
+        'license_seats'  => ':count Εξαρτήματα |:count  Εξαρτήματα',
-        'consumables'  => ':count Αναλώσιμα :count Αναλώσιμα',
+        'consumables'  => ':count Αναλώσιμα |:count Αναλώσιμα',
-        'components'  => ':count Εξαρτήματα :count',
+        'components'  => ':count Εξαρτήματα |:count  Εξαρτήματα',
     ]
 
 ];

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

@@ -5,8 +5,11 @@ return [
     'undeployable' 		=> '<strong>Warning: </strong> This asset has been marked as currently undeployable.
                         If this status has changed, please update the asset status.',
     'does_not_exist' 	=> 'Asset does not exist.',
+    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
+    'no_tag' 	        => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'That asset does not exist or is not requestable.',
     'assoc_users'	 	=> 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ',
+    'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
 
     'create' => [
         'error'   		=> 'Asset was not created, please try again. :(',
@@ -17,6 +20,7 @@ return [
     'update' => [
         'error'   			=> 'Asset was not updated, please try again',
         'success' 			=> 'Asset updated successfully.',
+        'encrypted_warning' => 'Asset updated successfully, but encrypted custom fields were not due to permissions',
         'nothing_updated'	=>  'No fields were selected, so nothing was updated.',
         'no_assets_selected'  =>  'Nothing was updated because no assets were selected.',
         'assets_do_not_exist_or_are_invalid' => 'Selected assets cannot be updated.',
@@ -30,7 +34,7 @@ return [
     ],
 
     'audit' => [
-        'error'   		=> 'Asset audit was unsuccessful. Please try again.',
+        'error'   		=> 'Asset audit unsuccessful: :error ',
         'success' 		=> 'Asset audit successfully logged.',
     ],
 

resources/lang/en-GB/admin/licenses/message.php

@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'Licence does not exist or you do not have permission to view it.',
-    'user_does_not_exist' => 'User does not exist.',
+    'user_does_not_exist' => 'User does not exist or you do not have permission to view them.',
     'asset_does_not_exist' 	=> 'The asset you are trying to associate with this license does not exist.',
     'owner_doesnt_match_asset' => 'The asset you are trying to associate with this license is owned by somene other than the person selected in the assigned to dropdown.',
     'assoc_users'	 => 'This license is currently checked out to a user and cannot be deleted. Please check the license in first, and then try deleting again. ',

resources/lang/en-GB/admin/licenses/table.php

@@ -4,6 +4,7 @@ return array(
 
     'assigned_to'   	=> 'Assigned To',
     'checkout'   		=> 'In/Out',
+    'deleted_at'        => 'Deleted at',
     'id'      			=> 'ID',
     'license_email'   	=> 'License Email',
     'license_name'   	=> 'Licensed To',

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

@@ -49,6 +49,7 @@ return [
     'default_eula_text'			=> 'Default EULA',
     'default_language'			=> 'Default Language',
     'default_eula_help_text'	=> 'You can also associate custom EULAs to specific asset categories.',
+    'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'Display Asset Name',
     'display_checkout_date'     => 'Display Checkout Date',
     'display_eol'               => 'Display EOL in table view',

resources/lang/en-GB/admin/users/table.php

@@ -20,6 +20,7 @@ return array(
     'lock_passwords'		=> 'Login details cannot be changed on this installation.',
     'manager' 				=> 'Manager',
     'managed_locations'     => 'Managed Locations',
+    'managed_users'         => 'Managed Users',
     'name' 					=> 'Name',
     'nogroup'               => 'No groups have been created yet. To add one, visit: ',
     'notes'                 => 'Notes',

resources/lang/en-GB/general.php

@@ -176,7 +176,7 @@ return [
     'last_name'             => 'Last Name',
     'license'				=> 'License',
     'license_report'        => 'License Report',
-    'licenses_available'	=> 'licenses available',
+    'licenses_available'	=> 'Licenses available',
     'licenses'				=> 'Licenses',
     'list_all'				=> 'List All',
     'loading'				=> 'Loading... please wait....',
@@ -202,6 +202,8 @@ return [
     'new_password'          => 'New Password',
     'next'					=> 'Next',
     'next_audit_date'		=> 'Next Audit Date',
+    'next_audit_date_help'  => 'If you use auditing in your organization, this is usually automatically calculated based on the asset&apos;s last audit date and audit frequency (in <code>Admin Settings &gt; Alerts</code>) and you can leave this blank. You can manually set this date here if you need to, but it must be later than the last audit date. ',
+    'audit_images_help'     => 'You can find audit images in the asset\'s history tab.',
     'no_email'              => 'No email address associated with this user',
     'last_audit'		    => 'Last Audit',
     'new'					=> 'new!',
@@ -245,6 +247,7 @@ return [
     'select_all'            => 'Select All',
     'search'				=> 'Search',
     'select_category'       => 'Select a Category',
+    'select_datasource' => 'Select a Datasource',
     'select_department'     => 'Select a Department',
     'select_depreciation'	=> 'Select a Depreciation Type',
     'select_location'		=> 'Select a Location',
@@ -294,6 +297,7 @@ return [
     'user'					=> 'User',
     'accepted'			    => 'accepted',
     'declined'			    => 'declined',
+    'declined_note'         => 'Declined Notes',
     'unassigned'            => 'Unassigned',
     'unaccepted_asset_report' => 'Unaccepted Assets',
     'users'                 => 'Users',
@@ -312,6 +316,10 @@ return [
     'token_expired'         => 'Your form session has expired. Please try again.',
     'login_enabled'         => 'Login Enabled',
     'audit_due'             => 'Due for Audit',
+    'audit_due_days'        => 'Assets Due for Audit Within :days Day|Assets Due for Audit Within :days Days',
+    'checkin_due'           => 'Due for Checkin',
+    'checkin_overdue'       => 'Overdue for Checkin',
+    'checkin_due_days'      => 'Assets Due for Checkin Within :days Day|Assets Due for Checkin Within :days Days',
     'audit_overdue'         => 'Overdue for Audit',
     'accept'                => 'Accept :asset',
     'i_accept'              => 'I accept',
@@ -507,6 +515,9 @@ return [
     'or' => 'or',
     'url'                   => 'URL',
     'edit_fieldset' => 'Edit fieldset fields and options',
+    'permission_denied_superuser_demo' => 'Permission denied. You cannot update user information for superadmins on the demo.',
+    'pwd_reset_not_sent' => 'User is not activated, is LDAP synced, or does not have an email address',
+    'error_sending_email' => 'Error sending email',
     'bulk' => [
             'delete' =>
                 [

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

@@ -4,8 +4,11 @@ return [
 
     'undeployable' 		=> '<strong>Peringatan:</strong>Aset ini telah ditandai karena saat ini tidak dapat dipasangkan lagi. Jika status ini telah berubah, harap perbarui status aset.',
     'does_not_exist' 	=> 'Aset tidak ada.',
+    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
+    'no_tag' 	        => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'That asset does not exist or is not requestable.',
     'assoc_users'	 	=> 'Aset ini saat ini diperiksa ke pengguna dan tidak dapat dihapus. Harap periksa dulu asetnya, lalu coba hapus lagi. ',
+    'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
 
     'create' => [
         'error'   		=> 'Aset tidak dibuat, coba lagi. :(',
@@ -16,6 +19,7 @@ return [
     'update' => [
         'error'   			=> 'Aset tidak diperbarui, coba lagi',
         'success' 			=> 'Aset Berhasil diperbarui.',
+        'encrypted_warning' => 'Asset updated successfully, but encrypted custom fields were not due to permissions',
         'nothing_updated'	=>  'Tidak ada kategori yang dipilih, jadi tidak ada yang diperbarui.',
         'no_assets_selected'  =>  'No assets were selected, so nothing was updated.',
         'assets_do_not_exist_or_are_invalid' => 'Selected assets cannot be updated.',
@@ -29,7 +33,7 @@ return [
     ],
 
     'audit' => [
-        'error'   		=> 'Audit aset tidak berhasil. Silahkan coba lagi.',
+        'error'   		=> 'Asset audit unsuccessful: :error ',
         'success' 		=> 'Audit aset berhasil dimasuki.',
     ],
 

resources/lang/en-ID/admin/licenses/message.php

@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'License does not exist or you do not have permission to view it.',
-    'user_does_not_exist' => 'Pengguna tidak ada.',
+    'user_does_not_exist' => 'User does not exist or you do not have permission to view them.',
     'asset_does_not_exist' 	=> 'Aset yang ingin Anda kaitkan dengan lisensi ini tidak ada.',
     'owner_doesnt_match_asset' => 'Aset yang ingin Anda kaitkan dengan lisensi ini dimiliki oleh orang lain selain orang yang dipilih di dropdown yang ditugaskan.',
     'assoc_users'	 => 'Lisensi ini saat ini diperiksa oleh pengguna dan tidak dapat dihapus. Mohon periksa dulu lisensinya, lalu coba hapus lagi. ',

resources/lang/en-ID/admin/licenses/table.php

@@ -4,6 +4,7 @@ return array(
 
     'assigned_to'   	=> 'Ditugaskan untuk',
     'checkout'   		=> 'Masuk/keluar',
+    'deleted_at'        => 'Deleted at',
     'id'      			=> 'ID',
     'license_email'   	=> 'Lisensi Email',
     'license_name'   	=> 'Berlisensi Untuk',

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

@@ -49,6 +49,7 @@ return [
     'default_eula_text'			=> 'EULA bawaan',
     'default_language'			=> 'Bahasa Dasar',
     'default_eula_help_text'	=> 'Anda juga dapat mengaitkan EULA kastom dengan kategori aset tertentu.',
+    'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'Tampilan nama aset',
     'display_checkout_date'     => 'Tampilan tanggal keluar',
     'display_eol'               => 'Tampilkan EOL dalam tampilan tabel',

resources/lang/en-ID/admin/users/table.php

@@ -20,6 +20,7 @@ return array(
     'lock_passwords'		=> 'Rincian masuk tidak dapat diubah pada instalasi ini.',
     'manager' 				=> 'Manajer',
     'managed_locations'     => 'Lokasi yang Dikelola',
+    'managed_users'         => 'Managed Users',
     'name' 					=> 'Nama',
     'nogroup'               => 'No groups have been created yet. To add one, visit: ',
     'notes'                 => 'Catatan',

resources/lang/en-ID/general.php

@@ -176,7 +176,7 @@ return [
     'last_name'             => 'Nama Belakang',
     'license'				=> 'Lisensi',
     'license_report'        => 'Laporan Lisensi',
-    'licenses_available'	=> 'lisensi yang tersedia',
+    'licenses_available'	=> 'Licenses available',
     'licenses'				=> 'Lisensi',
     'list_all'				=> 'Tampilkan semua',
     'loading'				=> 'Loading... please wait....',
@@ -202,6 +202,8 @@ return [
     'new_password'          => 'New Password',
     'next'					=> 'Selanjutnya',
     'next_audit_date'		=> 'Tanggal Audit berikutnya',
+    'next_audit_date_help'  => 'If you use auditing in your organization, this is usually automatically calculated based on the asset&apos;s last audit date and audit frequency (in <code>Admin Settings &gt; Alerts</code>) and you can leave this blank. You can manually set this date here if you need to, but it must be later than the last audit date. ',
+    'audit_images_help'     => 'You can find audit images in the asset\'s history tab.',
     'no_email'              => 'No email address associated with this user',
     'last_audit'		    => 'Audit Terakhir',
     'new'					=> 'baru!',
@@ -245,6 +247,7 @@ return [
     'select_all'            => 'Select All',
     'search'				=> 'Cari',
     'select_category'       => 'Pilih kategori',
+    'select_datasource' => 'Select a Datasource',
     'select_department'     => 'Pilih Departemen',
     'select_depreciation'	=> 'Pilih Jenis Penyusutan',
     'select_location'		=> 'Pilih lokasi',
@@ -294,6 +297,7 @@ return [
     'user'					=> 'Pengguna',
     'accepted'			    => 'diterima',
     'declined'			    => 'menurun',
+    'declined_note'         => 'Declined Notes',
     'unassigned'            => 'Unassigned',
     'unaccepted_asset_report' => 'Aset tidak diterima',
     'users'                 => 'Pengguna',
@@ -312,6 +316,10 @@ return [
     'token_expired'         => 'Sesi formulir anda sudah berakhir. Silahkan coba lagi.',
     'login_enabled'         => 'Login Enabled',
     'audit_due'             => 'Due for Audit',
+    'audit_due_days'        => 'Assets Due for Audit Within :days Day|Assets Due for Audit Within :days Days',
+    'checkin_due'           => 'Due for Checkin',
+    'checkin_overdue'       => 'Overdue for Checkin',
+    'checkin_due_days'      => 'Assets Due for Checkin Within :days Day|Assets Due for Checkin Within :days Days',
     'audit_overdue'         => 'Overdue for Audit',
     'accept'                => 'Accept :asset',
     'i_accept'              => 'I accept',
@@ -507,6 +515,9 @@ return [
     'or' => 'or',
     'url'                   => 'URL',
     'edit_fieldset' => 'Edit fieldset fields and options',
+    'permission_denied_superuser_demo' => 'Permission denied. You cannot update user information for superadmins on the demo.',
+    'pwd_reset_not_sent' => 'User is not activated, is LDAP synced, or does not have an email address',
+    'error_sending_email' => 'Error sending email',
     'bulk' => [
             'delete' =>
                 [

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

@@ -5,8 +5,11 @@ return [
     'undeployable' 		=> 'ADVERTENCI<strong>ADVERTENCI </strong> Este activo ha sido marcado como actualmente no desplegable.
                         Si este estado ha cambiado, por favor actualice el estado del activo.',
     'does_not_exist' 	=> 'El recurso no existe.',
+    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
+    'no_tag' 	        => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'Ese activo no existe o no es solicitable.',
     'assoc_users'	 	=> 'Este activo está actualmente reservado a un usuario y no puede ser eliminado. Por favor, compruebe el activo primero y vuelva a intentarlo. ',
+    'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
 
     'create' => [
         'error'   		=> 'El recurso no fue creado, por favor inténtalo de nuevo. :(',
@@ -17,6 +20,7 @@ return [
     'update' => [
         'error'   			=> 'Equipo no actualizado, por favor inténtalo de nuevo',
         'success' 			=> 'Equipo actualizado correctamente.',
+        'encrypted_warning' => 'Activo actualizado con éxito, pero los campos personalizados cifrados no se debieron a permisos',
         'nothing_updated'	=>  'No se seleccionaron campos, por lo que no se actualizó nada.',
         'no_assets_selected'  =>  'Ningún recurso fue seleccionado, por lo que no se actualizó nada.',
         'assets_do_not_exist_or_are_invalid' => 'Los activos seleccionados no se pueden actualizar.',
@@ -30,7 +34,7 @@ return [
     ],
 
     'audit' => [
-        'error'   		=> 'La auditoría de activos no tuvo éxito. Por favor, inténtalo de nuevo.',
+        'error'   		=> 'Asset audit unsuccessful: :error ',
         'success' 		=> 'Auditoría de activos registrada con éxito.',
     ],
 

resources/lang/es-CO/admin/licenses/message.php

@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'La licencia no existe o no tiene permiso para verla.',
-    'user_does_not_exist' => 'El usuario no existe.',
+    'user_does_not_exist' => 'El usuario no existe o no tiene permiso para verlos.',
     'asset_does_not_exist' 	=> 'El activo que está intentando asociar con esta licencia no existe.',
     'owner_doesnt_match_asset' => 'El activo que está intentando asociar con esta licencia es propiedad de alguien que no sea la persona seleccionada en el desplegable asignado.',
     'assoc_users'	 => 'Esta licencia está actualmente reservada a un usuario y no puede ser eliminada. Por favor, compruebe la licencia en primer lugar y vuelva a intentarlo. ',

resources/lang/es-CO/admin/licenses/table.php

@@ -4,6 +4,7 @@ return array(
 
     'assigned_to'   	=> 'Asignado a',
     'checkout'   		=> 'Entrada/Salida',
+    'deleted_at'        => 'Eliminado el',
     'id'      			=> 'ID',
     'license_email'   	=> 'Email de licencia',
     'license_name'   	=> 'Licenciado a',

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

@@ -49,6 +49,7 @@ return [
     'default_eula_text'			=> 'Default EULA',
     'default_language'			=> 'Idioma por defecto',
     'default_eula_help_text'	=> 'También puede asociar EULAs personalizados a categorías específicas de activos.',
+    'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'Mostrar nombre de activo',
     'display_checkout_date'     => 'Mostrar fecha de pago',
     'display_eol'               => 'Mostrar EOL en vista de tabla',

resources/lang/es-CO/admin/users/table.php

@@ -20,6 +20,7 @@ return array(
     'lock_passwords'		=> 'Los detalles de inicio de sesión no pueden ser cambiados en esta instalación.',
     'manager' 				=> 'Jefe Inmediato',
     'managed_locations'     => 'Ubicaciones gestionadas',
+    'managed_users'         => 'Usuarios gestionados',
     'name' 					=> 'Nombre',
     'nogroup'               => 'Aún no se han creado grupos. Para añadir uno, visite: ',
     'notes'                 => 'Notas',

resources/lang/es-CO/general.php

@@ -176,7 +176,7 @@ return [
     'last_name'             => 'Apellidos',
     'license'				=> 'Licencia',
     'license_report'        => 'Informe de licencia',
-    'licenses_available'	=> 'licencias disponibles',
+    'licenses_available'	=> 'Licencias disponibles',
     'licenses'				=> 'Licencias',
     'list_all'				=> 'Listar todo',
     'loading'				=> 'Cargando... espere por favor....',
@@ -202,6 +202,8 @@ return [
     'new_password'          => 'Nueva contraseña',
     'next'					=> 'Siguiente',
     'next_audit_date'		=> 'Próxima fecha de auditoría',
+    'next_audit_date_help'  => 'If you use auditing in your organization, this is usually automatically calculated based on the asset&apos;s last audit date and audit frequency (in <code>Admin Settings &gt; Alerts</code>) and you can leave this blank. You can manually set this date here if you need to, but it must be later than the last audit date. ',
+    'audit_images_help'     => 'You can find audit images in the asset\'s history tab.',
     'no_email'              => 'No hay dirección de correo electrónico asociada a este usuario',
     'last_audit'		    => 'Última auditoría',
     'new'					=> 'nuevo!',
@@ -245,6 +247,7 @@ return [
     'select_all'            => 'Seleccionar todo',
     'search'				=> 'Buscar',
     'select_category'       => 'Seleccione una Categoría',
+    'select_datasource' => 'Seleccione un datoscópico',
     'select_department'     => 'Seleccione un departamento',
     'select_depreciation'	=> 'Seleccione un tipo de depreciación',
     'select_location'		=> 'Seleccione una ubicación',
@@ -294,6 +297,7 @@ return [
     'user'					=> 'Usuario',
     'accepted'			    => 'aceptado',
     'declined'			    => 'rechazado',
+    'declined_note'         => 'Declined Notes',
     'unassigned'            => 'Sin asignar',
     'unaccepted_asset_report' => 'Activos no aceptados',
     'users'                 => 'Usuarios',
@@ -312,6 +316,10 @@ return [
     'token_expired'         => 'Su sesión de formulario ha caducado. Por favor, inténtelo de nuevo.',
     'login_enabled'         => 'Inicio de sesión activado',
     'audit_due'             => 'Vence la auditoría',
+    'audit_due_days'        => 'Activos vencidos para auditoría dentro de :days Día|Activos vencidos para auditoría dentro de :days Días',
+    'checkin_due'           => 'Vence por Checkin',
+    'checkin_overdue'       => 'Atrasado para Checkin',
+    'checkin_due_days'      => 'Activos vencidos por cheque dentro de :days día|Activos vencidos por cheque dentro de :days días',
     'audit_overdue'         => 'Atrasado para la auditoría',
     'accept'                => 'Aceptar :asset',
     'i_accept'              => 'Acepto',
@@ -507,6 +515,9 @@ return [
     'or' => 'o',
     'url'                   => 'URL',
     'edit_fieldset' => 'Editar campos y opciones de campos',
+    'permission_denied_superuser_demo' => 'Permiso denegado. No puede actualizar la información de usuario para superadministradores en la demo.',
+    'pwd_reset_not_sent' => 'El usuario no está activado, está sincronizado con LDAP o no tiene una dirección de correo electrónico',
+    'error_sending_email' => 'Error al enviar email',
     'bulk' => [
             'delete' =>
                 [

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

@@ -5,8 +5,11 @@ return [
     'undeployable' 		=> '<strong>Atención: </strong> Este equipo está marcado como no isntalabre.
                         Si no es correcto, actualiza su estado.',
     'does_not_exist' 	=> 'Equipo inexistente.',
+    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
+    'no_tag' 	        => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'Buen intento. El activo no existe o no es solicitable.',
     'assoc_users'	 	=> 'Equipo asignado a un usuario, no se puede eliminar.',
+    'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
 
     'create' => [
         'error'   		=> 'Equipo no creado, intentalo de nuevo. :(',
@@ -17,6 +20,7 @@ return [
     'update' => [
         'error'   			=> 'Equipo no actualizado, intentalo de nuevo',
         'success' 			=> 'Equipo actualizado.',
+        'encrypted_warning' => 'Activo actualizado con éxito, pero los campos personalizados cifrados no se debieron a permisos',
         'nothing_updated'	=>  'Ningún campo fue seleccionado, por lo que nada ha sido actualizado.',
         'no_assets_selected'  =>  'Ningún recurso fue seleccionado, por lo que no se actualizó nada.',
         'assets_do_not_exist_or_are_invalid' => 'Los activos seleccionados no se pueden actualizar.',
@@ -30,7 +34,7 @@ return [
     ],
 
     'audit' => [
-        'error'   		=> 'La auditoría de activos no tuvo éxito. Vuelve a intentarlo.',
+        'error'   		=> 'Asset audit unsuccessful: :error ',
         'success' 		=> 'Auditoría de activos registrada correctamente.',
     ],
 

resources/lang/es-ES/admin/licenses/message.php

@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'La licencia no existe o no tiene permiso para verla.',
-    'user_does_not_exist' => 'Usuario inexistente.',
+    'user_does_not_exist' => 'El usuario no existe o no tiene permiso para verlos.',
     'asset_does_not_exist' 	=> 'El equipo que intentas asignar a esta licencia no existe.',
     'owner_doesnt_match_asset' => 'El equipo al que estas intentando asignar esta licenciam, está asignado a un usuario diferente que el de la licencia.',
     'assoc_users'	 => 'Esta categoría está asignada al menos a un modelo y no puede ser eliminada.',

resources/lang/es-ES/admin/licenses/table.php

@@ -4,6 +4,7 @@ return array(
 
     'assigned_to'   	=> 'Asignada a',
     'checkout'   		=> 'Quita/Asigna',
+    'deleted_at'        => 'Eliminado el',
     'id'      			=> 'ID',
     'license_email'   	=> 'Email',
     'license_name'   	=> 'Licenciado a',

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

@@ -49,6 +49,7 @@ return [
     'default_eula_text'			=> 'EULA por defecto',
     'default_language'			=> 'Idioma predeterminado',
     'default_eula_help_text'	=> 'También puede asociar EULAs personalizadas para categorías especificas de equipos.',
+    'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'Mostrar Nombre Equipo',
     'display_checkout_date'     => 'Mostrar Fecha de Salida',
     'display_eol'               => 'Mostrar EOL',

resources/lang/es-ES/admin/users/table.php

@@ -20,6 +20,7 @@ return array(
     'lock_passwords'		=> 'Los detalles de acceso no pueden ser cambiados en esta instalación.',
     'manager' 				=> 'Responsable',
     'managed_locations'     => 'Ubicaciones gestionadas',
+    'managed_users'         => 'Usuarios gestionados',
     'name' 					=> 'Usuario',
     'nogroup'               => 'Aún no se han creado grupos. Para añadir uno, visite: ',
     'notes'                 => 'Notas',

resources/lang/es-ES/general.php

@@ -176,7 +176,7 @@ return [
     'last_name'             => 'Apellidos',
     'license'				=> 'Licencia',
     'license_report'        => 'Reporte de Licencias',
-    'licenses_available'	=> 'licencias libres',
+    'licenses_available'	=> 'Licencias disponibles',
     'licenses'				=> 'Licencias',
     'list_all'				=> 'Listar Todo',
     'loading'				=> 'Cargando... por favor espere....',
@@ -202,6 +202,8 @@ return [
     'new_password'          => 'Nueva contraseña',
     'next'					=> 'Siguiente',
     'next_audit_date'		=> 'Próxima fecha de auditoría',
+    'next_audit_date_help'  => 'If you use auditing in your organization, this is usually automatically calculated based on the asset&apos;s last audit date and audit frequency (in <code>Admin Settings &gt; Alerts</code>) and you can leave this blank. You can manually set this date here if you need to, but it must be later than the last audit date. ',
+    'audit_images_help'     => 'You can find audit images in the asset\'s history tab.',
     'no_email'              => 'No hay dirección de correo electrónico asociada a este usuario',
     'last_audit'		    => 'Última auditoría',
     'new'					=> 'nuevo!',
@@ -245,6 +247,7 @@ return [
     'select_all'            => 'Seleccionar todo',
     'search'				=> 'Buscar',
     'select_category'       => 'Seleccione una categoría',
+    'select_datasource' => 'Seleccione un datoscópico',
     'select_department'     => 'Seleccione un departamento',
     'select_depreciation'	=> 'Seleccionar un tipo de Amortización',
     'select_location'		=> 'Seleccionar una Ubicación',
@@ -294,6 +297,7 @@ return [
     'user'					=> 'Usuario',
     'accepted'			    => 'aceptado',
     'declined'			    => 'declinado',
+    'declined_note'         => 'Declined Notes',
     'unassigned'            => 'Sin asignar',
     'unaccepted_asset_report' => 'Activos no aceptados',
     'users'                 => 'Usuarios',
@@ -312,6 +316,10 @@ return [
     'token_expired'         => 'Su sesión ha expirado, Intente otra ves.',
     'login_enabled'         => 'Inicio de sesión habilitado',
     'audit_due'             => 'Auditoría pendiente',
+    'audit_due_days'        => 'Activos vencidos para auditoría dentro de :days Día|Activos vencidos para auditoría dentro de :days Días',
+    'checkin_due'           => 'Vence por Checkin',
+    'checkin_overdue'       => 'Atrasado para Checkin',
+    'checkin_due_days'      => 'Activos vencidos por cheque dentro de :days día|Activos vencidos por cheque dentro de :days días',
     'audit_overdue'         => 'Auditoría retrasada',
     'accept'                => 'Aceptar :asset',
     'i_accept'              => 'Acepto',
@@ -507,6 +515,9 @@ return [
     'or' => 'o',
     'url'                   => 'URL',
     'edit_fieldset' => 'Editar campos y opciones de campos',
+    'permission_denied_superuser_demo' => 'Permiso denegado. No puede actualizar la información de usuario para superadministradores en la demo.',
+    'pwd_reset_not_sent' => 'El usuario no está activado, está sincronizado con LDAP o no tiene una dirección de correo electrónico',
+    'error_sending_email' => 'Error al enviar email',
     'bulk' => [
             'delete' =>
                 [

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

@@ -5,8 +5,11 @@ return [
     'undeployable' 		=> '<strong>Atención: </strong> Este equipo está marcado como no isntalabre.
                         Si no es correcto, actualiza su estado.',
     'does_not_exist' 	=> 'Equipo inexistente.',
+    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
+    'no_tag' 	        => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'Ese activo no existe o no puede ser solicitado.',
     'assoc_users'	 	=> 'Equipo asignado a un usuario, no se puede eliminar.',
+    'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
 
     'create' => [
         'error'   		=> 'Equipo no creado, intentalo de nuevo. :(',
@@ -17,6 +20,7 @@ return [
     'update' => [
         'error'   			=> 'Equipo no actualizado, intentalo de nuevo',
         'success' 			=> 'Equipo actualizado.',
+        'encrypted_warning' => 'Activo actualizado con éxito, pero los campos personalizados cifrados no se debieron a permisos',
         'nothing_updated'	=>  'Ningún campo fue seleccionado, por lo que nada ha sido actualizado.',
         'no_assets_selected'  =>  'Ningún recurso fue seleccionado, por lo que no se actualizó nada.',
         'assets_do_not_exist_or_are_invalid' => 'Los activos seleccionados no se pueden actualizar.',
@@ -30,7 +34,7 @@ return [
     ],
 
     'audit' => [
-        'error'   		=> 'La auditoría de activos no tuvo éxito. Vuelve a intentarlo.',
+        'error'   		=> 'Asset audit unsuccessful: :error ',
         'success' 		=> 'Auditoría de activos registrada correctamente.',
     ],