mirror of
https://github.com/snipe/snipe-it.git
synced 2024-11-14 09:34:10 -08:00
Merge remote-tracking branch 'origin/develop'
This commit is contained in:
commit
7974885041
|
@ -32,15 +32,15 @@ return [
|
||||||
'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' => 'Asset:',
|
||||||
'asset_name' => 'Asset Name:',
|
'asset_name' => 'Asset Name',
|
||||||
'asset_requested' => 'Asset requested',
|
'asset_requested' => 'Asset requested',
|
||||||
'asset_tag' => 'Asset Tag',
|
'asset_tag' => 'Asset Tag',
|
||||||
'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
|
'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
|
||||||
'assigned_to' => 'Assigned To',
|
'assigned_to' => 'Assigned To',
|
||||||
'best_regards' => 'Best regards,',
|
'best_regards' => 'Best regards,',
|
||||||
'canceled' => 'Canceled:',
|
'canceled' => 'Canceled',
|
||||||
'checkin_date' => 'Checkin Date:',
|
'checkin_date' => 'Checkin Date',
|
||||||
'checkout_date' => 'Checkout Date:',
|
'checkout_date' => 'Checkout Date',
|
||||||
'checkedout_from' => 'Checked out from',
|
'checkedout_from' => 'Checked out from',
|
||||||
'checkedin_from' => 'Checked in from',
|
'checkedin_from' => 'Checked in from',
|
||||||
'checked_into' => 'Checked into',
|
'checked_into' => 'Checked into',
|
||||||
|
@ -49,13 +49,13 @@ return [
|
||||||
'click_to_confirm' => 'Please click on the following link to confirm your :web account:',
|
'click_to_confirm' => 'Please click on the following link to confirm your :web account:',
|
||||||
'current_QTY' => 'Current QTY',
|
'current_QTY' => 'Current QTY',
|
||||||
'days' => 'Days',
|
'days' => 'Days',
|
||||||
'expecting_checkin_date' => 'Expected Checkin Date:',
|
'expecting_checkin_date' => 'Expected Checkin Date',
|
||||||
'expires' => 'Expires',
|
'expires' => 'Expires',
|
||||||
'hello' => 'Hello',
|
'hello' => 'Hello',
|
||||||
'hi' => 'Hi',
|
'hi' => 'Hi',
|
||||||
'i_have_read' => 'I have read and agree to the terms of use, and have received this item.',
|
'i_have_read' => 'I have read and agree to the terms of use, and have received this item.',
|
||||||
'inventory_report' => 'Inventory Report',
|
'inventory_report' => 'Inventory Report',
|
||||||
'item' => 'Item:',
|
'item' => 'Item',
|
||||||
'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
|
'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
|
||||||
'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
|
'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
|
||||||
'link_to_update_password' => 'Please click on the following link to update your :web password:',
|
'link_to_update_password' => 'Please click on the following link to update your :web password:',
|
||||||
|
@ -66,11 +66,11 @@ return [
|
||||||
'name' => 'Name',
|
'name' => 'Name',
|
||||||
'new_item_checked' => 'A new item has been checked out under your name, details are below.',
|
'new_item_checked' => 'A new item has been checked out under your name, details are below.',
|
||||||
'notes' => 'Notes',
|
'notes' => 'Notes',
|
||||||
'password' => 'Password:',
|
'password' => 'Password',
|
||||||
'password_reset' => 'Password Reset',
|
'password_reset' => 'Password Reset',
|
||||||
'read_the_terms' => 'Please read the terms of use below.',
|
'read_the_terms' => 'Please read the terms of use below.',
|
||||||
'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
|
'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
|
||||||
'requested' => 'Requested:',
|
'requested' => 'Requested',
|
||||||
'reset_link' => 'Your Password Reset Link',
|
'reset_link' => 'Your Password Reset Link',
|
||||||
'reset_password' => 'Click here to reset your password:',
|
'reset_password' => 'Click here to reset your password:',
|
||||||
'rights_reserved' => 'All rights reserved.',
|
'rights_reserved' => 'All rights reserved.',
|
||||||
|
|
Loading…
Reference in a new issue