Merge remote-tracking branch 'origin/develop'
Some checks are pending
CodeQL Security Scan / CodeQL Security Scan (javascript) (push) Waiting to run
Codacy Security Scan / Codacy Security Scan (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run

This commit is contained in:
snipe 2024-08-26 10:26:06 +01:00
commit 991e48696a

View file

@ -28,10 +28,10 @@ return [
'a_user_requested' => 'A user has requested an item on the website', 'a_user_requested' => 'A user has requested an item on the website',
'acceptance_asset_accepted' => 'A user has accepted an item', 'acceptance_asset_accepted' => 'A user has accepted an item',
'acceptance_asset_declined' => 'A user has declined an item', 'acceptance_asset_declined' => 'A user has declined an item',
'accessory_name' => 'Accessory Name:', 'accessory_name' => 'Accessory Name',
'additional_notes' => 'Additional Notes:', 'additional_notes' => 'Additional Notes',
'admin_has_created' => 'An administrator has created an account for you on the :web website.', 'admin_has_created' => 'An administrator has created an account for you on the :web website.',
'asset' => 'Asset:', 'asset' => 'Asse:',
'asset_name' => 'Asset Name', 'asset_name' => 'Asset Name',
'asset_requested' => 'Asset requested', 'asset_requested' => 'Asset requested',
'asset_tag' => 'Asset Tag', 'asset_tag' => 'Asset Tag',