Merge remote-tracking branch 'origin/develop'

Signed-off-by: snipe <[email protected]> # Conflicts: # config/version.php
snipe · Aug 8, 2022 · 80d91c0 · 80d91c0
2 parents 51f7298 + c39bf7b
commit 80d91c0
Show file tree

Hide file tree

Showing 487 changed files with 4,156 additions and 908 deletions.
diff --git a/config/version.php b/config/version.php
@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v6.0.8',
-  'full_app_version' => 'v6.0.8 - build 8409-gff5d64fcb',
-  'build_version' => '8409',
+  'app_version' => 'v6.0.9',
+  'full_app_version' => 'v6.0.9 - build 8515-g51f729872',
+  'build_version' => '8515',
   'prerelease_version' => '',
-  'hash_version' => 'gff5d64fcb',
-  'full_hash' => 'v6.0.8-56-gff5d64fcb',
+  'hash_version' => 'g51f729872',
+  'full_hash' => 'v6.0.9-103-g51f729872',
   'branch' => 'master',
-);
+);
diff --git a/resources/lang/af/admin/asset_maintenances/general.php b/resources/lang/af/admin/asset_maintenances/general.php
@@ -11,4 +11,6 @@
         'calibration'        => 'Calibration',
         'software_support'   => 'Software Support',
         'hardware_support'   => 'Hardware Support',
+        'configuration_change'   => 'Configuration Change',
+        'pat_test'           => 'PAT Test',
     ];
diff --git a/resources/lang/af/admin/users/general.php b/resources/lang/af/admin/users/general.php
@@ -34,7 +34,7 @@
     'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
     'remove_group_memberships' => 'Remove Group Memberships',
     'warning_deletion' => 'WARNING:',
-    'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
+    'warning_deletion_information' => 'You are about to checkin ALL items from the :count user(s) listed below. Super admin names are highlighted in red.',
     'update_user_assets_status' => 'Update all assets for these users to this status',
     'checkin_user_properties' => 'Check in all properties associated with these users',
     'remote_label'   => 'This is a remote user',

diff --git a/resources/lang/af/admin/users/message.php b/resources/lang/af/admin/users/message.php
@@ -14,6 +14,7 @@
     'ldap_not_configured'        => 'LDAP-integrasie is nie vir hierdie installasie gekonfigureer nie.',
     'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
     'password_reset_sent'       => 'A password reset link has been sent to :email!',
+    'user_has_no_email'         => 'This user does not have an email address in their profile.',
 
 
     'success' => array(
@@ -58,4 +59,4 @@
         'invalidfiles' => 'Een of meer van jou lêers is te groot of is \'n filetipe wat nie toegelaat word nie. Toegelate filetipes is png, gif, jpg, doc, docx, pdf en txt.',
     ),
 
-);
+);
diff --git a/resources/lang/af/button.php b/resources/lang/af/button.php
@@ -4,7 +4,7 @@
     'actions' 	                => 'aksies',
     'add'    	                => 'Voeg nuwe',
     'cancel'                    => 'kanselleer',
-    'checkin_and_delete'  	    => 'Kontroleer en verwyder gebruiker',
+    'checkin_and_delete'  	    => 'Checkin All / Delete User',
     'delete'  	                => 'verwyder',
     'edit'    	                => 'wysig',
     'restore' 	                => 'herstel',

diff --git a/resources/lang/af/general.php b/resources/lang/af/general.php
@@ -37,7 +37,7 @@
     'bulk_edit'             => 'Bulk Edit',
     'bulk_delete'           => 'Bulk Delete',
     'bulk_actions'          => 'Bulk Actions',
-    'bulk_checkin_delete'   => 'Bulk Checkin &amp; Delete',
+    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
     'bystatus'              => 'by Status',
     'cancel'  				=> 'kanselleer',
     'categories'			=> 'kategorieë',
@@ -101,6 +101,8 @@
     'employee_number'       => 'Employee Number',
     'email_domain_help'		=> 'Dit word gebruik om e-posadresse te genereer wanneer u dit invoer',
     'error'				    => 'Error',
+    'exclude_archived'      => 'Exclude Archived Assets',
+    'exclude_deleted'       => 'Exclude Deleted Assets',
     'example'				=> 'Example: ',
     'filastname_format'			=> 'Eerste Voorletter ([email protected])',
     'firstname_lastname_format'	=> 'Vir Naam Van ([email protected])',
@@ -131,6 +133,7 @@
     'id'  					=> 'ID',
     'image'                 => 'Image',
     'image_delete'         	=> 'Vee prent uit',
+    'include_deleted'       => 'Include Deleted Assets',
     'image_upload'         	=> 'Laai prent op',
     'filetypes_accepted_help'    => 'Accepted filetype is :types. Max upload size allowed is :size.|Accepted filetypes are :types. Max upload size allowed is :size.',
     'filetypes_size_help'   => 'Max upload size allowed is :size.',
@@ -184,6 +187,7 @@
     'no'  					=> 'Geen',
     'notes'  				=> 'notas',
     'order_number'          => 'Bestellingnommer',
+    'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Wys _MENU_ items',
     'pagination_info'		=> 'Wys _START_ tot _END_ van _TOTAL_ items',
     'pending'				=> 'hangende',
@@ -364,5 +368,9 @@
     'backup_delete_not_allowed'     => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
     'additional_files'           => 'Additional Files',
     'shitty_browser'        => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
+    'bulk_soft_delete'      =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
+    'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
+    'bulk_checkin_success' => 'The items for the selected users have been checked in.',
+
 
 ];
diff --git a/resources/lang/am/admin/asset_maintenances/general.php b/resources/lang/am/admin/asset_maintenances/general.php
@@ -11,4 +11,6 @@
         'calibration'        => 'Calibration',
         'software_support'   => 'Software Support',
         'hardware_support'   => 'Hardware Support',
+        'configuration_change'   => 'Configuration Change',
+        'pat_test'           => 'PAT Test',
     ];
diff --git a/resources/lang/am/admin/users/general.php b/resources/lang/am/admin/users/general.php
@@ -34,7 +34,7 @@
     'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
     'remove_group_memberships' => 'Remove Group Memberships',
     'warning_deletion' => 'WARNING:',
-    'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
+    'warning_deletion_information' => 'You are about to checkin ALL items from the :count user(s) listed below. Super admin names are highlighted in red.',
     'update_user_assets_status' => 'Update all assets for these users to this status',
     'checkin_user_properties' => 'Check in all properties associated with these users',
     'remote_label'   => 'This is a remote user',

diff --git a/resources/lang/am/admin/users/message.php b/resources/lang/am/admin/users/message.php
@@ -14,6 +14,7 @@
     'ldap_not_configured'        => 'LDAP integration has not been configured for this installation.',
     'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
     'password_reset_sent'       => 'A password reset link has been sent to :email!',
+    'user_has_no_email'         => 'This user does not have an email address in their profile.',
 
 
     'success' => array(
@@ -58,4 +59,4 @@
         'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
     ),
 
-);
+);
diff --git a/resources/lang/am/button.php b/resources/lang/am/button.php
@@ -4,7 +4,7 @@
     'actions' 	                => 'Actions',
     'add'    	                => 'Add New',
     'cancel'                    => 'Cancel',
-    'checkin_and_delete'  	    => 'Checkin & Delete User',
+    'checkin_and_delete'  	    => 'Checkin All / Delete User',
     'delete'  	                => 'Delete',
     'edit'    	                => 'Edit',
     'restore' 	                => 'Restore',

diff --git a/resources/lang/am/general.php b/resources/lang/am/general.php
@@ -37,7 +37,7 @@
     'bulk_edit'             => 'Bulk Edit',
     'bulk_delete'           => 'Bulk Delete',
     'bulk_actions'          => 'Bulk Actions',
-    'bulk_checkin_delete'   => 'Bulk Checkin &amp; Delete',
+    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
     'bystatus'              => 'by Status',
     'cancel'  				=> 'Cancel',
     'categories'			=> 'Categories',
@@ -101,6 +101,8 @@
     'employee_number'       => 'Employee Number',
     'email_domain_help'		=> 'This is used to generate email addresses when importing',
     'error'				    => 'Error',
+    'exclude_archived'      => 'Exclude Archived Assets',
+    'exclude_deleted'       => 'Exclude Deleted Assets',
     'example'				=> 'Example: ',
     'filastname_format'			=> 'First Initial Last Name ([email protected])',
     'firstname_lastname_format'	=> 'First Name Last Name ([email protected])',
@@ -131,6 +133,7 @@
     'id'  					=> 'ID',
     'image'                 => 'Image',
     'image_delete'         	=> 'Delete Image',
+    'include_deleted'       => 'Include Deleted Assets',
     'image_upload'         	=> 'Upload Image',
     'filetypes_accepted_help'    => 'Accepted filetype is :types. Max upload size allowed is :size.|Accepted filetypes are :types. Max upload size allowed is :size.',
     'filetypes_size_help'   => 'Max upload size allowed is :size.',
@@ -184,6 +187,7 @@
     'no'  					=> 'No',
     'notes'  				=> 'Notes',
     'order_number'          => 'Order Number',
+    'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Showing _MENU_ items',
     'pagination_info'		=> 'Showing _START_ to _END_ of _TOTAL_ items',
     'pending'				=> 'Pending',
@@ -364,5 +368,9 @@
     'backup_delete_not_allowed'     => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
     'additional_files'           => 'Additional Files',
     'shitty_browser'        => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
+    'bulk_soft_delete'      =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
+    'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
+    'bulk_checkin_success' => 'The items for the selected users have been checked in.',
+
 
 ];
diff --git a/resources/lang/ar/admin/asset_maintenances/general.php b/resources/lang/ar/admin/asset_maintenances/general.php
@@ -11,4 +11,6 @@
         'calibration'        => 'المعايره',
         'software_support'   => 'دعم البرامج',
         'hardware_support'   => 'دعم الأجهزة',
+        'configuration_change'   => 'Configuration Change',
+        'pat_test'           => 'PAT Test',
     ];
diff --git a/resources/lang/ar/admin/users/general.php b/resources/lang/ar/admin/users/general.php
@@ -34,7 +34,7 @@
     'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
     'remove_group_memberships' => 'Remove Group Memberships',
     'warning_deletion' => 'تحذير:',
-    'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
+    'warning_deletion_information' => 'You are about to checkin ALL items from the :count user(s) listed below. Super admin names are highlighted in red.',
     'update_user_assets_status' => 'Update all assets for these users to this status',
     'checkin_user_properties' => 'Check in all properties associated with these users',
     'remote_label'   => 'This is a remote user',

diff --git a/resources/lang/ar/admin/users/message.php b/resources/lang/ar/admin/users/message.php
@@ -14,6 +14,7 @@
     'ldap_not_configured'        => 'لم يتم تكوين دمج لداب لهذا التثبيت.',
     'password_resets_sent'      => 'تم إرسال رابط إعادة تعيين كلمة المرور للمستخدمين المحددين الذين تم تفعيلهم ولديهم عناوين بريد إلكتروني صالحة.',
     'password_reset_sent'       => 'تم إرسال رابط إعادة تعيين كلمة المرور إلى البريد الإلكتروني!',
+    'user_has_no_email'         => 'This user does not have an email address in their profile.',
 
 
     'success' => array(
@@ -58,4 +59,4 @@
         'invalidfiles' => 'واحد أو أكثر من الملفات كبير جدا أو هو نوع ملف غير مسموح به. أنواع الملفات المسموح بها هي ينغ و جيف و جبغ و دوك و دوك و بدف و تكست.',
     ),
 
-);
+);
diff --git a/resources/lang/ar/button.php b/resources/lang/ar/button.php
@@ -4,7 +4,7 @@
     'actions' 	                => 'الإجراءات',
     'add'    	                => 'إضافة جديد',
     'cancel'                    => 'إلغاء',
-    'checkin_and_delete'  	    => 'فحص وحذف المستخدم',
+    'checkin_and_delete'  	    => 'Checkin All / Delete User',
     'delete'  	                => 'حذف',
     'edit'    	                => 'تعديل',
     'restore' 	                => 'إستعادة',

diff --git a/resources/lang/ar/general.php b/resources/lang/ar/general.php
@@ -37,7 +37,7 @@
     'bulk_edit'             => 'تحرير بالجملة',
     'bulk_delete'           => 'حذف بالجملة',
     'bulk_actions'          => 'مجموعة إجراءات',
-    'bulk_checkin_delete'   => 'التدقيق بالجملة &amp; حذف',
+    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
     'bystatus'              => 'حسب الحالة',
     'cancel'  				=> 'إلغاء',
     'categories'			=> 'التصنيفات',
@@ -101,6 +101,8 @@
     'employee_number'       => 'رقم الموظف',
     'email_domain_help'		=> 'يتم استخدام هذا لتوليد عناوين البريد الإلكتروني عند الاستيراد',
     'error'				    => 'خطأ',
+    'exclude_archived'      => 'Exclude Archived Assets',
+    'exclude_deleted'       => 'Exclude Deleted Assets',
     'example'				=> 'Example: ',
     'filastname_format'			=> 'الاسم الأخير الأول ([email protected])',
     'firstname_lastname_format'	=> 'الاسم الأول الاسم الأخير ([email protected])',
@@ -131,6 +133,7 @@
     'id'  					=> 'رقم التعريف',
     'image'                 => 'صورة',
     'image_delete'         	=> 'حذف الصورة',
+    'include_deleted'       => 'Include Deleted Assets',
     'image_upload'         	=> 'رفع صورة',
     'filetypes_accepted_help'    => 'نوع الملف المقبول هو :types. الحد الأقصى لحجم التحميل المسموح به هو :size.|أنواع الملف المقبول هي :types. الحد الأقصى لحجم التحميل المسموح به هو :size.',
     'filetypes_size_help'   => 'الحد الأقصى لحجم الرفع المسموح به هو :size.',
@@ -184,6 +187,7 @@
     'no'  					=> 'لا',
     'notes'  				=> 'مُلاحظات',
     'order_number'          => 'رقم الأمر',
+    'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'عرض عناصر _MENU_',
     'pagination_info'		=> 'عرض _START_ إلى _END_ من إجمالي العناصر البالغ عددها TOTAL_',
     'pending'				=> 'قيد الانتظار',
@@ -329,7 +333,7 @@
     'invalid_category'      => 'فئة غير صالحة',
     'dashboard_info'        => 'هذه هي لوحة التحكم الخاصة بك. هناك العديد من هذه اللوحة، ولكن هذه اللوحة لك.',
     '60_percent_warning'    => 'تم اكمال 60% (تحذير)',
-    'dashboard_empty'       => 'يبدو أنك لم تضف أي شيء حتى الآن، لذلك ليس لدينا أي شيء رائع لعرضه. ابدأ بإضافة بعض الأصول، الملحقات، المواد الاستهلاكية، أو التراخيص الآن!',
+    'dashboard_empty'       => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
     'new_asset'             => 'أصل جديد',
     'new_license'           => 'ترخيص جديد',
     'new_accessory'         => 'ملحق الجودة',
@@ -364,5 +368,9 @@
     'backup_delete_not_allowed'     => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
     'additional_files'           => 'Additional Files',
     'shitty_browser'        => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
+    'bulk_soft_delete'      =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
+    'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
+    'bulk_checkin_success' => 'The items for the selected users have been checked in.',
+
 
 ];
diff --git a/resources/lang/bg/admin/asset_maintenances/general.php b/resources/lang/bg/admin/asset_maintenances/general.php
@@ -11,4 +11,6 @@
         'calibration'        => 'Калибриране',
         'software_support'   => 'Софтуерна Поддръжка',
         'hardware_support'   => 'Хардуерна Поддръжка',
+        'configuration_change'   => 'Configuration Change',
+        'pat_test'           => 'PAT Test',
     ];
diff --git a/resources/lang/bg/admin/users/general.php b/resources/lang/bg/admin/users/general.php
@@ -34,7 +34,7 @@
     'admin_permission_warning' => 'Само потребители с административни права може да дадат админ достъп.',
     'remove_group_memberships' => 'Премахни членовете на групата',
     'warning_deletion' => 'ВНИМАНИЕ:',
-    'warning_deletion_information' => 'Ще изтриете всичките :count потребител(и) посочени в списъка. Супер админ имената са оцветени в червено.',
+    'warning_deletion_information' => 'You are about to checkin ALL items from the :count user(s) listed below. Super admin names are highlighted in red.',
     'update_user_assets_status' => 'Update all assets for these users to this status',
     'checkin_user_properties' => 'Впиши всички асоцирани настройки към тези потребители',
     'remote_label'   => 'This is a remote user',

diff --git a/resources/lang/bg/admin/users/message.php b/resources/lang/bg/admin/users/message.php
@@ -14,6 +14,7 @@
     'ldap_not_configured'        => 'Интеграцията с LDAP не е конфигурирана за тази инсталация.',
     'password_resets_sent'      => 'Избраните потребители, които са активирани и имат валиден е-майл адрес им беше изпратен линк за смяна на парола.',
     'password_reset_sent'       => 'A password reset link has been sent to :email!',
+    'user_has_no_email'         => 'This user does not have an email address in their profile.',
 
 
     'success' => array(
@@ -58,4 +59,4 @@
         'invalidfiles' => 'Един или повече файлове са твърде големи или с неразрешен тип. Разрешените типове файлове са png, gif, jpg, doc, docx, pdf, и txt.',
     ),
 
-);
+);
diff --git a/resources/lang/bg/button.php b/resources/lang/bg/button.php
@@ -4,7 +4,7 @@
     'actions' 	                => 'Действия',
     'add'    	                => 'Добави нов',
     'cancel'                    => 'Отказ',
-    'checkin_and_delete'  	    => 'Вписване и изтриване на потребител',
+    'checkin_and_delete'  	    => 'Checkin All / Delete User',
     'delete'  	                => 'Изтриване',
     'edit'    	                => 'Редакция',
     'restore' 	                => 'Възстановяване',