diff --git a/administrator/language/en-GB/en-GB.com_users.ini b/administrator/language/en-GB/en-GB.com_users.ini index 9701cecf6aaef..a19ed53a46582 100644 --- a/administrator/language/en-GB/en-GB.com_users.ini +++ b/administrator/language/en-GB/en-GB.com_users.ini @@ -61,7 +61,7 @@ COM_USERS_CONFIG_FIELD_SENDPASSWORD_LABEL="Send Password" COM_USERS_CONFIG_FIELD_SENDPASSWORD_DESC="If set to Yes the user's initial password will be emailed to the user as part of the registration mail." COM_USERS_CONFIG_FIELD_SUBJECT_PREFIX_DESC="This is added in front of each mail subject." COM_USERS_CONFIG_FIELD_SUBJECT_PREFIX_LABEL="Subject Prefix" -COM_USERS_CONFIG_FIELD_USERACTIVATION_DESC="If set to None the user will be registered immediately. If set to Self the User will be emailed a link to activate their account before they can log in. If set to Administrator the user will be emailed a link to verify their email address and then all users set to receive system emails and who have the permission to create users will be notified to activate the user's account." +COM_USERS_CONFIG_FIELD_USERACTIVATION_DESC="If set to None the user will be registered immediately. If set to Self the User will be emailed a link to activate their account before they can log in. If set to Administrator the user will be emailed a link to verify their email address and then all users set to receive system notifications and who have the permission to create users will be notified to activate the user's account." COM_USERS_CONFIG_FIELD_USERACTIVATION_LABEL="New User Account Activation" COM_USERS_CONFIG_FIELD_USERACTIVATION_OPTION_ADMINACTIVATION="Administrator" COM_USERS_CONFIG_FIELD_USERACTIVATION_OPTION_SELFACTIVATION="Self" @@ -292,8 +292,8 @@ COM_USERS_USER_FIELD_REQUIRERESET_DESC="Setting this option to yes requires the COM_USERS_USER_FIELD_REQUIRERESET_LABEL="Require Password Reset" COM_USERS_USER_FIELD_RESETCOUNT_DESC="Number of password resets since last reset date." COM_USERS_USER_FIELD_RESETCOUNT_LABEL="Password Reset Count" -COM_USERS_USER_FIELD_SENDEMAIL_DESC="If set to yes, the user will receive system emails." -COM_USERS_USER_FIELD_SENDEMAIL_LABEL="Receive System Emails" +COM_USERS_USER_FIELD_SENDEMAIL_DESC="If set to yes, the user will receive system notifications." +COM_USERS_USER_FIELD_SENDEMAIL_LABEL="Receive System Notifications" COM_USERS_USER_FIELD_TIMEZONE_DESC="Time zone for this user." COM_USERS_USER_FIELD_TIMEZONE_LABEL="Time Zone" COM_USERS_USER_FIELD_TWOFACTOR_LABEL="Authentication Method" diff --git a/tests/system/webdriver/Pages/Users/UserEditPage.php b/tests/system/webdriver/Pages/Users/UserEditPage.php index 27d5345453329..33b677b55b62e 100644 --- a/tests/system/webdriver/Pages/Users/UserEditPage.php +++ b/tests/system/webdriver/Pages/Users/UserEditPage.php @@ -48,7 +48,7 @@ class UserEditPage extends AdminEditPage array('label' => 'Last Visit Date', 'id' => 'jform_lastvisitDate', 'type' => 'input', 'tab' => 'details'), array('label' => 'Last Reset Date', 'id' => 'jform_lastResetTime', 'type' => 'input', 'tab' => 'details'), array('label' => 'Password Reset Count', 'id' => 'jform_resetCount', 'type' => 'input', 'tab' => 'details'), - array('label' => 'Receive System Emails', 'id' => 'jform_sendEmail', 'type' => 'fieldset', 'tab' => 'details'), + array('label' => 'Receive System Notifications', 'id' => 'jform_sendEmail', 'type' => 'fieldset', 'tab' => 'details'), array('label' => 'Block this User', 'id' => 'jform_block', 'type' => 'fieldset', 'tab' => 'details'), array('label' => 'Require Password Reset', 'id' => 'jform_requireReset', 'type' => 'fieldset', 'tab' => 'details'), array('label' => 'ID', 'id' => 'jform_id', 'type' => 'input', 'tab' => 'details'),