Updated British English

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

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

@@ -16,5 +16,6 @@ return array(
     'update'  							=> 'Update Accessory',
     'use_default_eula'					=> 'Use the <a href="#" data-toggle="modal" data-target="#eulaModal">primary default EULA</a> instead.',
     'use_default_eula_disabled'			=> '<del>Use the primary default EULA instead.</del> No primary default EULA is set. Please add one in Settings.',
+    'clone'                             => 'Clone Accessory',
 
 );

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

@@ -24,6 +24,7 @@ return array(
      'checkout' => array(
         'error'   		=> 'Accessory was not checked out, please try again',
         'success' 		=> 'Accessory checked out successfully.',
+        'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
         'user_does_not_exist' => 'That user is invalid. Please try again.'
     ),
 

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

@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Group already exists!',
-    'group_not_found'     => 'Group [:id] does not exist.',
+    'group_not_found'     => 'Group ID :id does not exist.',
     'group_name_required' => 'The name field is required',
 
     'success' => array(

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

@@ -2,8 +2,11 @@
 
 return [
     'bulk_delete'		=> 'Confirm Bulk Delete Assets',
+    'bulk_restore'      => 'Confirm Bulk Restore Assets', 
   'bulk_delete_help'	=> 'Review the assets for bulk deletion below. Once deleted, these assets can be restored, but they will no longer be associated with any users they are currently assigned to.',
+  'bulk_restore_help'	=> 'Review the assets for bulk restoration below. Once restored, these assets will not be associated with any users they were previously assigned to.',
   'bulk_delete_warn'	=> 'You are about to delete :asset_count assets.',
+  'bulk_restore_warn'	=> 'You are about to restore :asset_count assets.',
     'bulk_update'		=> 'Bulk Update Assets',
     'bulk_update_help'	=> 'This form allows you to update multiple assets at once. Only fill in the fields you need to change. Any fields left blank will remain unchanged. ',
     'bulk_update_warn'	=> 'You are about to edit the properties of a single asset.|You are about to edit the properties of :asset_count assets.',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
     'asset_deployable' => 'That status is deployable. This asset can be checked out.',
-    'processing_spinner' => 'Processing...',
+    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
     'optional_infos'  => 'Optional Information',
     'order_details'   => 'Order Related Information'
 ];

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

@@ -42,5 +42,6 @@ return [
     'error_messages' => 'Error messages:',
     'success_messages' => 'Success messages:',
     'alert_details' => 'Please see below for details.',
-    'custom_export' => 'Custom Export'
+    'custom_export' => 'Custom Export',
+    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
 ];

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

@@ -23,6 +23,8 @@ return [
     'restore' => [
         'error'   		=> 'Asset was not restored, please try again',
         'success' 		=> 'Asset restored successfully.',
+        'bulk_success' 		=> 'Asset restored successfully.',
+        'nothing_updated'   => 'No assets were selected, so nothing was restored.', 
     ],
 
     'audit' => [

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

@@ -6,7 +6,7 @@ return array(
     'deleted'  					        => 'This model has been deleted.',
     'bulk_delete'               => 'Bulk Delete Asset Models',
     'bulk_delete_help'               => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
-    'bulk_delete_warn'          => 'You are about to delete :model_count asset models.',
+    'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
     'restore'                   => 'Restore Model',
     'requestable'               => 'Users may request this model',
 	'show_mac_address'			      => 'Show MAC address field in assets in this model',

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

@@ -16,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'Model was not updated, please try again',
-        'success' => 'Model updated successfully.'
+        'success' => 'Model updated successfully.',
     ),
 
     'delete' => array(
@@ -32,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'No fields were changed, so nothing was updated.',
-        'success' 		=> 'Models updated.'
+        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
+        'warn'          => 'You are about to update the properies of the following model: |You are about to edit the properties of the following :model_count models:',
+
     ),
 
     'bulkdelete' => array(
         'error'   		    => 'No models were selected, so nothing was deleted.',
-        'success' 		    => ':success_count model(s) deleted!',
+        'success' 		    => 'Model deleted!|:success_count models deleted!',
         'success_partial' 	=> ':success_count model(s) were deleted, however :fail_count were unable to be deleted because they still have assets associated with them.'
     ),
 

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

@@ -11,7 +11,7 @@ return [
     'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
     'is_ad'				        => 'This is an Active Directory server',
     'alerts'                	=> 'Alerts',
-    'alert_title'               => 'Update Alert Settings',
+    'alert_title'               => 'Update Notification Settings',
     'alert_email'				=> 'Send alerts to',
     'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
     'alerts_enabled'			=> 'Alerts Enabled',
@@ -198,16 +198,21 @@ return [
     'show_images_in_email'     => 'Show images in emails',
     'show_images_in_email_help'   => 'Uncheck this box if your Snipe-IT installation is behind a VPN or closed network and users outside the network will not be able to load images served from this installation in their emails.',
     'site_name'                 => 'Site Name',
+    'integrations'               => 'Integrations',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Update Slack Settings',
+    'general_webhook'           => 'General Webhook',
-    'slack_help'                => 'Slack Settings',
+    'webhook'                   => ':app',
-    'slack_botname'             => 'Slack Botname',
+    'webhook_presave'           => 'Test to Save',
-    'slack_channel'             => 'Slack Channel',
+    'webhook_title'               => 'Update Webhook Settings',
-    'slack_endpoint'            => 'Slack Endpoint',
+    'webhook_help'                => 'Integration settings',
-    'slack_integration'         => 'Slack Settings',
+    'webhook_botname'             => ':app Botname',
-    'slack_integration_help'    => 'Slack integration is optional, however the endpoint and channel are required if you wish to use it. To configure Slack integration, you must first <a href=":slack_link" target="_new" rel="noopener">create an incoming webhook</a> on your Slack account. Click on the <strong>Test Slack Integration</strong> button to confirm your settings are correct before saving. ',
+    'webhook_channel'             => ':app Channel',
-    'slack_integration_help_button'    => 'Once you have saved your Slack information, a test button will appear.',
+    'webhook_endpoint'            => ':app Endpoint',
-    'slack_test_help'           => 'Test whether your Slack integration is configured correctly. YOU MUST SAVE YOUR UPDATED SLACK SETTINGS FIRST.',
+    'webhook_integration'         => ':app Settings',
+    'webhook_test'                 =>'Test :app integration',
+    'webhook_integration_help'    => ':app integration is optional, however the endpoint and channel are required if you wish to use it. To configure :app integration, you must first <a href=":webhook_link" target="_new" rel="noopener">create an incoming webhook</a> on your :app account. Click on the <strong>Test :app Integration</strong> button to confirm your settings are correct before saving. ',
+    'webhook_integration_help_button'    => 'Once you have saved your :app information, a test button will appear.',
+    'webhook_test_help'           => 'Test whether your :app integration is configured correctly. YOU MUST SAVE YOUR UPDATED :app SETTINGS FIRST.',
     'snipe_version'  			=> 'Snipe-IT version',
     'support_footer'            => 'Support Footer Links ',
     'support_footer_help'       => 'Specify who sees the links to the Snipe-IT Support info and Users Manual',
@@ -302,7 +307,7 @@ return [
     'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, Date &amp; Currency Display',
     'notifications' => 'Notifications',
-    'notifications_help' => 'Email Alerts &amp; Audit Settings',
+    'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',

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

@@ -33,12 +33,12 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
-    'slack' => [
+    'webhook' => [
-        'sending' => 'Sending Slack test message...',
+        'sending' => 'Sending :app test message...',
         'success_pt1' => 'Success! Check the ',
         'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
         '500' => '500 Server Error.',
-        'error' => 'Something went wrong. Slack responded with: :error_message',
+        'error' => 'Something went wrong. :app responded with: :error_message',
         'error_misc' => 'Something went wrong. :( ',
     ]
 ];

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

@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'Print All Assigned',
     'email_assigned'    => 'Email List of All Assigned',
     'user_notified'     => 'User has been emailed a list of their currently assigned items.',
+    'auto_assign_label' => 'Include this user when auto-assigning eligible licenses',
+    'auto_assign_help'  => 'Skip this user in auto assignment of licenses',
     'software_user'     => 'Software Checked out to :name',
     'send_email_help'   => 'You must provide an email address for this user to send them credentials. Emailing credentials can only be done on user creation. Passwords are stored in a one-way hash and cannot be retrieved once saved.',
     'view_user'         => 'View User :name',
@@ -33,7 +35,6 @@ 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' => 'WARNING:',
     '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',
@@ -41,4 +42,13 @@ return [
     'remote'   => 'Remote',
     'remote_help' => 'This can be useful if you need to filter by remote users who never or rarely come into your physical locations.',
     'not_remote_label' => 'This is not a remote user',
-];
+    'vip_label' => 'VIP user',
+    'vip_help' => 'This can be helpful to mark important people in your org if you would like to handle them in special ways.',
+    'create_user' => 'Create a user',
+    'create_user_page_explanation' => 'This is the account information you will use to access the site for the first time.',
+    'email_credentials' => 'Email credentials',
+    'email_credentials_text' => 'Email my credentials to the email address above',
+    'next_save_user' => 'Next: Save User',
+    'all_assigned_list_generation' => 'Generated on:',
+    'email_user_creds_on_create' => 'Email this user their credentials?',
+];

resources/lang/en-GB/general.php

@@ -45,7 +45,7 @@ return [
     'bulk_edit'             => 'Bulk Edit',
     'bulk_delete'           => 'Bulk Delete',
     'bulk_actions'          => 'Bulk Actions',
-    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
+    'bulk_checkin_delete'   => 'Bulk Checkin / Delete Users',
     'byod'                  => 'BYOD',
     'byod_help'             => 'This device is owned by the user',
     'bystatus'              => 'by Status',
@@ -148,6 +148,7 @@ return [
     '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.',
     'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, and svg. Max upload size allowed is :size.',
+    'unaccepted_image_type'  => 'This image file was not readable. Accepted filetypes are jpg, webp, png, gif, and svg. The mimetype of this file is: :mimetype.',
     'import'         	    => 'Import',
     'importing'         	=> 'Importing',
     'importing_help'        => 'You can import assets, accessories, licenses, components, consumables, and users via CSV file. <br><br>The CSV should be comma-delimited and formatted with headers that match the ones in the <a href="https://snipe-it.readme.io/docs/importing" target="_new">sample CSVs in the documentation</a>.',
@@ -157,6 +158,8 @@ return [
     'asset_maintenances'       => 'Asset Maintenances',
     'item'  				=> 'Item',
     'item_name'             => 'Item Name',
+    'import_file'  			=> 'import CSV file',
+    'import_type'  			=> 'CSV import type',
     'insufficient_permissions' => 'Insufficient permissions!',
     'kits'       			=> 'Predefined Kits',
     'language'				=> 'Language',
@@ -227,6 +230,7 @@ return [
     'requested_assets_menu' => 'Requested Assets',
     'request_canceled'      => 'Request Canceled',
     'save'  				=> 'Save',
+    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Select',
     'select_all'            => 'Select All',
     'search'				=> 'Search',
@@ -249,8 +253,8 @@ return [
     'signature'             => 'Signature',
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Skin',
-    'slack_msg_note'        => 'A slack message will be sent',
+    'webhook_msg_note'        => 'A notification will be sent via webhook',
-    'slack_test_msg'        => 'Oh hai! Looks like your Slack integration with Snipe-IT is working!',
+    'webhook_test_msg'        => 'Oh hai! Looks like your :app integration with Snipe-IT is working!',
     'some_features_disabled' => 'DEMO MODE: Some features are disabled for this installation.',
     'site_name'				=> 'Site Name',
     'state'  				=> 'State',
@@ -262,7 +266,6 @@ return [
     'sure_to_delete'    => 'Are you sure you wish to delete',
     'submit'				=> 'Submit',
     'target'                => 'Target',
-    'toggle_navigation'     => 'Toogle Navigation',
     'time_and_date_display' => 'Time and Date Display',
     'total_assets'			=> 'total assets',
     'total_licenses'		=> 'total licenses',
@@ -384,7 +387,8 @@ return [
     '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.',
-    'set_to_null' => 'Delete values for this asset|Delete values for all :asset_count assets ',
+    'set_to_null'           => 'Delete values for this asset|Delete values for all :asset_count assets ',
+    'set_users_field_to_null'  => 'Delete :field values for this user|Delete :field values for all :user_count users ',
     'na_no_purchase_date'   => 'N/A - No purchase date provided',
     'assets_by_status'      => 'Assets by Status',
     'assets_by_status_type'      => 'Assets by Status Type',
@@ -403,7 +407,36 @@ return [
     'toggle_navigation'     => 'Toggle navigation',
     'alerts'                => 'Alerts',
     'tasks_view_all'        => 'View all tasks',
-
+    'true'                  => 'True',
-
+    'false'                 => 'False',
-
+    'integration_option'    => 'Integration Option',
-];
+    'log_does_not_exist'    => 'No matching log record exists.',
+    'merge_users'           => 'Merge Users',
+    'merge_information' =>  'This will merge the :count users into a single user. Select the user you wish to merge the others into below, and the associated assets, licences, etc will be moved over to the selected user and the other users will be marked as deleted.',
+    'warning_merge_information' => 'This action CANNOT be undone and should ONLY be used when you need to merge users because of a bad import or sync. Be sure to run a backup first.',
+    'no_users_selected'     => 'No users selected',
+    'not_enough_users_selected'     => 'At least :count users must be selected',
+    'merge_success'         => ':count users merged successfully into :into_username!',
+    'merged'                => 'merged',
+    'merged_log_this_user_into' => 'Merged this user (ID :to_id - :to_username) into user ID :from_id (:from_username) ',
+    'merged_log_this_user_from' => 'Merged user ID :from_id (:from_username) into this user (ID :to_id - :to_username)',
+    'clear_and_save'            => 'Clear & Save',
+    'update_existing_values'    => 'Update Existing Values?',
+    'auto_incrementing_asset_tags_disabled_so_tags_required' => 'Generating auto-incrementing asset tags is disabled so all rows need to have the "Asset Tag" column populated.',
+    'auto_incrementing_asset_tags_enabled_so_now_assets_will_be_created' => 'Note: Generating auto-incrementing asset tags is enabled so assets will be created for rows that do not have "Asset Tag" populated. Rows that do have "Asset Tag" populated will be updated with the provided information.',
+    'send_welcome_email_to_users'   => ' Send Welcome Email for new Users?',
+    'back_before_importing'     => 'Backup before importing?',
+    'csv_header_field'          => 'CSV Header Field',
+    'import_field'              => 'Import Field',
+    'sample_value'              => 'Sample Value',
+    'no_headers'                => 'No Columns Found',
+    'error_in_import_file'      => 'There was an error reading the CSV file: :error',
+    'percent_complete'          => ':percent % Complete',
+    'errors_importing'          => 'Some Errors occurred while importing: ',
+    'warning'                   => 'WARNING: :warning',
+    'success_redirecting'       => '"Success... Redirecting.',
+    'setup_successful_migrations' => 'Your database tables have been created',
+    'setup_migration_output' => 'Migration output:',
+    'setup_migration_create_user' => 'Next: Create User',
+    'importer_generic_error'    => 'Your file import is complete, but we did receive an error. This is usually caused by third-party API throttling from a notification webhook (such as Slack) and would not have interfered with the import itself, but you should confirm this.',
+];