Skip to content

A free open source IT asset/license management system

Updated strings

snipe62bf61402ed3
diff --git a/resources/lang/en-US/admin/users/general.php b/resources/lang/en-US/admin/users/general.php
index e04d2b7de0..fe7990baf9 100644
--- a/resources/lang/en-US/admin/users/general.php
+++ b/resources/lang/en-US/admin/users/general.php
@@ -37,7 +37,7 @@ return [
'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',
'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
'remove_group_memberships' => 'Remove Group Memberships',
- 'warning_deletion_information' => 'You are about to checkin ALL items from the :count user(s) listed below. Super admin names are highlighted in red.',
+ 'warning_deletion_information' => 'You are about to checkin ALL items from the :count user(s) listed below.',
'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/en-US/general.php b/resources/lang/en-US/general.php
index da711677ff..76ef7d96ee 100644
--- a/resources/lang/en-US/general.php
+++ b/resources/lang/en-US/general.php
@@ -465,7 +465,7 @@ return [
'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_soft_delete' =>'Also soft-delete these users. Their item history will remain intact unless/until you purge deleted records in the Admin Settings.',
'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
'bulk_checkin_success' => 'The items for the selected users have been checked in.',
'set_to_null' => 'Delete values for this selection|Delete values for all :selection_count selections ',
@@ -649,6 +649,7 @@ return [
'upload_deleted' => 'Upload Deleted',
'child_locations' => 'Child Locations',
'append' => 'Append',
+ 'optional' => 'OPTIONAL',
// Add form placeholders here
'placeholders' => [
diff --git a/resources/lang/en-US/tooltips.php b/resources/lang/en-US/tooltips.php
new file mode 100644
index 0000000000..73817c32be
--- /dev/null
+++ b/resources/lang/en-US/tooltips.php
@@ -0,0 +1,24 @@
+<?php
+
+return array(
+
+ 'disabled_assoc' => [
+ 'accessory' => 'This accessory cannot be deleted because it still has items, users, or locations associated with it',
+ 'asset' => 'This asset cannot be deleted because it still has items associated with it',
+ 'category' => 'This category cannot be deleted because it still has items associated with it',
+ 'company' => 'This company cannot be deleted because it still has items or users associated with it',
+ 'component' => 'This component cannot be deleted because it still has items associated with it',
+ 'custom_field' => 'This custom field cannot be deleted because it is still associated with at least one fieldset',
+ 'department' => 'This department cannot be deleted because it still has users associated with it',
+ 'location' => 'This location cannot be deleted because it still has items or users associated with it',
+ 'manufacturer' => 'This manufacturer cannot be deleted because it still has items associated with it',
+ 'supplier' => 'This supplier cannot be deleted because it still has items associated with it',
+ 'user' => 'This user cannot be deleted because it still has items associated with it',
+ 'user_self' => 'You cannot delete yourself',
+ ],
+
+ 'checkin_all' => [
+ 'user' => 'Checkin all items for this user and optionally delete them. You will be able to confirm this on the next page.'
+ ],
+
+);