diff --git a/resources/lang/en/admin/categories/general.php b/resources/lang/en/admin/categories/general.php
index 7741b7da62..52e936d0b6 100644
--- a/resources/lang/en/admin/categories/general.php
+++ b/resources/lang/en/admin/categories/general.php
@@ -18,5 +18,6 @@ return array(
'update' => 'Update Category',
'use_default_eula' => 'Use the primary default EULA instead.',
'use_default_eula_disabled' => 'Use the primary default EULA instead. No primary default EULA is set. Please add one in Settings.',
+ 'use_default_eula_column' => 'Use default EULA',
);
diff --git a/resources/lang/en/admin/settings/general.php b/resources/lang/en/admin/settings/general.php
index 514cdef202..6a6acf7222 100644
--- a/resources/lang/en/admin/settings/general.php
+++ b/resources/lang/en/admin/settings/general.php
@@ -14,7 +14,7 @@ return array(
'alerts_enabled' => 'Email Alerts Enabled',
'alert_interval' => 'Expiring Alerts Threshold (in days)',
'alert_inv_threshold' => 'Inventory Alert Threshold',
- 'allow_user_skin' => 'Allow User Skin',
+ 'allow_user_skin' => 'Allow user skin',
'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' ,
'asset_ids' => 'Asset IDs',
'audit_interval' => 'Audit Interval',
@@ -61,6 +61,7 @@ return array(
'label_logo' => 'Label Logo',
'label_logo_size' => 'Square logos look best - will be displayed in the top right of each asset label. ',
'laravel' => 'Laravel Version',
+ 'ldap_client_tls_cert' => 'LDAP Client-Side TLS Certificate',
'ldap_enabled' => 'LDAP enabled',
'ldap_integration' => 'LDAP Integration',
'ldap_settings' => 'LDAP Settings',
diff --git a/resources/lang/en/admin/users/message.php b/resources/lang/en/admin/users/message.php
index 65a75b08c2..85d016f04a 100644
--- a/resources/lang/en/admin/users/message.php
+++ b/resources/lang/en/admin/users/message.php
@@ -13,6 +13,7 @@ return array(
'user_deleted_warning' => 'This user has been deleted. You will have to restore this user to edit them or assign them new assets.',
'ldap_not_configured' => 'LDAP integration has not been configured for this installation.',
'password_resets_sent' => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
+ 'password_reset_sent' => 'A password reset link has been sent to :email!',
'success' => array(
diff --git a/resources/lang/en/button.php b/resources/lang/en/button.php
index 2b97223250..27131e5fc6 100644
--- a/resources/lang/en/button.php
+++ b/resources/lang/en/button.php
@@ -14,4 +14,5 @@ return array(
'select_file' => 'Select File...',
'select_files' => 'Select Files...',
'generate_labels' => '{1} Generate Label|[2,*] Generate Labels',
+ 'send_password_link' => 'Send Password Reset Link',
);
diff --git a/resources/lang/en/mail.php b/resources/lang/en/mail.php
index c34123ed74..27a919856b 100644
--- a/resources/lang/en/mail.php
+++ b/resources/lang/en/mail.php
@@ -60,7 +60,7 @@ return array(
'test_mail_text' => 'This is a test from the Snipe-IT Asset Management System. If you got this, mail is working :)',
'the_following_item' => 'The following item has been checked in: ',
'low_inventory_alert' => 'There is :count item that is below minimum inventory or will soon be low.|There are :count items that are below minimum inventory or will soon be low.',
- 'assets_warrantee_alert' => 'There is :count asset with a warrantee expiring in the next :threshold days.|There are :count assets with warrantees 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.',
'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
'to_reset' => 'To reset your :web password, complete this form:',
'type' => 'Type',
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index 18b8d30ad1..660b683ac8 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -927,7 +927,8 @@
{{ $component->name }}