Merge pull request #12801 from snipe/translations/updated_for_v6.1.0

Translations/updated for v6.1.0

resources/lang/af/admin/accessories/general.php

@@ -16,5 +16,6 @@ return array(
     'update'  							=> 'Opdatering bywerk',
     'use_default_eula'					=> 'Gebruik eerder die <a href="#" data-toggle="modal" data-target="#eulaModal">primary standaard EULA</a>.',
     'use_default_eula_disabled'			=> '<del>Gebruik die primêre standaardverlof in plaas daarvan.</del> Geen primêre standaard EULA is ingestel nie. Voeg asseblief een by Instellings.',
+    'clone'                             => 'Clone Accessory',
 
 );

resources/lang/af/admin/accessories/message.php

@@ -24,6 +24,7 @@ return array(
      'checkout' => array(
         'error'   		=> 'Toebehore is nie nagegaan nie, probeer asseblief weer',
         'success' 		=> 'Toebehore suksesvol nagegaan.',
+        'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
         'user_does_not_exist' => 'Die gebruiker is ongeldig. Probeer asseblief weer.'
     ),
 

resources/lang/af/admin/asset_maintenances/form.php

@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Onderhoudstipe',
+        'asset_maintenance_type' => 'Asset Maintenance Type',
         'title'                  => 'Titel',
-        'start_date'             => 'begin',
+        'start_date'             => 'Start Date',
-        'completion_date'        => 'voltooi',
+        'completion_date'        => 'Completion Date',
         'cost'                   => 'koste',
         'is_warranty'            => 'Garantieverbetering',
-        'asset_maintenance_time' => 'dae',
+        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
         'notes'                  => 'notas',
-        'update'                 => 'Opdateer',
+        'update'                 => 'Update Asset Maintenance',
-        'create'                 => 'Skep'
+        'create'                 => 'Create Asset Maintenance'
     ];

resources/lang/af/admin/groups/message.php

@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Groep bestaan ​​reeds!',
-    'group_not_found'     => 'Groep [: id] bestaan ​​nie.',
+    'group_not_found'     => 'Group ID :id does not exist.',
     'group_name_required' => 'Die naam veld is nodig',
 
     'success' => array(

resources/lang/af/admin/hardware/form.php

@@ -2,8 +2,11 @@
 
 return [
     'bulk_delete'		=> 'Bevestig bates vir die verwydering van grootmaat',
+    'bulk_restore'      => 'Confirm Bulk Restore Assets', 
   'bulk_delete_help'	=> 'Hersien die bates vir grootmaatverwydering hieronder. Sodra dit verwyder is, kan hierdie bates herstel word, maar hulle word nie meer geassosieer met enige gebruikers wat hulle tans toegewys is nie.',
+  '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'	=> 'Jy is op die punt om te verwyder: bate_count bates.',
+  'bulk_restore_warn'	=> 'You are about to restore :asset_count assets.',
     'bulk_update'		=> 'Grootskaalse opdateringsbates',
     'bulk_update_help'	=> 'Met hierdie vorm kan u verskeie bates gelyktydig bywerk. Vul slegs die velde in wat u moet verander. Enige velde wat leeg is, bly onveranderd.',
     '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/af/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/af/admin/hardware/message.php

@@ -22,6 +22,8 @@ return [
     'restore' => [
         'error'   		=> 'Bate is nie herstel nie, probeer asseblief weer',
         'success' 		=> 'Bate herstel suksesvol.',
+        'bulk_success' 		=> 'Asset restored successfully.',
+        'nothing_updated'   => 'No assets were selected, so nothing was restored.', 
     ],
 
     'audit' => [

resources/lang/af/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'                   => 'Herstel Model',
     'requestable'               => 'Gebruikers kan hierdie model aanvra',
 	'show_mac_address'			      => 'Wys MAC adres veld in bates in hierdie model',

resources/lang/af/admin/models/message.php

@@ -16,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'Model is nie opgedateer nie, probeer asseblief weer',
-        'success' => 'Model suksesvol opgedateer.'
+        'success' => 'Model suksesvol opgedateer.',
     ),
 
     'delete' => array(
@@ -32,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'Geen velde is verander nie, so niks is opgedateer nie.',
-        'success' 		=> 'Modelle opgedateer.'
+        '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/af/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'				        => 'Dit is \'n Active Directory-bediener',
     'alerts'                	=> 'Alerts',
-    'alert_title'               => 'Update Alert Settings',
+    'alert_title'               => 'Update Notification Settings',
     'alert_email'				=> 'Stuur kennisgewings aan',
     'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
     'alerts_enabled'			=> 'Alerts aangeskakel',
@@ -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 Naam',
+    '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-weergawe',
     '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 display',
     'notifications' => 'Notifications',
-    'notifications_help' => 'Email alerts, audit settings',
+    'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',

resources/lang/af/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/af/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'     => 'Sagteware Uitgesoek na: naam',
     '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'         => 'Sien gebruiker: naam',
@@ -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/af/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'         	    => 'invoer',
     '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' => 'Onvoldoende toestemmings!',
     'kits'       			=> 'Predefined Kits',
     'language'				=> 'Taal',
@@ -227,6 +230,7 @@ return [
     'requested_assets_menu' => 'Requested Assets',
     'request_canceled'      => 'Versoek gekanselleer',
     'save'  				=> 'Save',
+    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Kies',
     'select_all'            => 'Select All',
     'search'				=> 'Soek',
@@ -249,8 +253,8 @@ return [
     'signature'             => 'Handtekening',
     '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: Sommige funksies is afgeskakel vir hierdie installasie.',
     'site_name'				=> 'Site Naam',
     'state'  				=> 'staat',
@@ -262,7 +266,6 @@ return [
     'sure_to_delete'    => 'Is jy seker jy wil verwyder',
     'submit'				=> 'Indien',
     'target'                => 'teiken',
-    'toggle_navigation'     => 'Toogle Navigation',
     'time_and_date_display' => 'Tyd en datum vertoon',
     'total_assets'			=> 'totale bates',
     'total_licenses'		=> 'totale lisensies',
@@ -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.',
 ];

resources/lang/af/help.php

@@ -15,7 +15,7 @@ return [
 
     'more_info_title' => 'More Info',
 
-    'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.<br><br>Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.<br><br>Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
 
     'assets' => 'Assets are items tracked by serial number or asset tag.  They tend to be higher value items where identifying a specific item matters.',
 

resources/lang/am/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/am/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/am/admin/asset_maintenances/form.php

@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Maintenance Type',
+        'asset_maintenance_type' => 'Asset Maintenance Type',
         'title'                  => 'Title',
-        'start_date'             => 'Started',
+        'start_date'             => 'Start Date',
-        'completion_date'        => 'Completed',
+        'completion_date'        => 'Completion Date',
         'cost'                   => 'Cost',
         'is_warranty'            => 'Warranty Improvement',
-        'asset_maintenance_time' => 'Days',
+        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
         'notes'                  => 'Notes',
-        'update'                 => 'Update',
+        'update'                 => 'Update Asset Maintenance',
-        'create'                 => 'Create'
+        'create'                 => 'Create Asset Maintenance'
     ];

resources/lang/am/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/am/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/am/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/am/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/am/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/am/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/am/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'			=> 'Email 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 display',
     'notifications' => 'Notifications',
-    'notifications_help' => 'Email alerts, audit settings',
+    'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',

resources/lang/am/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/am/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/am/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.',
 ];

resources/lang/am/help.php

@@ -15,7 +15,7 @@ return [
 
     'more_info_title' => 'More Info',
 
-    'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.<br><br>Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.<br><br>Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
 
     'assets' => 'Assets are items tracked by serial number or asset tag.  They tend to be higher value items where identifying a specific item matters.',
 

resources/lang/ar/admin/accessories/general.php

@@ -16,5 +16,6 @@ return array(
     'update'  							=> 'تحديث الملحق',
     'use_default_eula'					=> 'قم باستعمال <a href="#" data-toggle="modal" data-target="#eulaModal">اتفاقية ترخيص المستخدم الافتراضية الاساسية</a>.',
     'use_default_eula_disabled'			=> '<del>استخدام (اتفاقية ترخيص المستخدم) الافتراضية الأساسية بدلا من ذلك.</del> لم يتم تحديد (اتفاقية ترخيص المستخدم) الافتراضية الأساسية. الرجاء إضافتها في الإعدادات.',
+    'clone'                             => 'استنساخ الملحق',
 
 );

resources/lang/ar/admin/accessories/message.php

@@ -24,6 +24,7 @@ return array(
      'checkout' => array(
         'error'   		=> 'لم يتم إخراج الملحق، الرجاء المحاولة مرة أخرى',
         'success' 		=> 'تم إخراج الملحق بنجاح.',
+        'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
         'user_does_not_exist' => 'هذا المستخدم خاطئ، الرجاء المحاولة مرة أخرى.'
     ),
 

resources/lang/ar/admin/asset_maintenances/form.php

@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'نوع الصيانة',
+        'asset_maintenance_type' => 'Asset Maintenance Type',
         'title'                  => 'المسمى',
-        'start_date'             => 'بدأت',
+        'start_date'             => 'Start Date',
-        'completion_date'        => 'أنجزت',
+        'completion_date'        => 'Completion Date',
         'cost'                   => 'التكلفة',
         'is_warranty'            => 'تحسين الضمان',
-        'asset_maintenance_time' => 'أيام',
+        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
         'notes'                  => 'مُلاحظات',
-        'update'                 => 'تعديل',
+        'update'                 => 'Update Asset Maintenance',
-        'create'                 => 'إنشاء'
+        'create'                 => 'Create Asset Maintenance'
     ];

resources/lang/ar/admin/categories/message.php

@@ -14,7 +14,7 @@ return array(
     'update' => array(
         'error'   => 'لقد فشل تحديث التصنيف، الرجاء المحاولة مرة أخرى',
         'success' => 'تم تحديث التصنيف بنجاح.',
-        'cannot_change_category_type'   => 'You cannot change the category type once it has been created',
+        'cannot_change_category_type'   => 'لا يمكنك تغيير نوع الفئة بمجرد إنشائها',
     ),
 
     'delete' => array(

resources/lang/ar/admin/groups/message.php

@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'المجموعة موجودة مسبقا!',
-    'group_not_found'     => 'المجموعة رقم :id غير موجودة.',
+    'group_not_found'     => 'معرف المجموعة :id غير موجود.',
     'group_name_required' => 'حقل الإسم اجباري',
 
     'success' => array(

resources/lang/ar/admin/hardware/form.php

@@ -2,8 +2,11 @@
 
 return [
     'bulk_delete'		=> 'تاكيد إجراء حذف للاُصول المحددة',
+    'bulk_restore'      => 'تأكيد استعادة الأصول بالجملة', 
   'bulk_delete_help'	=> 'الرجاء مراجعة الأصول المحددة للحذف أدناه. بمجرد الحذف، يمكن استعادة هذه الأصول، لكنها لن تكون مرتبطة مع أي من المستخدمين اللذين تم اخراج الأصول لهم من قبل.',
+  'bulk_restore_help'	=> 'مراجعة الأصول للاستعادة بالجملة أدناه. بمجرد إعادتها لن تكون هذه الأصول مرتبطة بأي مستعملين سبق تعيينهم.',
   'bulk_delete_warn'	=> 'أنت على وشك حذف :asset_count من الأصول.',
+  'bulk_restore_warn'	=> 'أنت على وشك استعادة :asset_count الأصول.',
     'bulk_update'		=> 'تحديث للأصول المحددة',
     'bulk_update_help'	=> 'يتيح لك هذا النموذج تحديث عدة أصول دفعة واحدة. قم بملء الحقول التي تحتاج إلى تغييرها. ستظل أية حقول فارغة بدون تغيير. ',
     '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/ar/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/ar/admin/hardware/message.php

@@ -22,6 +22,8 @@ return [
     'restore' => [
         'error'   		=> 'لم تتم استعادة الأصل، يرجى إعادة المحاولة',
         'success' 		=> 'تمت استعادة الأصل بنجاح.',
+        'bulk_success' 		=> 'تمت استعادة الأصل بنجاح.',
+        'nothing_updated'   => 'ولم يتم اختيار أي أصول، وبالتالي لم يتم استعادة أي شيء.', 
     ],
 
     'audit' => [

resources/lang/ar/admin/locations/message.php

@@ -6,8 +6,8 @@ return array(
     'assoc_users'	 => 'هذا الموقع مرتبط حاليا بمستخدم واحد على الأقل ولا يمكن حذفه. يرجى تحديث المستخدمين لم يعد يشيروا إلى هذا الموقع ثم أعد المحاولة. ',
     'assoc_assets'	 => 'هذا الموقع مرتبط حاليا بمادة عرض واحدة على الأقل ولا يمكن حذفها. يرجى تحديث مواد العرض لم تعد تشير إلى هذا الموقع ثم أعد المحاولة. ',
     'assoc_child_loc'	 => 'هذا الموقع هو حاليا أحد الوالدين لموقع طفل واحد على الأقل ولا يمكن حذفه. يرجى تحديث مواقعك لم تعد تشير إلى هذا الموقع ثم أعد المحاولة.',
-    'assigned_assets' => 'Assigned Assets',
+    'assigned_assets' => 'الأصول المعينة',
-    'current_location' => 'Current Location',
+    'current_location' => 'الموقع الحالي',
 
 
     'create' => array(

resources/lang/ar/admin/locations/table.php

@@ -20,21 +20,21 @@ return [
     'parent'                    => 'الأبوين',
     'currency'                  => 'عملة الموقع',
     'ldap_ou'                   => 'لداب البحث أو',
-    'user_name'                 => 'User Name',
+    'user_name'                 => 'اسم المستخدم',
-    'department'                => 'Department',
+    'department'                => 'القسم',
-    'location'                  => 'Location',
+    'location'                  => 'الموقع',
-    'asset_tag'                 => 'Assets Tag',
+    'asset_tag'                 => 'علامة الأصول',
-    'asset_name'                => 'Name',
+    'asset_name'                => 'الإسم',
-    'asset_category'            => 'Category',
+    'asset_category'            => 'الفئة',
-    'asset_manufacturer'        => 'Manufacturer',
+    'asset_manufacturer'        => 'الجهة المنتجة',
-    'asset_model'               => 'Model',
+    'asset_model'               => 'النموذج',
-    'asset_serial'              => 'Serial',
+    'asset_serial'              => 'التسلسل',
-    'asset_location'            => 'Location',
+    'asset_location'            => 'المكان',
-    'asset_checked_out'         => 'Checked Out',
+    'asset_checked_out'         => 'الاخراج',
-    'asset_expected_checkin'    => 'Expected Checkin',
+    'asset_expected_checkin'    => 'تاريخ الادخال المتوقع',
-    'date'                      => 'Date:',
+    'date'                      => 'التاريخ:',
-    'signed_by_asset_auditor'   => 'Signed By (Asset Auditor):',
+    'signed_by_asset_auditor'   => 'موقعة من قبل (مراجع الأصل):',
-    'signed_by_finance_auditor' => 'Signed By (Finance Auditor):',
+    'signed_by_finance_auditor' => 'موقعة من قبل (مراجع الحسابات المالي):',
-    'signed_by_location_manager' => 'Signed By (Location Manager):',
+    'signed_by_location_manager' => 'توقيع بواسطة (مدير الموقع):',
-    'signed_by'                 => 'Signed Off By:',
+    'signed_by'                 => 'تم توقيعه من قبل:',
 ];

resources/lang/ar/admin/models/general.php

@@ -6,7 +6,7 @@ return array(
     'deleted'  					        => 'تم حذف هذا الموديل.',
     'bulk_delete'               => 'حذف موديلات الاصول بالجملة',
     'bulk_delete_help'               => 'استخدم مربعات الاختيار أدناه لتأكيد حذف موديلات الأصول المحددة. لا يمكن حذف موديلات الأصول التي تحتوي على أصول مرتبطة بها إلى أن يتم ربط الأصول بموديل مختلف.',
-    'bulk_delete_warn'          => 'أنت على وشك حذف :model_count من موديلات الأصول.',
+    'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
     'restore'                   => 'إستعادة الموديل',
     'requestable'               => 'يمكن للمستخدمين طلب هذا الموديل',
 	'show_mac_address'			      => 'عرض حقل عنوان ماك MAC في الأصول لهذا الموديل',

resources/lang/ar/admin/models/message.php

@@ -3,8 +3,8 @@
 return array(
 
     'does_not_exist' => 'الموديل غير موجود.',
-    'no_association' => 'NO MODEL ASSOCIATED.',
+    'no_association' => 'غير مرتبط بنموذج.',
-    'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',
+    'no_association_fix' => 'سيؤدي هذا إلى كسر الأمور بطرق غريبة وفظيعة. قم بتعديل هذا الأصل الآن لربطه بنموذج.',
     'assoc_users'	 => 'هذا الموديل مرتبط حاليا بواحد أو أكثر من الأصول ولا يمكن حذفه. يرجى حذف الأصول، ثم محاولة الحذف مرة أخرى. ',
 
 
@@ -16,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'لم يتم تحديث الموديل، يرجى إعادة المحاولة',
-        'success' => 'تم تحديث الموديل بنجاح.'
+        'success' => 'تم تحديث الموديل بنجاح.',
     ),
 
     'delete' => array(
@@ -32,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'لم يتم تغيير أي حقول، لذلك لم يتم تحديث أي شيء.',
-        'success' 		=> 'تم تحديث الموديل.'
+        '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'   		    => 'لم يتم اختيار أي موديلات، لذلك لم يتم حذف أي شيء.',
-        'success' 		    => 'تم حذف success_count: من الموديلات!',
+        'success' 		    => 'Model deleted!|:success_count models deleted!',
         'success_partial' 	=> 'تم حذف:success_count: من الموديلات، ومع ذلك تعذر حذف fail_count: نظرًا لأنها لا تزال تحتوي على أصول مقترنة بها.'
     ),
 

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

@@ -11,7 +11,7 @@ return [
     'admin_cc_email_help'       => 'إذا كنت ترغب في إرسال نسخة من رسائل البريد الإلكتروني لتسجيل الدخول / الخروج التي يتم إرسالها إلى المستخدمين إلى حساب بريد إلكتروني إضافي، فقم بإدخالها هنا. خلاف ذلك، اترك هذه الخانة فارغة.',
     'is_ad'				        => 'هذا هو ملقم أكتيف ديركتوري',
     'alerts'                	=> 'Alerts',
-    'alert_title'               => 'Update Alert Settings',
+    'alert_title'               => 'تحديث إعدادات الإشعارات',
     'alert_email'				=> 'إرسال تنبيهات إلى',
     'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
     'alerts_enabled'			=> 'التنبيهان ممكنه',
@@ -198,16 +198,21 @@ return [
     'show_images_in_email'     => 'إظهار الصور في رسائل البريد الإلكتروني',
     'show_images_in_email_help'   => 'قم بإلغاء تحديد هذا المربع إذا كان تثبيت Snipe-IT وراء شبكة VPN أو شبكة مغلقة ولن يتمكن المستخدمون خارج الشبكة من تحميل الصور التي يخدمها هذا التثبيت في رسائل البريد الإلكتروني الخاصة بهم.',
     'site_name'                 => 'اسم الموقع',
+    'integrations'               => 'Integrations',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Update Slack Settings',
+    'general_webhook'           => 'General Webhook',
-    'slack_help'                => 'Slack settings',
+    'webhook'                   => ':app',
-    'slack_botname'             => 'سلاك بوتنام',
+    'webhook_presave'           => 'Test to Save',
-    'slack_channel'             => 'قناة سلاك',
+    'webhook_title'               => 'Update Webhook Settings',
-    'slack_endpoint'            => 'نقطة نهاية سلاك',
+    'webhook_help'                => 'Integration settings',
-    'slack_integration'         => 'إعدادات سلاك',
+    'webhook_botname'             => ':app Botname',
-    'slack_integration_help'    => 'التكامل الأسود اختياري، ولكن نقطة النهاية والقناة مطلوبة إذا كنت ترغب في استخدامها. لتكوين تكامل Slack ، يجب أولاً <a href=":slack_link" target="_new" rel="noopener">إنشاء ويب هوك وارد</a> على حساب Slack الخاص بك. انقر على زر <strong>اختبار التكامل السوداء</strong> لتأكيد أن إعداداتك صحيحة قبل الحفظ. ',
+    'webhook_channel'             => ':app Channel',
-    'slack_integration_help_button'    => 'عند الانتهاء من حفظ معلومات Slack الخاصة بك، سوف يظهر زر الفحص.',
+    'webhook_endpoint'            => ':app Endpoint',
-    'slack_test_help'           => 'اختبر ما إذا كان تكامل Slack الخاص بك قد تم تكوينه بشكل صحيح. لقد قمت بحفظ إعدادات SLACK الخاصة بك.',
+    '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'  			=> 'قنص-إيت الإصدار',
     'support_footer'            => 'دعم روابط تذييل الصفحة ',
     'support_footer_help'       => 'تحديد من يرى الروابط إلى دليل معلومات الدعم للمستخدمين عن طريق القناصة',
@@ -302,7 +307,7 @@ return [
     'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
-    'notifications_help' => 'Email alerts, audit settings',
+    'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',

resources/lang/ar/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/ar/admin/users/general.php

@@ -19,6 +19,8 @@ return [
     'print_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'     => 'البرامج المخرجة الى: :name',
     'send_email_help'   => 'يجب عليك توفير عنوان بريد إلكتروني لهذا المستخدم لإرسال بيانات اعتماده. لا يمكن إرسال بيانات الاعتماد البريدية إلا عند إنشاء المستخدم. يتم تخزين كلمات المرور في تجزئة ذات اتجاه واحد ولا يمكن استرجاعها بمجرد الحفظ.',
     '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_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' => 'تم إنشاؤها في:',
+    'email_user_creds_on_create' => 'Email this user their credentials?',
 ];

resources/lang/ar/general.php

@@ -45,7 +45,7 @@ return [
     'bulk_edit'             => 'تحرير بالجملة',
     'bulk_delete'           => 'حذف بالجملة',
     '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'              => 'حسب الحالة',
@@ -148,6 +148,7 @@ return [
     'filetypes_accepted_help'    => 'نوع الملف المقبول هو :types. الحد الأقصى لحجم التحميل المسموح به هو :size.|أنواع الملف المقبول هي :types. الحد الأقصى لحجم التحميل المسموح به هو :size.',
     'filetypes_size_help'   => 'الحد الأقصى لحجم الرفع المسموح به هو :size.',
     'image_filetypes_help'  => 'أنواع الملفات المقبولة هي jpg، webpp، png، gif، svg. الحد الأقصى المسموح به للتحميل هو :size.',
+    'unaccepted_image_type'  => 'ملف الصورة هذا غير قابل للقراءة. أنواع الملفات المقبولة هي jpg، webpp، png، gif، svg. نوع هذا الملف هو: :mimetype.',
     'import'         	    => 'استيراد',
     'importing'         	=> 'الاستيراد',
     'importing_help'        => 'يمكنك استيراد الأصول، الملحقات، التراخيص، المكونات، المواد الاستهلاكية، والمستخدمين عبر ملف CSV. <br><br>يجب أن تكون CSV محددة بفواصل وأن يتم تنسيقها مع رؤوس تطابق تلك الموجودة في <a href="https://snipe-it.readme.io/docs/importing" target="_new">عينة CSVs في الوثائق</a>.',
@@ -157,6 +158,8 @@ return [
     'asset_maintenances'       => 'صيانة الأصول',
     'item'  				=> 'بند',
     'item_name'             => 'إسم العنصر',
+    'import_file'  			=> 'import CSV file',
+    'import_type'  			=> 'CSV import type',
     'insufficient_permissions' => 'صلاحيات غير كافية!',
     'kits'       			=> 'مجموعات محددة مسبقاً',
     'language'				=> 'لغة',
@@ -227,6 +230,7 @@ return [
     'requested_assets_menu' => 'الأصول المطلوبة',
     'request_canceled'      => 'تم إلغاء الطلب',
     'save'  				=> 'حفظ',
+    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'تحديد',
     'select_all'            => 'اختر الكل',
     'search'				=> 'بحث',
@@ -249,8 +253,8 @@ return [
     'signature'             => 'التوقيع',
     'signed_off_by'         => 'تم توقيعه من قبل',
     'skin'       			=> 'المظهر',
-    'slack_msg_note'        => 'سيتم إرسال رسالة التراخي',
+    'webhook_msg_note'        => 'سيتم إرسال إشعار عبر الربط البرمجي (webhook)',
-    'slack_test_msg'        => 'مرحباً! يبدو أن التكامل مع Slack مع Snipe-IT يعمل!',
+    'webhook_test_msg'        => 'Oh hai! Looks like your :app integration with Snipe-IT is working!',
     'some_features_disabled' => 'التثبيت التجريبي (DEMO): يتم تعطيل بعض الميزات لهذا التثبيت.',
     'site_name'				=> 'إسم الموقع',
     'state'  				=> 'المنطقة / الولاية',
@@ -262,7 +266,6 @@ return [
     'sure_to_delete'    => 'هل تريد بالتأكيد حذفها',
     'submit'				=> 'عرض',
     'target'                => 'استهداف',
-    'toggle_navigation'     => 'تبديل القائمة',
     'time_and_date_display' => 'عرض الوقت والتاريخ',
     'total_assets'			=> 'إجمالي الأصول',
     '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_information' =>  'سيؤدي هذا إلى دمج :count مستخدمين في مستخدم واحد. حدد المستخدم الذي ترغب في دمج بقية المستخدمين بالأسفل، والأصول المرتبطة ، والتراخيص ، إلخ سيتم نقلها إلى المستخدم المحدد وسيتم وضع علامة على المستخدمين الآخرين كمحذوفين.',
+    'warning_merge_information' => 'لا يمكن التراجع عن هذا الإجراء، ويجب أن تستخدم فقط عندما تحتاج إلى دمج المستخدمين بسبب سوء الاستيراد أو المزامنة. تأكد من تشغيل النسخ الاحتياطي أولاً.',
+    'no_users_selected'     => 'لا يوجد مستخدمين محددين',
+    'not_enough_users_selected'     => 'يجب اختيارعدد :count مستخدم على الأقل',
+    'merge_success'         => 'تم دمج :count من المستخدمين بنجاح في :into_username!',
+    'merged'                => 'دُمِجَت',
+    'merged_log_this_user_into' => 'تم دمج هذا المستخدم (رقم :to_id - :to_username) إلى المستخدم رقم :from_id (:from_username) ',
+    'merged_log_this_user_from' => 'تم دمج المستخدم رقم :from_id (:from_username) في هذا المستخدم (رقم :to_id - :to_username)',
+    'clear_and_save'            => 'Clear & Save',
+    'update_existing_values'    => 'Update Existing Values?',
+    'auto_incrementing_asset_tags_disabled_so_tags_required' => 'تم تعطيل إنشاء علامات الأصول التزايدية التلقائية لذلك يجب أن يكون لجميع الصفوف عمود "علامة الأصول" مأهول.',
+    'auto_incrementing_asset_tags_enabled_so_now_assets_will_be_created' => 'ملاحظة: تم تمكين إنشاء علامات الأصول التزايدية التلقائية لذلك سيتم إنشاء أصول للصفوف التي لا تحتوي على "علامة الأصول" مأهولة. الصفوف التي تحتوي على "علامة أصول" مأهولة سيتم تحديثها مع المعلومات المقدمة.',
+    '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' => 'تم إنشاء جداول قاعدة البيانات الخاصة بك',
+    'setup_migration_output' => 'ناتج الهجرة:',
+    'setup_migration_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.',
 ];

resources/lang/ar/help.php

@@ -15,7 +15,7 @@ return [
 
     'more_info_title' => 'المزيد من المعلومات',
 
-    'audit_help' => 'التحقق من هذا المربع سيؤدي إلى تعديل سجل الأصول لعكس هذا الموقع الجديد. تركه غير محدد سيلاحظ ببساطة الموقع في سجل المراجعة.<br><br>لاحظ أن هذا الأصل تم التحقق منه، فهو لن يغير موقع الشخص أو الأصل أو الموقع الذي يتم التحقق منه إليه.',
+    'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.<br><br>Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
 
     'assets' => 'الأصول هي العناصر التي يتم تتبعها بواسطة الرقم التسلسلي أو ترميز الأصل. وهي تميل إلى أن تكون ممتلكات ذات قيمة أعلى حيث انه من المهم توثيقها.',
 

resources/lang/bg/admin/accessories/general.php

@@ -16,5 +16,6 @@ return array(
     'update'  							=> 'Обновяване на аксесоар',
     'use_default_eula'					=> 'Използване на <a href="#" data-toggle="modal" data-target="#eulaModal">EULA по подразбиране</a>.',
     'use_default_eula_disabled'			=> '<del>Използване на EULA по подразбиране</del> Няма EULA по подразбиране. Добавете я в Настройки.',
+    'clone'                             => 'Clone Accessory',
 
 );

resources/lang/bg/admin/accessories/message.php

@@ -24,6 +24,7 @@ return array(
      'checkout' => array(
         'error'   		=> 'Аксесоарът не беше изписан. Моля опитайте отново.',
         'success' 		=> 'Аксесоарът изписан успешно.',
+        'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
         'user_does_not_exist' => 'Невалиден потребител. Моля опитайте отново.'
     ),
 

resources/lang/bg/admin/asset_maintenances/form.php

@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Тип на поддръжка на актив',
+        'asset_maintenance_type' => 'Asset Maintenance Type',
         'title'                  => 'Заглавие',
-        'start_date'             => 'Начална дата',
+        'start_date'             => 'Start Date',
-        'completion_date'        => 'Крайна дата',
+        'completion_date'        => 'Completion Date',
         'cost'                   => 'Стойност',
         'is_warranty'            => 'Подобрение на гаранцията',
-        'asset_maintenance_time' => 'Време за поддръжка на актив (в дни)',
+        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
         'notes'                  => 'Бележки',
-        'update'                 => 'Редакция на поддръжка на актив',
+        'update'                 => 'Update Asset Maintenance',
-        'create'                 => 'Създаване на поддръжка на актив'
+        'create'                 => 'Create Asset Maintenance'
     ];

resources/lang/bg/admin/groups/message.php

@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Групата вече съществува!',
-    'group_not_found'     => 'Групата [:id] не съществува.',
+    'group_not_found'     => 'Group ID :id does not exist.',
     'group_name_required' => 'Полето име е задължително',
 
     'success' => array(

resources/lang/bg/admin/hardware/form.php

@@ -2,8 +2,11 @@
 
 return [
     'bulk_delete'		=> 'Потвърдете масовото изтриване на активи',
+    'bulk_restore'      => 'Confirm Bulk Restore Assets', 
   'bulk_delete_help'	=> 'Прегледайте активите, маркирани за масово изтриване. Веднъж изтрити, активите могат да бъдат възстановени, но те вече няма да бъдат асоциирани с потребителите, на които са изписани в момента.',
+  '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'	=> 'Ще бъдат изтрити :asset_count актива.',
+  'bulk_restore_warn'	=> 'You are about to restore :asset_count assets.',
     'bulk_update'		=> 'Масово обновяване на активи',
     'bulk_update_help'	=> 'Тук можете да обновите множество активи едновременно. Попълнете единствено полетата, които желаете да промените. Всички празни полета няма да бъдат променени.',
     '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' => 'Актуализиране на местоположението по подразбиране',
     'asset_not_deployable' => 'Актива не може да бъде предоставен. Този активк не може да бъде изписан.',
     'asset_deployable' => 'Актива може да бъде предоставен. Този активк може да бъде изписан.',
-    'processing_spinner' => 'В процес на изпълнение...',
+    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
     'optional_infos'  => 'Допълнителна информация',
     'order_details'   => 'Информация за състоянието на поръчка'
 ];

resources/lang/bg/admin/hardware/general.php

@@ -42,5 +42,6 @@ return [
     '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/bg/admin/hardware/message.php

@@ -22,6 +22,8 @@ return [
     'restore' => [
         'error'   		=> 'Активът не беше възстановен. Моля опитайте отново.',
         'success' 		=> 'Активът възстановен успешно.',
+        'bulk_success' 		=> 'Asset restored successfully.',
+        'nothing_updated'   => 'No assets were selected, so nothing was restored.', 
     ],
 
     'audit' => [

resources/lang/bg/admin/models/general.php

@@ -6,7 +6,7 @@ return array(
     'deleted'  					        => 'This model has been deleted.',
     'bulk_delete'               => 'Масово изтриване на модели на активите',
     'bulk_delete_help'               => 'Използвайте квадратчетата за отметка по-долу, за да потвърдите изтриването на избраните модели на активи. Моделите, за които има асоциирани активи, не могат да бъдат изтрити, докато активите не се асоциират с друг модел.',
-    'bulk_delete_warn'          => 'Ще бъдат изтрити :model_count модели на активи.',
+    'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
     'restore'                   => 'Възстановяване на модел',
     'requestable'               => 'Потребителите могат да поискат този модел',
 	'show_mac_address'			      => 'Визуализиране на поле за MAC адрес в активите за този модел',

resources/lang/bg/admin/models/message.php

@@ -16,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'Моделът не беше обновен. Моля опитайте отново.',
-        'success' => 'Моделът обновен успешно.'
+        'success' => 'Моделът обновен успешно.',
     ),
 
     'delete' => array(
@@ -32,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'Няма полета, който да са се променили, така че нищо не е осъвременено.',
-        'success' 		=> 'Моделите са осъвременени.'
+        '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'   		    => 'Няма избрани модели, така че нищо не бе изтрито.',
-        'success' 		    => ':success_count модела бяха изтрити!',
+        'success' 		    => 'Model deleted!|:success_count models deleted!',
         'success_partial' 	=> ':success_count модела бяха изтрити, но :fail_count не бяха, тъй като към тях има асоциирани активи.'
     ),
 

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

@@ -11,7 +11,7 @@ return [
     'admin_cc_email_help'       => 'Въведете допълнителни електронни адреси, ако желаете да се изпраща копие на електронните пощи при вписване и изписване на активи.',
     'is_ad'				        => 'Това е активна директория на сървър',
     'alerts'                	=> 'Известия',
-    'alert_title'               => 'Обнови настрйките за известяване',
+    'alert_title'               => 'Update Notification Settings',
     'alert_email'				=> 'Изпращане на нотификации към',
     'alert_email_help'    => 'Е-майл адреси или групов е-маил за известяване, разделен със запетайка',
     'alerts_enabled'			=> 'Включване на известията',
@@ -198,16 +198,21 @@ return [
     'show_images_in_email'     => 'Показване на изображения в електронните съобщения',
     'show_images_in_email_help'   => 'Премахнете отметката, ако Вашата инсталация е достъпна единствено във вътрешната мрежа или през VPN.',
     'site_name'                 => 'Име на системата',
+    'integrations'               => 'Integrations',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Update Slack Settings',
+    'general_webhook'           => 'General Webhook',
-    'slack_help'                => 'Slack settings',
+    'webhook'                   => ':app',
-    'slack_botname'             => 'Име на Slack bot',
+    'webhook_presave'           => 'Test to Save',
-    'slack_channel'             => 'Slack канал',
+    'webhook_title'               => 'Update Webhook Settings',
-    'slack_endpoint'            => 'Slack Endpoint',
+    'webhook_help'                => 'Integration settings',
-    'slack_integration'         => 'Slack настройки',
+    'webhook_botname'             => ':app Botname',
-    'slack_integration_help'    => 'Slack интеграцията е по избор, въпреки че крайната цел и канала са задължителни, ако искате да я ползате. За да се конфигурира Slack интеграцията трябва първо да <a href=":slack_link" target="_new" rel="noopener">създадете входяща връзка</a> във вашият Slack акаунт. Кликнете на <strong>Тест интеграция</strong> бутона за да потвърдите, че всичко работи преди да запишете настройките. ',
+    'webhook_channel'             => ':app Channel',
-    'slack_integration_help_button'    => 'След запис на Slack информацията ще бъде показан бутон за тест.',
+    'webhook_endpoint'            => ':app Endpoint',
-    'slack_test_help'           => 'Тест за коректна конфигурация на интеграцията със Slack. НЕОБХОДИМО Е ПЪРВО ДА ЗАПИШЕТЕ SLACK НАСТРОЙКИТЕ.',
+    '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 версия',
     'support_footer'            => 'Връзки към Snipe-it поддръжката във футъра',
     'support_footer_help'       => 'Указва визуализацията на връзки към поддръжката на Snipe-IT и потребителската документация',
@@ -302,7 +307,7 @@ return [
     'localization_keywords' => 'локализация, валута, местен, място, часова зона, международен, интернационализация, език, езици, превод',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
-    'notifications_help' => 'Email alerts, audit settings',
+    'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',

resources/lang/bg/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.',
+        '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/bg/admin/users/general.php

@@ -19,6 +19,8 @@ return [
     'print_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'     => 'Софтуерни продукти, изписани на :name',
     'send_email_help'   => 'Трябва да предоставите е-майл адрес за този потребител за да му се изпратят името и паролата. Изпращането на име и парола може да стане при създаването на потребителя. Паролите се съхраняват криптирани и не могат да се възстановят.',
     'view_user'         => 'Преглед на потребител :name',
@@ -33,7 +35,6 @@ return [
     'superadmin_permission_warning' => 'Само админ може да даде администраторски достъп на потребител.',
     'admin_permission_warning' => 'Само потребители с административни права може да дадат админ достъп.',
     'remove_group_memberships' => 'Премахни членовете на групата',
-    'warning_deletion' => 'ВНИМАНИЕ:',
     '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' => 'Впиши всички асоцирани настройки към тези потребители',
@@ -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/bg/general.php

@@ -45,7 +45,7 @@ return [
     'bulk_edit'             => 'Групово редактиране',
     'bulk_delete'           => 'Групово изтриване',
     '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'              => 'по Статус',
@@ -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'  => 'Файлов формат в jpg, webp, png, gif и svg. Максимален размер е :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'         	    => 'Зареждане',
     'importing'         	=> 'Импортиране',
     'importing_help'        => 'Може да импортирате активи, аксесоари, лицензи, компоненти, консумативи и потребители чрез CSV файл. <br><br>CSV файла трябва да е разделен със запетая и форматирани колони, като тези от <a href="https://snipe-it.readme.io/docs/importing" target="_new">примерен CSV файл</a>.',
@@ -157,6 +158,8 @@ return [
     'asset_maintenances'       => 'Поддръжки на активи',
     'item'  				=> 'Информация',
     'item_name'             => 'Item Name',
+    'import_file'  			=> 'import CSV file',
+    'import_type'  			=> 'CSV import type',
     'insufficient_permissions' => 'Нямате необходимите права!',
     'kits'       			=> 'Комплекти',
     'language'				=> 'Език',
@@ -227,6 +230,7 @@ return [
     'requested_assets_menu' => 'Requested Assets',
     'request_canceled'      => 'Заявка отменена',
     'save'  				=> 'Запис',
+    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Избор',
     'select_all'            => 'Select All',
     'search'				=> 'Търсене',
@@ -249,8 +253,8 @@ return [
     'signature'             => 'Подпис',
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Тема',
-    'slack_msg_note'        => 'A slack message will be sent',
+    'webhook_msg_note'        => 'A notification will be sent via webhook',
-    'slack_test_msg'        => 'Вашата Slack интеграция с Snipe-IT работи!',
+    'webhook_test_msg'        => 'Oh hai! Looks like your :app integration with Snipe-IT is working!',
     'some_features_disabled' => 'DEMO MODE: Някои свойства не са разрешени за тази инсталация.',
     'site_name'				=> 'Име на системата',
     'state'  				=> 'Област',
@@ -262,7 +266,6 @@ return [
     'sure_to_delete'    => 'Сигурни ли сте, че искате да изтриете',
     'submit'				=> 'Изпрати',
     'target'                => 'Цел',
-    'toggle_navigation'     => 'Toogle Navigation',
     'time_and_date_display' => 'Показване на време и дата',
     'total_assets'			=> 'общо активи',
     '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.',
 ];

resources/lang/bg/help.php

@@ -15,7 +15,7 @@ return [
 
     'more_info_title' => 'Допълнителна информация',
 
-    'audit_help' => 'Отмятането на това поле, ще редактира записа, за да се отрази новото местоположение. Оставайки това поле без отметка ще се отрази местоположението на актива само при одит.<br><br>Ако актива е изписан няма да се смени леговата локация.',
+    'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.<br><br>Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
 
     'assets' => 'Дълготрайни материални активи (ДМА), за кратко активи, се приемат всички материални ресурси на предприятието, които се използват повече от един отчетен период (за стопански и други цели). Проследават се по техния сериен или инвентарен номер.',
 

resources/lang/ca/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/ca/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/ca/admin/asset_maintenances/form.php

@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Maintenance Type',
+        'asset_maintenance_type' => 'Asset Maintenance Type',
         'title'                  => 'Title',
-        'start_date'             => 'Started',
+        'start_date'             => 'Start Date',
-        'completion_date'        => 'Completed',
+        'completion_date'        => 'Completion Date',
         'cost'                   => 'Cost',
         'is_warranty'            => 'Warranty Improvement',
-        'asset_maintenance_time' => 'Days',
+        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
         'notes'                  => 'Notes',
-        'update'                 => 'Update',
+        'update'                 => 'Update Asset Maintenance',
-        'create'                 => 'Create'
+        'create'                 => 'Create Asset Maintenance'
     ];

resources/lang/ca/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/ca/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/ca/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/ca/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/ca/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/ca/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/ca/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'			=> 'Email 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 display',
     'notifications' => 'Notifications',
-    'notifications_help' => 'Email alerts, audit settings',
+    'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',

resources/lang/ca/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/ca/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/ca/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'        => 'Podeu importar recursos, accessoris, llicències, components, consumibles, and usuaris via fitxer CSV. <br><br>El CSV cal que estigui delimitat per comes i formatat amb capçaleres que coincideixin amb les de les <a href="https://snipe-it.readme.io/docs/importing" target="_new">mostres de CSV a la documentació</a>.',
@@ -157,6 +158,8 @@ return [
     'asset_maintenances'       => 'Manteniments de Recursos',
     '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'			=> 'recursos totals',
     '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.',
 ];

resources/lang/ca/help.php

@@ -15,7 +15,7 @@ return [
 
     'more_info_title' => 'More Info',
 
-    'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.<br><br>Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.<br><br>Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
 
     'assets' => 'Assets are items tracked by serial number or asset tag.  They tend to be higher value items where identifying a specific item matters.',
 

resources/lang/cs/admin/accessories/general.php

@@ -17,5 +17,6 @@ return array(
     'use_default_eula'					=> 'Použít <a href="#" data-toggle="modal" data-target="#eulaModal">primární výchozí EULA</a>.',
     'use_default_eula_disabled'			=> '<del>Použít výchozí EULA.</del>
 Žádná výchozí EULA nenastavena. Zadejte novou v nastevení.',
+    'clone'                             => 'Clone Accessory',
 
 );

resources/lang/cs/admin/accessories/message.php

@@ -24,6 +24,7 @@ return array(
      'checkout' => array(
         'error'   		=> 'Příslušenství nebylo převzato, zkuste to znovu',
         'success' 		=> 'Příslušenství úspěšně předáno.',
+        'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
         'user_does_not_exist' => 'Neplatný uživatel. Zkuste to znovu.'
     ),
 

resources/lang/cs/admin/asset_maintenances/form.php

@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Druh údržby',
+        'asset_maintenance_type' => 'Druh údržby majetku',
         'title'                  => 'Název',
-        'start_date'             => 'Začátek',
+        'start_date'             => 'Počáteční datum',
-        'completion_date'        => 'Dokončeno',
+        'completion_date'        => 'Datum dokončení',
         'cost'                   => 'Cena',
         'is_warranty'            => 'Rozšíření záruky',
-        'asset_maintenance_time' => 'Dnů',
+        'asset_maintenance_time' => 'Doba údržby majetku (ve dnech)',
         'notes'                  => 'Poznámky',
-        'update'                 => 'Aktualizace',
+        'update'                 => 'Upravit údržbu zařízení',
-        'create'                 => 'Vytvořit'
+        'create'                 => 'Založit údržbu zařízení'
     ];

resources/lang/cs/admin/categories/message.php

@@ -14,7 +14,7 @@ return array(
     'update' => array(
         'error'   => 'Kategorie nebyla aktualizována, zkuste to znovu prosím',
         'success' => 'Kategorie aktualizována úspěšně.',
-        'cannot_change_category_type'   => 'You cannot change the category type once it has been created',
+        'cannot_change_category_type'   => 'Jakmile byla kategorie vytvořena, nelze měnit její typ',
     ),
 
     'delete' => array(

resources/lang/cs/admin/components/general.php

@@ -12,5 +12,5 @@ return array(
     'remaining' 			             => 'Zbývá',
     'total' 			                 => 'Celkem',
     'update'                            => 'Upravit díl',
-    'checkin_limit'            => 'Amount checked in must be equal to or less than :assigned_qty'
+    'checkin_limit'            => 'Přijaté množství musí odpovídat, nebo být nižší než :assigned_qty'
 );

resources/lang/cs/admin/custom_fields/general.php

@@ -27,9 +27,9 @@ return [
     'used_by_models'   		    => 'Užito u modelů',
     'order'   		            => 'Pořadí',
     'create_fieldset'         => 'Nová sada',
-    'update_fieldset'         => 'Update Fieldset',
+    'update_fieldset'         => 'Upravit sadu polí',
-    'fieldset_does_not_exist'   => 'Fieldset :id does not exist',
+    'fieldset_does_not_exist'   => 'Sada polí neexistuje',
-    'fieldset_updated'         => 'Fieldset updated',
+    'fieldset_updated'         => 'Sada polí upravena',
     'create_fieldset_title' => 'Vytvořit nový fieldset',
     'create_field'            => 'Nové vlastní pole',
     'create_field_title' => 'Vytvořít vlastní fieldset',

resources/lang/cs/admin/groups/message.php

@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Skupina již existuje!',
-    'group_not_found'     => 'Skupina [:id] neexistuje.',
+    'group_not_found'     => 'Group ID :id does not exist.',
     'group_name_required' => 'Název je vyžadován',
 
     'success' => array(

resources/lang/cs/admin/hardware/form.php

@@ -2,8 +2,11 @@
 
 return [
     'bulk_delete'		=> 'Potvrzení hromadného odstranění majetku',
+    'bulk_restore'      => 'Confirm Bulk Restore Assets', 
   'bulk_delete_help'	=> 'Zkontrolujte seznam odstraňovaného majetku níže. Jakmile jej potvrdíte, nebude možné tento majetek obnovit a budou zrušeny i vazby na uživatele, kteří jej měli v držení.',
+  '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'	=> 'Chystáte se odstranit :asset_count položek majetku.',
+  'bulk_restore_warn'	=> 'You are about to restore :asset_count assets.',
     'bulk_update'		=> 'Hromadná aktualizace majetku',
     'bulk_update_help'	=> 'Tento formulář umožňuje hromadnou editaci majetku. Vyplňte pouze položky, které chcete změnit. Jakékoliv prázné položky zůstanou nezměněny. ',
     'bulk_update_warn'	=> 'Chystáte se upravit vlastnosti 1 položky.|Chystáte se upravit vlastnosti :asset_count položek.',
@@ -45,7 +48,7 @@ return [
     'asset_location_update_default' => 'Aktualizovat pouze výchozí umístění',
     'asset_not_deployable' => 'Tento majetek nelze vyskladnit.',
     'asset_deployable' => 'Tento majetek lze vyskladnit.',
-    'processing_spinner' => 'Zpracovává se...',
+    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
     'optional_infos'  => 'Volitelné informace',
     'order_details'   => 'Informace související s objednávkou'
 ];

resources/lang/cs/admin/hardware/general.php

@@ -14,8 +14,8 @@ return [
     'deleted'  					=> 'Tento majetek byl odstraněn.',
     'edit'  					=> 'Upravit majetek',
     'model_deleted'  			=> 'Tento model majetku byl odstraněn. Před obnovením majetku musíte model obnovit.',
-    'model_invalid'             => 'The Model of this Asset is invalid.',
+    'model_invalid'             => 'Model tohoto majetku je neplatný.',
-    'model_invalid_fix'         => 'The Asset should be edited to correct this before attempting to check it in or out.',
+    'model_invalid_fix'         => 'Měli byste tento majetek upravit dříve, než jej vydáte, či přijmete.',
     'requestable'               => 'Lze vyžádat',
     'requested'				    => 'Požadováno',
     'not_requestable'           => 'Nelze vyžádat',
@@ -42,5 +42,6 @@ return [
     'error_messages' => 'Chybové zprávy:',
     'success_messages' => 'Úspěšné zprávy:',
     'alert_details' => 'Podrobnosti naleznete níže.',
-    'custom_export' => 'Uživatelsky definovaný export'
+    'custom_export' => 'Uživatelsky definovaný export',
+    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
 ];

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

@@ -23,6 +23,8 @@ return [
     'restore' => [
         'error'   		=> 'Majetek se nepodařilo obnovit, zkuste to prosím později',
         'success' 		=> 'Majetek byl v pořádku obnoven.',
+        'bulk_success' 		=> 'Asset restored successfully.',
+        'nothing_updated'   => 'No assets were selected, so nothing was restored.', 
     ],
 
     'audit' => [
@@ -49,8 +51,8 @@ return [
         'success'               => 'Váš soubor byl importován',
         'file_delete_success'   => 'Váš soubor byl úspěšně odstraněn',
         'file_delete_error'      => 'Soubor nelze odstranit',
-        'header_row_has_malformed_characters' => 'One or more attributes in the header row contain malformed UTF-8 characters',
+        'header_row_has_malformed_characters' => 'Jeden nebo více sloupců obsahuje v záhlaví poškozené UTF-8 znaky',
-        'content_row_has_malformed_characters' => 'One or more attributes in the first row of content contain malformed UTF-8 characters',
+        'content_row_has_malformed_characters' => 'Jedna nebo více hodnot v prvním řádku obsahu obsahuje poškozené UTF-8 znaky',
     ],
 
 

resources/lang/cs/admin/models/general.php

@@ -6,7 +6,7 @@ return array(
     'deleted'  					        => 'Tento model byl odstraněn.',
     'bulk_delete'               => 'Hromadné mazání modelů majetku',
     'bulk_delete_help'               => 'Pomocí zaškrtávacích kolonek potvrďte smazání označených modelů majetku. Modely majetku, ke kterým je přiřazen majetek nemohou být smazány dokud jim přiřazený majetek nebude přeřazen k jinému modulu.',
-    'bulk_delete_warn'          => 'Chystáte se smazat :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'                   => 'Obnovení Modelu',
     'requestable'               => 'Uživatelé můžou požádat o tento model',
 	'show_mac_address'			      => 'Zobrazovat pole MAC adresa u zařízení tohoto druhu',

resources/lang/cs/admin/models/message.php

@@ -3,8 +3,8 @@
 return array(
 
     'does_not_exist' => 'Model neexistuje.',
-    'no_association' => 'NO MODEL ASSOCIATED.',
+    'no_association' => 'BEZ PŘIŘAZENÉHO MODELU.',
-    'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',
+    'no_association_fix' => 'Tento stav může způsobit nedozírné problémy. Přiřaďte dotyčnému majetku správný model.',
     'assoc_users'	 => 'Tento model je spojen s alespoň jedním majetkem a nemůže být smazán. Prosím smažte tyto majetky a pak to zkuste znovu. ',
 
 
@@ -16,7 +16,7 @@ return array(
 
     'update' => array(
         'error'   => 'Model nebyl aktualizován, zkuste to prosím znovu',
-        'success' => 'Model byl úspěšně aktualizován.'
+        'success' => 'Model byl úspěšně aktualizován.',
     ),
 
     'delete' => array(
@@ -32,12 +32,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'Žádné pole nebyly změněny, takže nic nebylo aktualizováno.',
-        'success' 		=> 'Modely byly aktualizovány.'
+        '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'   		    => 'Nebyly vybrány žádné modely, takže nebylo nic smazáno.',
-        'success' 		    => ':success_count modelů smazáno!',
+        'success' 		    => 'Model deleted!|:success_count models deleted!',
         'success_partial' 	=> ':success_count modelů smazáno, ale :fail_count nebylo možné smazat protože pořád mají přiřazený majetek.'
     ),
 

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

@@ -11,7 +11,7 @@ return [
     'admin_cc_email_help'       => 'Chcete-li poslat kopii e-mailů pro check-in / checkout, které jsou uživatelům zaslány na další e-mailový účet, zadejte je zde. V opačném případě nechte toto pole prázdné.',
     'is_ad'				        => 'Toto je server služby Active Directory',
     'alerts'                	=> 'Výstrahy',
-    'alert_title'               => 'Upravit nastavení výstrah',
+    'alert_title'               => 'Aktualizace nastavení oznámení',
     'alert_email'				=> 'Zasílat upozornění na',
     'alert_email_help'    => 'E-mailové adresy nebo distribuční seznamy kterým chcete odesílat výstrahy, oddělené čárkou',
     'alerts_enabled'			=> 'Upozornění zapnutá',
@@ -198,16 +198,21 @@ return [
     'show_images_in_email'     => 'Zobrazovat obrázky v e-mailech',
     'show_images_in_email_help'   => 'Zrušte zaškrtnutí této kolonky, pokud je instalace Snipe-IT za VPN nebo uzavřenou sítí a uživatelé mimo síť nebudou moci do svých e-mailů načíst obrázky z této instalace.',
     'site_name'                 => 'Název stránky',
+    'integrations'               => 'Integrations',
     'slack'                     => 'Slack',
-    'slack_title'               => 'Upravit nastavení Slacku',
+    'general_webhook'           => 'General Webhook',
-    'slack_help'                => 'Nastavení Slacku',
+    'webhook'                   => ':app',
-    'slack_botname'             => 'Slack Botname',
+    'webhook_presave'           => 'Test to Save',
-    'slack_channel'             => 'Slack kanál',
+    'webhook_title'               => 'Update Webhook Settings',
-    'slack_endpoint'            => 'Slack koncový bod',
+    'webhook_help'                => 'Integration settings',
-    'slack_integration'         => 'Nastavení Slack',
+    'webhook_botname'             => ':app Botname',
-    'slack_integration_help'    => 'Slack integrace je dobrovolná, nicméně pokud ho chcete používat jsou vyžadovány koncový bod a kanál. Chcete-li nakonfigurovat integraci Slack, nejprve <a href=":slack_link" target="_new" rel="noopener"> vytvořte příchozí webhook</a> na vašem Slack účtu. Klikněte na <strong>otestovat Slack integraci</strong> pro otestování nastavení před uložením. ',
+    'webhook_channel'             => ':app Channel',
-    'slack_integration_help_button'    => 'Po uložení informací ke Slack se zobrazí tlačítko pro vyzkoušení.',
+    'webhook_endpoint'            => ':app Endpoint',
-    'slack_test_help'           => 'Zkontrolujte, zda je správně nakonfigurována integrace Slack. MUSÍTE NEJDŘÍVE ULOŽIT NASTAVENÍ SLACK POKUD BYLO ZMĚNĚNO.',
+    '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'  			=> 'Verze Snipe-IT',
     'support_footer'            => 'Odkazy v zápatí na podporu ',
     'support_footer_help'       => 'Určete, kdo uvidí odkazy na Snipe-IT podporu a uživatelskou příručku',
@@ -302,7 +307,7 @@ return [
     'localization_keywords' => 'lokalizace, měna, místní, místní, časové pásmo, mezinárodní, internatinalizace, jazyk, jazyky, překlad',
     'localization_help' => 'Jazyk, zobrazení data',
     'notifications' => 'Oznámení',
-    'notifications_help' => 'Upozornění e-mailem, nastavení auditu',
+    'notifications_help' => 'E-mailová oznámení a inventura',
     'asset_tags_help' => 'Nárůst a prefixy',
     'labels' => 'Štítky',
     'labels_title' => 'Upravit nastavení štítků',

resources/lang/cs/admin/settings/message.php

@@ -33,12 +33,12 @@ return [
         'testing_authentication' => 'Testování LDAP ověření...',
         'authentication_success' => 'Uživatel byl úspěšně ověřen přes LDAP!'
     ],
-    'slack' => [
+    'webhook' => [
-        'sending' => 'Odesílám testovací zprávu na Slack...',
+        'sending' => 'Sending :app test message...',
-        'success_pt1' => 'Úspěšně! Zkontrolujte ',
+        'success_pt1' => 'Success! Check the ',
-        'success_pt2' => ' kanál pro vaši testovací zprávu a ujistěte se, že klepněte na tlačítko ULOŽIT pro uložení nastavení.',
+        '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/cs/admin/users/general.php

@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'Vypsat všechna přiřazení',
     'email_assigned'    => 'Odeslat seznam aktuálně přiřazeného majetku',
     'user_notified'     => 'Uživateli byl zaslán e-mail se seznamem aktuálně přiřazeného majetku.',
+    'auto_assign_label' => 'Zahrnout tohoto uživatele do automatického přiřazování licencí',
+    'auto_assign_help'  => 'Nezahrnout tohoto uživatele do automatického přiřazování licencí',
     'software_user'     => 'Software vydaný pro :name',
     'send_email_help'   => 'Musíte zadat e-mailovou adresu tohoto uživatele pro odeslání přihlašovacích údajů. Odeslání přihlašovacích údajů lze provést pouze při vytvoření uživatele. Hesla jsou zašifrována a nelze je zjistit po tom, co jsou uložena.',
     'view_user'         => 'Zobraz uživatele',
@@ -33,7 +35,6 @@ return [
     'superadmin_permission_warning' => 'Pouze superadmini mohou povolit uživateli superadmin přístup.',
     'admin_permission_warning' => 'Pouze uživatelé s právy administrátorů a výše mohou udělit uživatelskému adminovi přístup.',
     'remove_group_memberships' => 'Odebrat členství ve skupině',
-    'warning_deletion' => 'UPOZORNĚNÍ:',
     'warning_deletion_information' => 'Chystáte se zaškrtnout VŠECHNY položky od níže uvedených :count uživatelů. Super administrátorská jména jsou zvýrazněna červeně.',
     'update_user_assets_status' => 'Aktualizovat všechny položky pro tyto uživatele na tento stav',
     'checkin_user_properties' => 'Zkontrolujte všechny vlastnosti spojené s těmito uživateli',
@@ -41,4 +42,13 @@ return [
     'remote'   => 'Vzdálený',
     'remote_help' => 'To může být užitečné, pokud potřebujete filtrovat vzdálené uživatele, kteří nikdy nebo jen zřídka přicházejí do firmy.',
     'not_remote_label' => 'Toto není vzdálený uživatel',
+    'vip_label' => 'VIP uživatel',
+    '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' => 'Založit uživatele',
+    'create_user_page_explanation' => 'Tyto údaje použijtete pro první přihlášení na stránku.',
+    'email_credentials' => 'Poslat přihlašovací údaje',
+    'email_credentials_text' => 'Odešle moje přihlašovací údaje na e-mailovou adresu výše',
+    'next_save_user' => 'Další: Uložení uživatele',
+    'all_assigned_list_generation' => 'Generated on:',
+    'email_user_creds_on_create' => 'Email this user their credentials?',
 ];

resources/lang/cs/general.php

@@ -45,7 +45,7 @@ return [
     'bulk_edit'             => 'Hromadná úprava',
     'bulk_delete'           => 'Hromadné odstranění',
     'bulk_actions'          => 'Hromadné akce',
-    'bulk_checkin_delete'   => 'Hromadné vrácení položek od uživatelů',
+    'bulk_checkin_delete'   => 'Bulk Checkin / Delete Users',
     'byod'                  => 'BYOD',
     'byod_help'             => 'This device is owned by the user',
     'bystatus'              => 'podle stavu',
@@ -148,6 +148,7 @@ return [
     'filetypes_accepted_help'    => 'Přijatý typ souboru je :types. Maximální povolená velikost nahrávání je :size.|Přijaté typy souborů jsou :types. Maximální povolená velikost nahrávání je :size.',
     'filetypes_size_help'   => 'Maximální povolená velikost nahrávání je :size.',
     'image_filetypes_help'  => 'Podporované typy souborů jsou jpg, png, gif, a svg. Velikost může být nejvýše :size.',
+    'unaccepted_image_type'  => 'Soubor s obrázkem nebyl čitelný. Přijatelné druhy souborů jsou jpg, webp, png, gif, a svg. Tento soubor je druhu: :mimetype.',
     'import'         	    => 'Import',
     'importing'         	=> 'Importování',
     'importing_help'        => 'Prostřednictvím souboru CSV můžete importovat majetek, příslušenství, licence, komponenty, spotřební materiál a uživatele. <br><br>CSV by měl být oddělený čárkou a formátovaný s hlavičkami, které odpovídají <a href="https://snipe-it.readme.io/docs/importing" target="_new">vzorovému CSV</a>.',
@@ -157,6 +158,8 @@ return [
     'asset_maintenances'       => 'Záznamy o údržbě zařízení',
     'item'  				=> 'Položka',
     'item_name'             => 'Název položky',
+    'import_file'  			=> 'import CSV file',
+    'import_type'  			=> 'CSV import type',
     'insufficient_permissions' => 'Nedostatečná oprávnění!',
     'kits'       			=> 'Předdefinované sady',
     'language'				=> 'Jazyk',
@@ -227,6 +230,7 @@ return [
     'requested_assets_menu' => 'Vyžádaný majetek',
     'request_canceled'      => 'Žádost zrušena',
     'save'  				=> 'Uložit',
+    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Zvolit',
     'select_all'            => 'Vybrat vše',
     'search'				=> 'Hledat',
@@ -249,8 +253,8 @@ return [
     'signature'             => 'Podpis',
     'signed_off_by'         => 'Odepsal:',
     'skin'       			=> 'Vzhled',
-    'slack_msg_note'        => 'Zpráva na Slacku bude odeslána',
+    'webhook_msg_note'        => 'Oznámení zavolá webhook',
-    'slack_test_msg'        => 'Super! Vypadá to že Slack integrace funguje!',
+    'webhook_test_msg'        => 'Oh hai! Looks like your :app integration with Snipe-IT is working!',
     'some_features_disabled' => 'REŽIM DEMO: Některé funkce jsou pro tuto instalaci zakázány.',
     'site_name'				=> 'Název lokality',
     'state'  				=> 'Stát',
@@ -262,7 +266,6 @@ return [
     'sure_to_delete'    => 'Opravdu si přejete odstranit',
     'submit'				=> 'Odeslat',
     'target'                => 'Cíl',
-    'toggle_navigation'     => 'Přepnout navigaci',
     'time_and_date_display' => 'Zobrazení času a data',
     'total_assets'			=> 'celkem zařízení',
     'total_licenses'		=> 'celkem licencí',
@@ -384,7 +387,8 @@ return [
     'bulk_soft_delete'      =>'Také odstranit tyto uživatele. Historie jejich majetku zůstane neporušená/dokud tvrvale nevymažete smazané záznamy v nastavení správce.',
     'bulk_checkin_delete_success' => 'Vybraní uživatelé byli odstraněni a jejich položky byly odebrány.',
     'bulk_checkin_success' => 'Položky vybraných uživatelů byly odebrány.',
-    'set_to_null' => 'Odstranit hodnoty z aktiva|Odstranit hodnoty z :asset_count aktiv ',
+    'set_to_null'           => 'Odstranit hodnoty z aktiva|Odstranit hodnoty z :asset_count aktiv ',
+    '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 – neznámé datum nákupu',
     'assets_by_status'      => 'Majetek podle stavu',
     'assets_by_status_type'      => 'Majetek podle stavu',
@@ -403,7 +407,36 @@ return [
     'toggle_navigation'     => 'Toggle navigation',
     'alerts'                => 'Alerts',
     'tasks_view_all'        => 'View all tasks',
-
+    'true'                  => 'Souhlasí',
-
+    'false'                 => 'Nesouhlasí',
-
+    'integration_option'    => 'Integration Option',
+    'log_does_not_exist'    => 'No matching log record exists.',
+    'merge_users'           => 'Sloučit uživatele',
+    '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'     => 'Nejsou vybráni žádní uživatelé',
+    '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' => 'Vaše databázové tabulky byly vytvořeny',
+    'setup_migration_output' => 'Výstup migrace:',
+    'setup_migration_create_user' => 'Další: Založení uživatele',
+    '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.',
 ];

resources/lang/cs/help.php

@@ -15,7 +15,7 @@ return [
 
     'more_info_title' => 'Více informací',
 
-    'audit_help' => 'Zaškrtnutím tohoto políčka upravíte záznam majetku tak, aby se nastavil na novou lokaci. Ponecháním nezaškrtnutého políčka bude lokace zaznamenána v auditním protokolu.<br><br>Pokud je majetek přivlastněn, nezmění se umístění osoby, majetku ani lokace.',
+    'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.<br><br>Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
 
     'assets' => 'Majetky jsou položky sledované sériovým nebo inventárním čísle,. Bývají u položek, které mají vyšší hodnotu a kde je důležitá identifikace.',
 

resources/lang/cs/localizations.php

@@ -256,7 +256,7 @@ return [
         'UK'=>'Skotsko',
         'SB'=>'Šalamounovy ostrovy',
         'SC'=>'Seychelles',
-        'SS'=>'South Sudan',
+        'SS'=>'Jižní Súdán',
         'SD'=>'Sudan',
         'SE'=>'Švédsko',
         'SG'=>'Singapur',

resources/lang/cs/mail.php

@@ -43,7 +43,7 @@ return [
     'login_first_admin' => 'Přihlaste se k nové instalaci Snipe-IT pomocí níže uvedených pověření:',
     'login' => 'Uživatelské jméno:',
     'Low_Inventory_Report' => 'Hlášení o nízkých zásobách',
-    'inventory_report' => 'Inventory Report',
+    'inventory_report' => 'Zpráva o majetku',
     'min_QTY' => 'Minimální množství',
     'name' => 'Položka',
     'new_item_checked' => 'Nová položka byla odevzdána pod vaším jménem, podrobnosti jsou uvedeny níže.',
@@ -79,5 +79,5 @@ return [
     'Expected_Checkin_Notification' => 'Připomenutí: blížící se lhůta pro :name',
     'Expected_Checkin_Date' => 'Majetek, který vám byl předán, musí být vrácen zpět do :date',
     'your_assets' => 'Zobrazit vaše položky',
-    'rights_reserved' => 'All rights reserved.',
+    'rights_reserved' => 'Všechna práva vyhrazena.',
 ];

resources/lang/cs/validation.php

@@ -124,13 +124,13 @@ return [
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
         // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
         // people won't know how to format. 
-        'purchase_date.date_format'     => 'The :attribute must be a valid date in YYYY-MM-DD format',
+        'purchase_date.date_format'     => ':attribute musí být platné datum ve formátu RRRR-MM-DD',
-        'last_audit_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD hh:mm:ss format',
+        'last_audit_date.date_format'   =>  ':attribute musí být platné datum ve formátu RRRR-MM-DD hh:mm:ss',
-        'expiration_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        'expiration_date.date_format'   =>  ':attribute musí být platné datum ve formátu RRRR-MM-DD',
-        'termination_date.date_format'  =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        'termination_date.date_format'  =>  ':attribute musí být platné datum ve formátu RRRR-MM-DD',
-        'expected_checkin.date_format'  =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        'expected_checkin.date_format'  =>  ':attribute musí být platné datum ve formátu RRRR-MM-DD',
-        'start_date.date_format'        =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        'start_date.date_format'        =>  ':attribute musí být platné datum ve formátu RRRR-MM-DD',
-        'end_date.date_format'          =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        'end_date.date_format'          =>  ':attribute musí být platné datum ve formátu RRRR-MM-DD',
 
     ],
 

resources/lang/cy/admin/accessories/general.php

@@ -16,5 +16,6 @@ return array(
     'update'  							=> 'Diweddaru Ategolyn',
     'use_default_eula'					=> 'Defnyddio\'r <a href="#" data-toggle="modal" data-target="#eulaModal">prif CTDT diofyn</a> yn lle.',
     'use_default_eula_disabled'			=> '<del>Defnyddio\'r CTDT diofn yn lle\'r un presennol.</del>Nid oes prif CTDT diofyn wedi gosod. Ychwanegwch un yn gosodiadau os gwelwch yn dda.',
+    'clone'                             => 'Clone Accessory',
 
 );

resources/lang/cy/admin/accessories/message.php

@@ -24,6 +24,7 @@ return array(
      'checkout' => array(
         'error'   		=> 'Ategolyn heb ei nodi allan, ceisiwch eto o. g. y. dd',
         'success' 		=> 'Ategolyn wedi nodi allan yn llwyddiannus.',
+        'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
         'user_does_not_exist' => 'Nid yw\'r defnyddiwr yna yn ddilys. Ceisiwch eto o.g.y.dd.'
     ),
 

resources/lang/cy/admin/asset_maintenances/form.php

@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Manylion Cynnal a Chadw',
+        'asset_maintenance_type' => 'Asset Maintenance Type',
         'title'                  => 'Teitl',
-        'start_date'             => 'Wedi cychwyn',
+        'start_date'             => 'Start Date',
-        'completion_date'        => 'Wedi cwbwlhau',
+        'completion_date'        => 'Completion Date',
         'cost'                   => 'Cost',
         'is_warranty'            => 'Gwelliant Gwarant',
-        'asset_maintenance_time' => 'Dyddiau',
+        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
         'notes'                  => 'Nodiadau',
-        'update'                 => 'Diweddaru',
+        'update'                 => 'Update Asset Maintenance',
-        'create'                 => 'Creu'
+        'create'                 => 'Create Asset Maintenance'
     ];

resources/lang/cy/admin/groups/message.php

@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Grwp yn bodoli yn barod!',
-    'group_not_found'     => 'Nid yw grwp [:id] yn bodoli.',
+    'group_not_found'     => 'Group ID :id does not exist.',
     'group_name_required' => 'Mae angen llenwi\'r maes enw',
 
     'success' => array(

resources/lang/cy/admin/hardware/form.php

@@ -2,8 +2,11 @@
 
 return [
     'bulk_delete'		=> 'Cadarnahu Dileu Nifer o Asedau',
+    'bulk_restore'      => 'Confirm Bulk Restore Assets', 
   'bulk_delete_help'	=> 'Adolygwch yr asedau ar gyfer dileu isod. Ar ôl eu dileu, gellir adfer yr asedau hyn, ond ni fyddant yn gysylltiedig mwyach ag unrhyw ddefnyddwyr y maent wedi\'u neilltuo iddynt ar hyn o bryd.',
+  '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'	=> 'Rydych am dileu :asset_count assets.',
+  'bulk_restore_warn'	=> 'You are about to restore :asset_count assets.',
     'bulk_update'		=> 'Diweddaru Nifer o Asedau',
     'bulk_update_help'	=> 'Mae\'r ffurflen hon yn caniatáu ichi ddiweddaru nifer o asedau ar unwaith. Llenwch y meysydd sydd angen i chi eu newid yn unig. Bydd unrhyw bwlch a adewir yn wag yn aros yr un fath. ',
     '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/cy/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/cy/admin/hardware/message.php

@@ -23,6 +23,8 @@ return [
     'restore' => [
         'error'   		=> 'Nid oedd yn bosib adfer yr ased, ceisiwch eto o. g. y. dd',
         'success' 		=> 'Ased wedi adfer yn llwyddiannus.',
+        'bulk_success' 		=> 'Asset restored successfully.',
+        'nothing_updated'   => 'No assets were selected, so nothing was restored.', 
     ],
 
     'audit' => [