diff --git a/admin/tool/dataprivacy/lang/en/tool_dataprivacy.php b/admin/tool/dataprivacy/lang/en/tool_dataprivacy.php index 494dadd449e..bdc47afdddf 100644 --- a/admin/tool/dataprivacy/lang/en/tool_dataprivacy.php +++ b/admin/tool/dataprivacy/lang/en/tool_dataprivacy.php @@ -159,7 +159,7 @@ $string['explanationtitle'] = 'Icons used on this page and what they mean.'; $string['external'] = 'Additional'; $string['externalexplanation'] = 'An additional plugin installed on this site.'; $string['filteroption'] = '{$a->category}: {$a->name}'; -$string['frontpagecourse'] = 'Front page course'; +$string['frontpagecourse'] = 'Site home course'; $string['gdpr_art_6_1_a_description'] = 'The data subject has given consent to the processing of his or her personal data for one or more specific purposes'; $string['gdpr_art_6_1_a_name'] = 'Consent (GDPR Art. 6.1(a))'; $string['gdpr_art_6_1_b_description'] = 'Processing is necessary for the performance of a contract to which the data subject is party or in order to take steps at the request of the data subject prior to entering into a contract'; diff --git a/admin/tool/mobile/lang/en/tool_mobile.php b/admin/tool/mobile/lang/en/tool_mobile.php index 8604fd1e14f..9b907927b5c 100644 --- a/admin/tool/mobile/lang/en/tool_mobile.php +++ b/admin/tool/mobile/lang/en/tool_mobile.php @@ -124,7 +124,7 @@ $string['qrcodetypelogin'] = 'QR code with automatic login'; $string['readingthisemailgettheapp'] = 'Reading this in an email? Download the mobile app and receive notifications on your mobile device.'; $string['remoteaddons'] = 'Remote add-ons'; $string['scanqrcode'] = 'Scan QR code'; -$string['selfsignedoruntrustedcertificatewarning'] = 'It seems that the HTTPS certificate is self-signed or not trusted. The mobile app will only work with trusted sites. Please, use any online SSL checker tool to further diagnose the problem. If these tools indicate that you certificate is OK, you can ignore this warning.'; +$string['selfsignedoruntrustedcertificatewarning'] = 'It seems that the HTTPS certificate is self-signed or not trusted. The mobile app will only work with trusted sites. Please use any online SSL checker to diagnose the problem. If it indicates that your certificate is OK, you can ignore this warning.'; $string['setuplink'] = 'App download page'; $string['setuplink_desc'] = 'URL of page with options to download the mobile app from the App Store and Google Play. The app download page link is displayed in the page footer and in a user\'s profile. Leave blank to not display a link.'; $string['smartappbanners'] = 'App Banners'; diff --git a/admin/tool/uploadcourse/lang/en/tool_uploadcourse.php b/admin/tool/uploadcourse/lang/en/tool_uploadcourse.php index 4eb3720c4b2..1cbea0f5166 100644 --- a/admin/tool/uploadcourse/lang/en/tool_uploadcourse.php +++ b/admin/tool/uploadcourse/lang/en/tool_uploadcourse.php @@ -36,7 +36,7 @@ $string['cannotreadbackupfile'] = 'Cannot read the backup file'; $string['cannotrenamecoursenotexist'] = 'Cannot rename a course that does not exist'; $string['cannotrenameidnumberconflict'] = 'Cannot rename the course, the ID number conflicts with an existing course'; $string['cannotrenameshortnamealreadyinuse'] = 'Cannot rename the course, the shortname is already used'; -$string['cannotupdatefrontpage'] = 'It is forbidden to modify the front page'; +$string['cannotupdatefrontpage'] = 'You are not allowed to change the site home.'; $string['canonlyrenameinupdatemode'] = 'Can only rename a course when update is allowed'; $string['canonlyresetcourseinupdatemode'] = 'Can only reset a course in update mode'; $string['couldnotresolvecatgorybyid'] = 'Could not resolve category by ID'; diff --git a/admin/tool/usertours/lang/en/tool_usertours.php b/admin/tool/usertours/lang/en/tool_usertours.php index 2a0659f8779..ed48a8f159c 100644 --- a/admin/tool/usertours/lang/en/tool_usertours.php +++ b/admin/tool/usertours/lang/en/tool_usertours.php @@ -104,8 +104,7 @@ Some example values include: * /mod/forum/view.php% - to match the forum discussion list * /user/profile.php% - to match the user profile page -If you wish to display a tour on the Site Home page, you can use the value: "FRONTPAGE". -'; +If you wish to display a tour on the site home, you can use the value: "FRONTPAGE".'; $string['placement'] = 'Placement'; $string['pluginname'] = 'User tours'; $string['resettouronpage'] = 'Reset user tour on this page'; @@ -168,7 +167,7 @@ $string['tour1_content_welcome'] = 'Welcome to the Boost theme. If you\'ve upgra $string['tour1_title_navigation'] = 'Navigation'; $string['tour1_content_navigation'] = 'Major navigation is now through this nav drawer. The contents update depending on where you are in the site. Use the button at the top to hide or show it.'; $string['tour1_title_customisation'] = 'Customisation'; -$string['tour1_content_customisation'] = 'To customise the look of your site and the front page, use the settings menu in the corner of this header. Try turning editing on right now.'; +$string['tour1_content_customisation'] = 'To customise the look of your site and the site home, use the settings menu in the corner of this header. Try turning editing on right now.'; $string['tour1_title_blockregion'] = 'Block region'; $string['tour1_content_blockregion'] = 'There is still a block region over here. We recommend removing the Navigation and Administration blocks completely, as all the functionality is elsewhere in the Boost theme.'; $string['tour1_title_addingblocks'] = 'Adding blocks'; diff --git a/blocks/completionstatus/tests/behat/block_completionstatus_activity_completion.feature b/blocks/completionstatus/tests/behat/block_completionstatus_activity_completion.feature index eee001e9365..a3094956a65 100644 --- a/blocks/completionstatus/tests/behat/block_completionstatus_activity_completion.feature +++ b/blocks/completionstatus/tests/behat/block_completionstatus_activity_completion.feature @@ -81,7 +81,7 @@ Feature: Enable Block Completion in a course using activity completion And I follow "View all submissions" And I click on "Grade" "link" in the "Student" "table_row" And I set the field "Grade out of 100" to "53" - And I set the field "Notify students" to "0" + And I set the field "Notify student" to "0" And I press "Save changes" And I am on "Course 1" course homepage with editing mode on And I add the "Course completion status" block @@ -115,7 +115,7 @@ Feature: Enable Block Completion in a course using activity completion And I follow "View all submissions" And I click on "Grade" "link" in the "Student" "table_row" And I set the field "Grade out of 100" to "49" - And I set the field "Notify students" to "0" + And I set the field "Notify student" to "0" And I press "Save changes" And I am on "Course 1" course homepage with editing mode on And I add the "Course completion status" block diff --git a/blocks/course_summary/tests/behat/block_course_summary_frontpage.feature b/blocks/course_summary/tests/behat/block_course_summary_frontpage.feature index ee6a13ed6b8..7eb6704cfc7 100644 --- a/blocks/course_summary/tests/behat/block_course_summary_frontpage.feature +++ b/blocks/course_summary/tests/behat/block_course_summary_frontpage.feature @@ -9,7 +9,7 @@ Feature: Course summary block used on the frontpage And I am on site homepage And I turn editing mode on And I add the "Course/site summary" block - And I navigate to "Front page > Front page settings" in site administration + And I navigate to "Site home > Site home settings" in site administration And I set the following fields to these values: | summary | Proved the summary block works! | And I press "Save changes" diff --git a/blocks/site_main_menu/tests/behat/add_url.feature b/blocks/site_main_menu/tests/behat/add_url.feature index 082906729ef..573962f8196 100644 --- a/blocks/site_main_menu/tests/behat/add_url.feature +++ b/blocks/site_main_menu/tests/behat/add_url.feature @@ -58,7 +58,7 @@ Feature: Add URL to main menu block And I add the "Main menu" block And I configure the "Main menu" block And I set the following fields to these values: - | Page contexts | Display on the front page and any pages added to the front page | + | Page contexts | Display on the site home and any pages added to the site home. | And I press "Save changes" And I add a "URL" to section "0" and I fill the form with: | Name | reference link | diff --git a/course/tests/behat/course_download_content_cm.feature b/course/tests/behat/course_download_content_cm.feature index 3f84f88cdc3..09409df9c3f 100644 --- a/course/tests/behat/course_download_content_cm.feature +++ b/course/tests/behat/course_download_content_cm.feature @@ -29,30 +29,30 @@ Feature: Activities content download can be controlled | downloadcoursecontentallowed | 1 | And I log out - Scenario: "Include in course downloads (if that feature is enabled)" field default is set to "Yes" if nothing has been set + Scenario: "Include in course content download" field default is set to "Yes" if nothing has been set Given I am on the Page1 "Page Activity editing" page logged in as admin - Then the field "Include in course downloads (if that feature is enabled)" matches value "Yes" + Then the field "Include in course content download" matches value "Yes" - Scenario: "Include in course downloads (if that feature is enabled)" field is not visible if course content is disabled on site level + Scenario: "Include in course content download" field is not visible if course content is disabled on site level Given I log in as "admin" And the following config values are set as admin: | downloadcoursecontentallowed | 0 | And I am on the Page1 "Page Activity editing" page - Then "Include in course downloads (if that feature is enabled)" "select" should not exist + Then "Include in course content download" "select" should not exist - Scenario: "Include in course downloads (if that feature is enabled)" field is visible even if course content is disabled on course level + Scenario: "Include in course content download" field is visible even if course content is disabled on course level Given I log in as "admin" And I am on "Course 1" course homepage And I navigate to "Settings" in current page administration When I set the field "Enable download course content" to "No" And I press "Save and display" And I am on the Page1 "Page Activity editing" page - Then "Include in course downloads (if that feature is enabled)" "select" should exist + Then "Include in course content download" "select" should exist - Scenario: "Include in course downloads (if that feature is enabled)" field should be visible but not editable for users without configuredownloadcontent capability + Scenario: "Include in course content download" field should be visible but not editable for users without configuredownloadcontent capability Given I log in as "manager1" And I am on the Folder1 "Folder Activity editing" page - And "Include in course downloads (if that feature is enabled)" "field" should exist + And "Include in course content download" "field" should exist And I log out And I log in as "admin" When I set the following system permissions of "Manager" role: @@ -61,6 +61,6 @@ Feature: Activities content download can be controlled And I log out And I log in as "manager1" And I am on the Folder1 "Folder Activity editing" page - Then I should see "Include in course downloads (if that feature is enabled)" + Then I should see "Include in course content download" And I should see "No" - And "Include in course downloads (if that feature is enabled)" "select" should not exist + And "Include in course content download" "select" should not exist diff --git a/course/tests/behat/frontpage_display_modes.feature b/course/tests/behat/frontpage_display_modes.feature index f2664bbac30..7df3eff46a2 100644 --- a/course/tests/behat/frontpage_display_modes.feature +++ b/course/tests/behat/frontpage_display_modes.feature @@ -1,5 +1,5 @@ @core @core_course -Feature: Front page displays items in different modes +Feature: Site home displays items in different modes In order to show a clean and clear list of the site categories and course As an admin I need to set different frontpage display modes @@ -27,7 +27,7 @@ Feature: Front page displays items in different modes @javascript Scenario: Displays a list of categories When I set the following administration settings values: - | Front page items when logged in | List of categories | + | Site home items when logged in | List of categories | | Maximum category depth | 2 | And I am on site homepage Then I should see "Category A" in the "region-main" "region" @@ -43,7 +43,7 @@ Feature: Front page displays items in different modes @javascript Scenario: Displays a combo list When I set the following administration settings values: - | Front page items when logged in | Combo list | + | Site home items when logged in | Combo list | | Maximum category depth | 2 | And I am on site homepage Then I should see "Category A" in the "region-main" "region" diff --git a/course/tests/behat/frontpage_topic_section.feature b/course/tests/behat/frontpage_topic_section.feature index 5c9bbfb9385..7ea81a57a3d 100644 --- a/course/tests/behat/frontpage_topic_section.feature +++ b/course/tests/behat/frontpage_topic_section.feature @@ -1,5 +1,5 @@ @core @core_course -Feature: Front page topic section +Feature: Site home topic section In order to show a display activities in the frontpage As an admin I need to edit the frontpage topic section diff --git a/lang/en/admin.php b/lang/en/admin.php index 460fe06e21f..cca2cfc8786 100644 --- a/lang/en/admin.php +++ b/lang/en/admin.php @@ -159,7 +159,7 @@ $string['configallowedemaildomains'] = 'List email domains that are allowed to b $string['configallowemailaddresses'] = 'To restrict new email addresses to particular domains, list them here separated by spaces. All other domains will be rejected. To allow subdomains, add the domain with a preceding \'.\'. To allow a root domain together with its subdomains, add the domain twice - once with a preceding \'.\' and once without e.g. .ourcollege.edu.au ourcollege.edu.au.'; $string['configallowemojipicker'] = 'The emoji picker enables users to select emojis, such as smilies, to add to messages and other text areas via an emoji picker button in the Atto toolbar.'; $string['configallowemojipickerincompatible'] = 'Your current database configuration does not properly support emojis. In order to enable the emoji picker you will need to upgrade your database for full unicode support.'; -$string['configallowguestmymoodle'] = 'If enabled guests can access Dashboard, otherwise guests are redirected to the site front page.'; +$string['configallowguestmymoodle'] = 'If enabled, guests can access the Dashboard. Otherwise guests are redirected to the site home.'; $string['configallowobjectembed'] = 'As a default security measure, normal users are not allowed to embed multimedia (like Flash) within texts using explicit EMBED and OBJECT tags in their HTML (although it can still be done safely using the mediaplugins filter). If you wish to allow these tags then enable this option.'; $string['configallowoverride'] = 'You can allow people with the roles on the left side to override some of the column roles'; $string['configallowoverride2'] = 'Select which role(s) can be overridden by each role in the left column.
Note that these settings only apply to users who have either the capability moodle/role:override or the capability moodle/role:safeoverride allowed.'; @@ -171,7 +171,7 @@ $string['configallowuserswitchrolestheycantassign'] = 'By default, moodle/role:a It is recommended that the settings in the "Allow role assignments" table do not allow users to switch to a role with more capabilities than their existing role.'; $string['configallowuserthemes'] = 'If you enable this, then users will be allowed to set their own themes. User themes override site themes (but not course themes)'; $string['configallowview'] = 'Select which roles a user will see, be able to filter by etc. based on which roles they already have.'; -$string['configallusersaresitestudents'] = 'For activities on the front page of the site, should ALL users be considered as students? If you answer "Yes", then any confirmed user account will be allowed to participate as a student in those activities. If you answer "No", then only users who are already a participant in at least one course will be able to take part in those front page activities. Only admins and specially assigned teachers can act as teachers for these front page activities.'; +$string['configallusersaresitestudents'] = 'For activities on the site home, should ALL users be considered as students? If yes, then anyone with an account will be allowed to participate as a student in these activities. If no, then only users who are already a participant in at least one course will be able to take part in these activities. Only admins and specially assigned teachers can act as teachers for site home activities.'; $string['configauthenticationplugins'] = 'Please choose the authentication plugins you wish to use and arrange them in order of failthrough.'; $string['configautolang'] = 'Detect default language from browser setting, if disabled site default is used.'; $string['configautolangusercreation'] = 'If enabled, when a user\'s account is created automatically on first login (e.g. using LDAP or OAuth 2 authentication), the user\'s browser language is set as their preferred language. Otherwise, the default language for the site is set as the user\'s preferred language.'; @@ -252,12 +252,12 @@ $string['configfilterall'] = 'Filter all strings, including headings, titles, na $string['configfiltermatchoneperpage'] = 'Automatic linking filters will only generate a single link for the first matching text instance found on the complete page. All others are ignored.'; $string['configfiltermatchonepertext'] = 'Automatic linking filters will only generate a single link for the first matching text instance found in each item of text on the page. All others are ignored. This setting has no effect if \'Filter match once per page\' is enabled.'; $string['configfilteruploadedfiles'] = 'Process all uploaded HTML and text files with the filters before displaying them, only uploaded HTML files or none at all.'; -$string['configforcelogin'] = 'Normally, the front page of the site and the course listings (but not courses) can be read by people without logging in to the site. If you want to force people to log in before they do ANYTHING on the site, then you should enable this setting.'; +$string['configforcelogin'] = 'Normally, the site home and the course listings (but not courses) can be read by people without logging in to the site. If you want to force people to log in before they do ANYTHING on the site, then you should enable this setting.'; $string['configforceloginforprofiles'] = 'This setting forces people to log in as a real (non-guest) account before viewing any user\'s profile. If you disabled this setting, you may find that some users post advertising (spam) or other inappropriate content in their profiles, which is then visible to the whole world.'; -$string['configfrontpage'] = 'The items selected above will be displayed on the site\'s front page.'; +$string['configfrontpage'] = 'The items selected above will be displayed on the site home.'; $string['configfrontpagecourselimit'] = 'Maximum number of courses'; -$string['configfrontpagecourselimithelp'] = 'Maximum number of courses to be displayed on the site\'s front page in course listings.'; -$string['configfrontpageloggedin'] = 'The items selected above will be displayed on the site\'s front page when a user is logged in.'; +$string['configfrontpagecourselimithelp'] = 'Maximum number of courses to be displayed on the site home in course listings.'; +$string['configfrontpageloggedin'] = 'The items selected above will be displayed on the site home when a user is logged in.'; $string['configfullnamedisplay'] = 'This defines how names are shown when they are displayed in full. The default value, "language", leaves it to the string "fullnamedisplay" in the current language pack to decide. Some languages have different name display conventions. For most mono-lingual sites the most efficient setting is "firstname lastname", but you may choose to hide surnames altogether. Placeholders that can be used are: firstname, lastname, firstnamephonetic, lastnamephonetic, middlename, and alternatename.'; @@ -269,7 +269,7 @@ $string['confighiddenuserfields'] = 'Select which user information fields you wi $string['configidnumber'] = 'This option specifies whether (a) Users are not be asked for an ID number at all, (b) Users are asked for an ID number but can leave it blank or (c) Users are asked for an ID Number and cannot leave it blank. If given the User\'s ID number is displayed in their Profile.'; $string['configintro'] = 'On this page you can specify a number of configuration variables that help make Moodle work properly on your server. Don\'t worry too much about it - the defaults will usually work fine and you can always come back to this page later and change these settings.'; $string['configintroadmin'] = 'On this page you should configure your main administrator account which will have complete control over the site. Make sure you give it a secure username and password as well as a valid email address. You can create more admin accounts later on.'; -$string['configintrosite'] = 'This page allows you to configure the front page and name of this new site. You can come back here later to change these settings any time using the Administration menus.'; +$string['configintrosite'] = 'This page allows you to configure the site home and name of this new site. You can come back here later to change these settings any time using the Administration menus.'; $string['configiplookup'] = 'When you click on an IP address (such as 34.12.222.93), such as in the logs, you are shown a map with a best guess of where that IP is located. There are different plugins for this that you can choose from, each has benefits and disadvantages.'; $string['configkeeptagnamecase'] = 'Check this if you want tag names to keep the original casing as entered by users who created them'; $string['configlang'] = 'Choose a default language for the whole site. Users can override this setting using the language menu or the setting in their personal profile.'; @@ -632,16 +632,16 @@ $string['forceloginforprofileimage_help'] = 'If enabled, users must log in in or $string['forceloginforprofiles'] = 'Force users to log in for profiles'; $string['forcetimezone'] = 'Force timezone'; $string['formatuninstallwithcourses'] = 'There are {$a->count} courses using {$a->format}. Their format will be changed to {$a->defaultformat} (default format for this site). Some format-specific data may be lost. Are you sure you want to proceed?'; -$string['frontpage'] = 'Front page'; -$string['frontpagebackup'] = 'Front page backup'; -$string['frontpagedefaultrole'] = 'Default frontpage role'; -$string['frontpagefilters'] = 'Front page filters'; -$string['frontpageloggedin'] = 'Front page items when logged in'; -$string['frontpageoverrides'] = 'Front page permission overrides'; -$string['frontpagequestions'] = 'Front page questions'; -$string['frontpagerestore'] = 'Front page restore'; -$string['frontpageroles'] = 'Front page roles'; -$string['frontpagesettings'] = 'Front page settings'; +$string['frontpage'] = 'Site home'; +$string['frontpagebackup'] = 'Site home backup'; +$string['frontpagedefaultrole'] = 'Default site home role'; +$string['frontpagefilters'] = 'Site home filters'; +$string['frontpageloggedin'] = 'Site home items when logged in'; +$string['frontpageoverrides'] = 'Site home permission overrides'; +$string['frontpagequestions'] = 'Site home questions'; +$string['frontpagerestore'] = 'Site home restore'; +$string['frontpageroles'] = 'Site home roles'; +$string['frontpagesettings'] = 'Site home settings'; $string['fullnamedisplay'] = 'Full name format'; $string['fullnamedisplayprivate'] = 'Full name format - private'; $string['gdrequired'] = 'The GD extension is now required by Moodle for image conversion.'; @@ -872,8 +872,8 @@ $string['navigationupgrade'] = 'This upgrade introduces two new navigation block $string['navcourselimit'] = 'Course limit'; $string['navshowfullcoursenames'] = 'Show course full names'; $string['navshowfullcoursenames_help'] = 'If enabled, course full names will be used in the navigation rather than short names.'; -$string['navshowfrontpagemods'] = 'Show front page activities in the navigation'; -$string['navshowfrontpagemods_help'] = 'If enabled, front page activities will be shown on the navigation under site pages.'; +$string['navshowfrontpagemods'] = 'Show site home activities in the navigation'; +$string['navshowfrontpagemods_help'] = 'If enabled, site home activities will be shown on the navigation under site pages. This setting only applies to themes based on Classic.'; $string['navshowallcourses'] = 'Show all courses'; $string['navshowcategories'] = 'Show course categories'; $string['navshowmycoursecategories'] = 'Show my course categories'; @@ -1089,7 +1089,7 @@ $string['rememberuserlicensepref'] = 'Remember user licence preference'; $string['rememberuserlicensepref_help'] = 'If enabled, the last licence selected by the user is preselected when uploading a file in the file picker. Otherwise, the default site licence is preselected.'; $string['rememberusername'] = 'Remember username'; $string['rememberusername_desc'] = 'Enable if you want to store permanent cookies with usernames during user login. Permanent cookies may be considered a privacy issue if used without consent.'; -$string['replacefrontsearch'] = 'Used for front page course search'; +$string['replacefrontsearch'] = 'Used for site home course search'; $string['reportsmanage'] = 'Manage reports'; $string['requiredentrieschanged'] = 'Note: After upgrading, the setting \'Required entries before viewing\' is now enforced in the following database activities:
{$a->text}
'; $string['requiremodintro'] = 'Require activity description'; @@ -1240,7 +1240,7 @@ $string['sitepolicyhandlercore'] = 'Default (core)'; $string['sitepolicyhandlerplugin'] = '{$a->name} ({$a->component})'; $string['sitepolicyguest'] = 'Site policy URL for guests'; $string['sitepolicyguest_help'] = 'The URL of the site policy that all guests must see and agree to before accessing the site. Note that this setting will only have an effect if the site policy handler is set to default (core).'; -$string['sitesectionhelp'] = 'If selected, a topic section will be displayed on the site\'s front page.'; +$string['sitesectionhelp'] = 'If selected, a topic section will be displayed on the site home.'; $string['sixtyfourbitswarning'] = 'It has been detected that your site is not using a 64-bit PHP version. It is recommended that you upgrade your site to ensure future compatibility.'; $string['slasharguments'] = 'Use slash arguments'; $string['slashargumentswarning'] = 'It is recommended that the use of slash arguments is enabled. In future it will be required. For more details, see the documentation Using slash arguments.'; diff --git a/lang/en/auth.php b/lang/en/auth.php index 37af32928dc..bebd6acc34c 100644 --- a/lang/en/auth.php +++ b/lang/en/auth.php @@ -86,7 +86,7 @@ $string['errormaxconsecutiveidentchars'] = 'Passwords must have at most {$a} con $string['errorminpassworddigits'] = 'Passwords must have at least {$a} digit(s).'; $string['errorminpasswordlength'] = 'Passwords must be at least {$a} characters long.'; $string['errorminpasswordlower'] = 'Passwords must have at least {$a} lower case letter(s).'; -$string['errorminpasswordnonalphanum'] = 'Passwords must have at least {$a} non-alphanumeric character(s) such as as *, -, or #.'; +$string['errorminpasswordnonalphanum'] = 'The password must have at least {$a} special character(s) such as as *, -, or #.'; $string['errorpasswordreused'] = 'This password has been used before, and is not permitted to be reused'; $string['errorminpasswordupper'] = 'Passwords must have at least {$a} upper case letter(s).'; $string['errorpasswordupdate'] = 'Error updating password, password not changed'; @@ -109,7 +109,7 @@ $string['infilefield'] = 'Field required in file'; $string['informminpassworddigits'] = 'at least {$a} digit(s)'; $string['informminpasswordlength'] = 'at least {$a} characters'; $string['informminpasswordlower'] = 'at least {$a} lower case letter(s)'; -$string['informminpasswordnonalphanum'] = 'at least {$a} non-alphanumeric character(s) such as as *, -, or #'; +$string['informminpasswordnonalphanum'] = 'at least {$a} special character(s) such as as *, -, or #'; $string['informminpasswordreuselimit'] = 'Passwords can be reused after {$a} changes'; $string['informminpasswordupper'] = 'at least {$a} upper case letter(s)'; $string['informpasswordpolicy'] = 'The password must have {$a}'; diff --git a/lang/en/backup.php b/lang/en/backup.php index 78bf434360b..190fafec630 100644 --- a/lang/en/backup.php +++ b/lang/en/backup.php @@ -202,7 +202,7 @@ $string['errorfilenamemustbezip'] = 'The filename you enter must be a ZIP file a $string['errorminbackup20version'] = 'This backup file has been created with one development version of Moodle backup ({$a->backup}). Minimum required is {$a->min}. Cannot be restored.'; $string['errorinvalidformat'] = 'Unknown backup format'; $string['errorinvalidformatinfo'] = 'The selected file is not a valid Moodle backup file and can\'t be restored.'; -$string['errorrestorefrontpagebackup'] = 'You can only restore front page backups on the front page'; +$string['errorrestorefrontpagebackup'] = 'You can only restore site home backups on the site home'; $string['executionsuccess'] = 'The backup file was successfully created.'; $string['extractingbackupfileto'] = 'Extracting backup file to: {$a}'; $string['failed'] = 'Backup failed'; @@ -372,7 +372,7 @@ $string['rootsettinggroups'] = 'Include groups and groupings'; $string['rootsettingimscc1'] = 'Convert to IMS Common Cartridge 1.0'; $string['rootsettingimscc11'] = 'Convert to IMS Common Cartridge 1.1'; $string['samesitenotification'] = 'This backup was created with only references to files, not the files themselves. Restoring will only work on this site.'; -$string['sitecourseformatwarning'] = 'This is a front page backup, note that they can only be restored on the front page'; +$string['sitecourseformatwarning'] = 'This is a site home backup. It can only be restored on the site home.'; $string['storagecourseonly'] = 'Course backup filearea'; $string['storagecourseandexternal'] = 'Course backup filearea and the specified directory'; $string['storageexternalonly'] = 'Specified directory for automated backups'; diff --git a/lang/en/block.php b/lang/en/block.php index fc4f0e34926..dace3e9ced4 100644 --- a/lang/en/block.php +++ b/lang/en/block.php @@ -33,7 +33,7 @@ $string['configureblock'] = 'Configure {$a} block'; $string['contexts'] = 'Page contexts'; $string['contexts_help'] = 'Contexts are more specific types of pages where this block can be displayed within the original block location. You will have different options here depending on the original block location and your current location. For example, you can restrict a block to only appearing on forum pages in a course by adding the block to the course (making it appear on all sub-pages), then going into a forum and editing the block settings again to restrict display to just forum pages.'; $string['createdat'] = 'Original block location'; -$string['createdat_help'] = 'The original location where the block was created. Block settings may cause it to appear in other locations (contexts) within the original location. For example, a block created on a course page could be displayed in activities within that course. A block created on the front page can be displayed throughout the site.'; +$string['createdat_help'] = 'The original location where the block was created. Block settings may cause it to appear in other locations (contexts) within the original location. For example, a block created on a course page could be displayed in activities within that course. A block created on the site home can be displayed throughout the site.'; $string['defaultregion'] = 'Default region'; $string['defaultregion_help'] = 'Themes may define one or more named block regions where blocks are displayed. This setting defines which of these you want this block to appear in by default. The region may be overridden on specific pages if required.'; $string['defaultweight'] = 'Default weight'; @@ -64,8 +64,8 @@ $string['showblock'] = 'Show {$a} block'; $string['showoncontextandsubs'] = 'Display on \'{$a}\' and any pages within it'; $string['showoncontextonly'] = 'Display on \'{$a}\' only'; $string['showonentiresite'] = 'Display throughout the entire site'; -$string['showonfrontpageandsubs'] = 'Display on the front page and any pages added to the front page'; -$string['showonfrontpageonly'] = 'Display on the front page only'; +$string['showonfrontpageandsubs'] = 'Display on the site home and any pages added to the site home.'; +$string['showonfrontpageonly'] = 'Display on the site home only'; $string['site-*'] = 'Any top-level site page'; $string['subpages'] = 'Select pages'; $string['restrictpagetypes'] = 'Display on page types'; diff --git a/lang/en/course.php b/lang/en/course.php index bc6624b2d21..9af2dd07fa4 100644 --- a/lang/en/course.php +++ b/lang/en/course.php @@ -66,7 +66,7 @@ $string['coursecontentnotifnew'] = '{$a->coursename} new content'; $string['coursecontentnotifnewbody'] = '

{$a->moduletypename} {$a->modulename} is new in the course {$a->coursename}.

Change your notification preferences

'; $string['coursecontentnotifupdate'] = '{$a->coursename} content change'; $string['coursecontentnotifupdatebody'] = '

{$a->moduletypename} {$a->modulename} has been changed in the course {$a->coursename}.

Change your notification preferences

'; -$string['coursecontentnotification_help'] = 'You can send a notification to the course users about any new or updated resource or activity. Please notice that the notification will be sent only if the new resource or activity is visible.'; +$string['coursecontentnotification_help'] = 'Tick the box to notify course participants about this new or changed activity or resource. Only users who can access the activity or resource will receive the notification.'; $string['coursenotyetstarted'] = 'The course has not yet started'; $string['coursenotyetfinished'] = 'The course has not yet finished'; $string['coursetoolong'] = 'The course is too long'; @@ -81,8 +81,10 @@ $string['customfieldsettings'] = 'Common course custom fields settings'; $string['downloadcourseconfirmation'] = 'You are about to download a zip file of course content (excluding items which cannot be downloaded and any files larger than {$a}).'; $string['downloadcoursecontent'] = 'Download course content'; $string['downloadcoursecontent_help'] = 'This setting determines whether course content may be downloaded by users with the download course content capability (by default users with the role of student or teacher).'; -$string['downloadcontent'] = 'Include in course downloads (if that feature is enabled)'; -$string['downloadcontent_help'] = 'This setting determines whether this activity can be downloaded when download course content is enabled for this course'; +$string['downloadcontent'] = 'Include in course content download'; +$string['downloadcontent_help'] = 'Should this activity or resource be included in the zip file of course content available for download? File, Folder, Page and Label can be fully downloaded. For all other activities and resources, only the name and description are downloaded. This option requires download course content to be enabled in the course settings. + +The setting has no effect on mobile app content download for offline usage.'; $string['enabledownloadcoursecontent'] = 'Enable download course content'; $string['errorendbeforestart'] = 'The end date ({$a}) is before the course start date.'; $string['favourite'] = 'Starred course'; diff --git a/lang/en/moodle.php b/lang/en/moodle.php index a5a63194e12..4ca3c691cc4 100644 --- a/lang/en/moodle.php +++ b/lang/en/moodle.php @@ -103,7 +103,7 @@ $string['adminhelpmanageroles'] = 'Create and define roles that may be applied t $string['adminhelpmymoodle'] = 'Configure the My Moodle blocks for users'; $string['adminhelpreports'] = 'Site level reports'; $string['adminhelpsitefiles'] = 'For publishing general files or uploading external backups'; -$string['adminhelpsitesettings'] = 'Define how the front page of the site looks'; +$string['adminhelpsitesettings'] = 'Define how the site home looks'; $string['adminhelpstickyblocks'] = 'Configure Moodle-wide sticky blocks'; $string['adminhelpthemes'] = 'Choose how the site looks (colours, fonts etc)'; $string['adminhelpuploadusers'] = 'Import new user accounts from a text file'; @@ -915,12 +915,12 @@ $string['frontpagecategorynames'] = 'List of categories'; $string['frontpagecourselist'] = 'List of courses'; $string['frontpagecoursesearch'] = 'Course search box'; $string['frontpageenrolledcourselist'] = 'Enrolled courses'; -$string['frontpagedescription'] = 'Front page summary'; -$string['frontpagedescriptionhelp'] = 'This summary can be displayed on the front page using the course/site summary block.'; -$string['frontpageformat'] = 'Front page format'; -$string['frontpageformatloggedin'] = 'Front page format when logged in'; +$string['frontpagedescription'] = 'Site home summary'; +$string['frontpagedescriptionhelp'] = 'This summary can be displayed on the site home using the course/site summary block.'; +$string['frontpageformat'] = 'Site home format'; +$string['frontpageformatloggedin'] = 'Site home format when logged in'; $string['frontpagenews'] = 'Announcements'; -$string['frontpagesettings'] = 'Front page settings'; +$string['frontpagesettings'] = 'Site home settings'; $string['fulllistofcourses'] = 'All courses'; $string['fullname'] = 'Full name'; /* @deprecated - Use fullnamecourse or fullnameuser or some own context specific string. */ $string['fullnamecourse'] = 'Course full name'; @@ -1399,7 +1399,7 @@ $string['newloginnotificationbodyfull'] = '

Hi {$a->userfullname},

  • IP: {$a->loginip}

    • If this was you, then you don\'t need to do anything.

    -

    If you don\'t recognise this activity, please change your password

    '; +

    If you don\'t recognise this activity, please change your password.

    '; $string['newpassword'] = 'New password'; $string['newpassword_help'] = 'Enter a new password or leave blank to keep current password.'; $string['newpasswordfromlost'] = 'NOTICE: Your Current password will have been sent to you in the second of the two emails sent as part of the lost password recovery process. Make sure you have received your replacement password before continuing with this screen.'; @@ -1806,8 +1806,8 @@ $string['restoredaccount'] = 'Restored account'; $string['restoredaccountinfo'] = 'This account was imported from another server and the password has been lost. To set a new password by email, please click "Continue"'; $string['restorefinished'] = 'Restore completed successfully'; $string['restoreto'] = 'Restore to'; -$string['restoretositeadding'] = 'Warning: You are about to restore to the site front page, adding data to it!'; -$string['restoretositedeleting'] = 'Warning: You are about to restore to the site front page, deleting data from it first!'; +$string['restoretositeadding'] = 'Warning: You are about to restore to the site home, adding data to it!'; +$string['restoretositedeleting'] = 'Warning: You are about to restore to the site home, deleting data from it first!'; $string['restoreuserconflict'] = 'Trying to restore user \'{$a}\' from backup file will cause conflict'; $string['restoreuserinfofailed'] = 'The restore process has stopped because you don\'t have permission to restore user data.'; $string['restoreusersprecheck'] = 'Checking user data'; diff --git a/lang/en/pagetype.php b/lang/en/pagetype.php index 675ed8ee955..33045e522a5 100644 --- a/lang/en/pagetype.php +++ b/lang/en/pagetype.php @@ -35,7 +35,7 @@ $string['page-mod-x'] = 'Any activity module page'; $string['page-mod-x-view'] = 'Any main activity module page'; $string['page-my-index'] = 'Dashboard page'; $string['page-report-x'] = 'Any report page'; -$string['page-site-index'] = 'The front page only'; +$string['page-site-index'] = 'The site home only'; $string['page-site-x'] = 'Any top-level site page'; $string['page-user-view'] = 'Only user profile pages'; $string['page-user-profile'] = 'Only user profile pages'; diff --git a/lang/en/reportbuilder.php b/lang/en/reportbuilder.php index 2c3626a23e4..ba02698516c 100644 --- a/lang/en/reportbuilder.php +++ b/lang/en/reportbuilder.php @@ -190,8 +190,8 @@ $string['switchpreview'] = 'Switch to preview mode'; $string['timeadded'] = 'Time added'; $string['timecreated'] = 'Time created'; $string['timemodified'] = 'Time modified'; -$string['uniquerows'] = 'Show unique rows'; -$string['uniquerows_help'] = 'Show only unique rows in the report. Note this setting has no effect if any report columns are being aggregated'; +$string['uniquerows'] = 'Remove any duplicate rows'; +$string['uniquerows_help'] = 'If the report source contains duplicate rows, should these be removed from this report? This setting has no effect if report columns are aggregated.'; $string['userany'] = 'Any user'; $string['usercurrent'] = 'Current user'; $string['userfullnamewithlink'] = 'Full name with link'; diff --git a/lang/en/role.php b/lang/en/role.php index 4f15877a041..7c01ae2921e 100644 --- a/lang/en/role.php +++ b/lang/en/role.php @@ -43,7 +43,7 @@ $string['archetype'] = 'Role archetype'; $string['archetype_help'] = 'The role archetype determines the permissions when a role is reset to default. It also determines any new permissions for the role when the site is upgraded.'; $string['archetypecoursecreator'] = 'ARCHETYPE: Course creator'; $string['archetypeeditingteacher'] = 'ARCHETYPE: Teacher (editing)'; -$string['archetypefrontpage'] = 'ARCHETYPE: Authenticated user on frontpage'; +$string['archetypefrontpage'] = 'ARCHETYPE: Authenticated user on site home'; $string['archetypeguest'] = 'ARCHETYPE: Guest'; $string['archetypemanager'] = 'ARCHETYPE: Manager'; $string['archetypestudent'] = 'ARCHETYPE: Student'; @@ -250,10 +250,10 @@ $string['export'] = 'Export'; $string['extusers'] = 'Existing users'; $string['extusersmatching'] = 'Existing users matching \'{$a}\''; $string['filter:manage'] = 'Manage local filter settings'; -$string['frontpageuser'] = 'Authenticated user on frontpage'; -$string['frontpageuserdescription'] = 'All logged in users in the frontpage course.'; +$string['frontpageuser'] = 'Authenticated user on site home'; +$string['frontpageuserdescription'] = 'All logged-in users in the site home course.'; $string['globalrole'] = 'System role'; -$string['globalroleswarning'] = 'WARNING! Any roles you assign from this page will apply to the assigned users throughout the entire system, including the front page and all the courses.'; +$string['globalroleswarning'] = 'Warning: Any roles you assign from this page will apply to users throughout the entire system, including the site home and all courses.'; $string['gotoassignroles'] = 'Go to Assign roles for this {$a->contextlevel}'; $string['gotoassignsystemroles'] = 'Go to Assign system roles'; $string['grade:edit'] = 'Edit grades'; @@ -407,7 +407,7 @@ $string['role:safeoverride'] = 'Override safe permissions for others'; $string['roleselect'] = 'Select role'; $string['rolesforuser'] = 'Roles for user {$a}'; $string['roleshortname'] = 'Short name'; -$string['roleshortname_help'] = 'Role short name is a low level role identifier in which only ASCII alphanumeric characters are allowed. Do not change short names of standard roles.'; +$string['roleshortname_help'] = 'Role short name is a low level role identifier in which only ASCII alphanumeric characters are allowed.'; $string['role:switchroles'] = 'Switch to other roles'; $string['roletoassign'] = 'Role to assign'; $string['roletooverride'] = 'Role to override'; diff --git a/mod/assign/lang/en/assign.php b/mod/assign/lang/en/assign.php index d8566d0c528..cf3a8c59122 100644 --- a/mod/assign/lang/en/assign.php +++ b/mod/assign/lang/en/assign.php @@ -492,10 +492,10 @@ $string['savingchanges'] = 'Saving changes...'; $string['saveoverrideandstay'] = 'Save and enter another override'; $string['scale'] = 'Scale'; $string['search:activity'] = 'Assignment - activity information'; -$string['sendstudentnotificationsdefault'] = 'Default setting for "Notify students"'; -$string['sendstudentnotificationsdefault_help'] = 'Set the default value for the "Notify students" checkbox on the grading form.'; -$string['sendstudentnotifications'] = 'Notify students'; -$string['sendstudentnotifications_help'] = 'If enabled, students receive a message about the updated grade or feedback. If marking workflow is enabled in this assignment, notifications will not be sent until the grade is "Released".'; +$string['sendstudentnotificationsdefault'] = 'Default for \'Notify student\''; +$string['sendstudentnotificationsdefault_help'] = 'When grading each student, should \'Notify student\' be ticked by default?'; +$string['sendstudentnotifications'] = 'Notify student'; +$string['sendstudentnotifications_help'] = 'Tick this box to send a notification about the updated grade or feedback. If the assignment uses a marking workflow, or the grades are hidden in the grader report, then the notification will not be sent until the grade is released.'; $string['sendnotifications'] = 'Notify graders about submissions'; $string['sendnotifications_help'] = 'If enabled, graders (usually teachers) receive a message whenever a student submits an assignment, early, on time and late. Message methods are configurable.'; $string['selectlink'] = 'Select...'; @@ -514,8 +514,8 @@ $string['showrecentsubmissions'] = 'Show recent submissions'; $string['status'] = 'Status'; $string['studentnotificationworkflowstateerror'] = 'Marking workflow state must be \'Released\' to notify students.'; $string['submissionattachments'] = 'Only show files during submission.'; -$string['submissionattachments_help'] = 'When enabled files will only be shown on submission screen. -When disabled files will be shown on both assignment view and submission screens.'; +$string['submissionattachments_help'] = 'When enabled, files will only be shown on the submission screen. +When disabled, files will be shown on both assignment view and submission screens.'; $string['confirmstart'] = 'Your submission will have a time limit of {$a}. When you start, the timer will begin to count down and cannot be paused. You must finish your submission before it expires. Are you sure you wish to start now? '; $string['submissioncopiedtext'] = 'You have made a copy of your previous assignment submission for \'{$a->assignment}\' diff --git a/mod/assign/tests/behat/assign_activity_completion.feature b/mod/assign/tests/behat/assign_activity_completion.feature index 099ad809bba..92bccc5ff8e 100644 --- a/mod/assign/tests/behat/assign_activity_completion.feature +++ b/mod/assign/tests/behat/assign_activity_completion.feature @@ -115,7 +115,7 @@ Feature: View activity completion in the assignment activity And I follow "View all submissions" And I click on "Grade" "link" in the "Vinnie Student1" "table_row" And I set the field "Grade out of 100" to "33" - And I set the field "Notify students" to "0" + And I set the field "Notify student" to "0" And I press "Save changes" And I follow "View all submissions" And I log out diff --git a/mod/assign/tests/behat/bulk_release_anon_submissions.feature b/mod/assign/tests/behat/bulk_release_anon_submissions.feature index 4bda24e7c05..af8c9469385 100644 --- a/mod/assign/tests/behat/bulk_release_anon_submissions.feature +++ b/mod/assign/tests/behat/bulk_release_anon_submissions.feature @@ -57,7 +57,7 @@ Feature: Bulk released grades should not be sent to gradebook while submissions And I set the field "Grade out of 100" to "50" And I set the field "Marking workflow state" to "In review" And I set the field "Feedback comments" to "Great job!" - And I set the field "Notify students" to "0" + And I set the field "Notify student" to "0" And I press "Save changes" And I am on the "Test assignment name" "assign activity" page And I follow "View all submissions" @@ -66,7 +66,7 @@ Feature: Bulk released grades should not be sent to gradebook while submissions And I set the field "Grade out of 100" to "50" And I set the field "Marking workflow state" to "In review" And I set the field "Feedback comments" to "Great job!" - And I set the field "Notify students" to "0" + And I set the field "Notify student" to "0" And I press "Save changes" And I am on the "Test assignment name" "assign activity" page And I follow "View all submissions" @@ -81,7 +81,7 @@ Feature: Bulk released grades should not be sent to gradebook while submissions Then I should not see "Student 1 (student1@example.com)" And I should not see "Student 2 (student2@example.com)" And I set the field "Marking workflow state" to "Released" - And I set the field "Notify students" to "No" + And I set the field "Notify student" to "No" And I press "Save changes" And I am on the "Test assignment name" "assign activity" page And I follow "View all submissions" @@ -129,7 +129,7 @@ Feature: Bulk released grades should not be sent to gradebook while submissions Then I should see "Student 1 (student1@example.com)" And I should see "Student 2 (student2@example.com)" And I set the field "Marking workflow state" to "Released" - And I set the field "Notify students" to "No" + And I set the field "Notify student" to "No" And I press "Save changes" And I am on the "Test assignment name" "assign activity" page And I follow "View all submissions" diff --git a/mod/assign/tests/behat/display_grade.feature b/mod/assign/tests/behat/display_grade.feature index a57602be3b6..022a75b3c1c 100644 --- a/mod/assign/tests/behat/display_grade.feature +++ b/mod/assign/tests/behat/display_grade.feature @@ -31,7 +31,7 @@ Feature: Check that the assignment grade can be updated correctly Then I follow "View all submissions" And I click on "Grade" "link" in the "Student 1" "table_row" And I set the field "Grade out of 100" to "50" - And I set the field "Notify students" to "0" + And I set the field "Notify student" to "0" And I press "Save changes" And I follow "View all submissions" And "Student 1" row "Grade" column of "generaltable" table should contain "50.00" @@ -65,7 +65,7 @@ Feature: Check that the assignment grade can be updated correctly When I follow "View all submissions" And I click on "Grade" "link" in the "Student 1" "table_row" And I set the field "Grade out of 100" to "50" - And I set the field "Notify students" to "0" + And I set the field "Notify student" to "0" And I press "Save changes" And I follow "View all submissions" Then "Student 1" row "Grade" column of "generaltable" table should contain "50.00" diff --git a/mod/assign/tests/behat/filter_by_marker.feature b/mod/assign/tests/behat/filter_by_marker.feature index 23a11598c4a..c3780ab2f81 100644 --- a/mod/assign/tests/behat/filter_by_marker.feature +++ b/mod/assign/tests/behat/filter_by_marker.feature @@ -35,7 +35,7 @@ Feature: In an assignment, teachers can filter displayed submissions by assigned And I follow "View all submissions" And I click on "Grade" "link" in the "Student 1" "table_row" And I set the field "allocatedmarker" to "Marker 1" - And I set the field "Notify students" to "0" + And I set the field "Notify student" to "0" And I press "Save changes" And I click on "Edit settings" "link" diff --git a/mod/assign/tests/behat/grading_app_filters.feature b/mod/assign/tests/behat/grading_app_filters.feature index 5f77eb2b16a..c483438d9b2 100644 --- a/mod/assign/tests/behat/grading_app_filters.feature +++ b/mod/assign/tests/behat/grading_app_filters.feature @@ -42,7 +42,7 @@ Feature: In an assignment, teachers can change filters in the grading app And I should not see "Test assignment name &" And I set the field "allocatedmarker" to "Marker 1" And I set the field "workflowstate" to "In marking" - And I set the field "Notify students" to "0" + And I set the field "Notify student" to "0" And I press "Save changes" And I am on the "Test assignment name &" Activity page @@ -62,7 +62,7 @@ Feature: In an assignment, teachers can change filters in the grading app And I click on "Grade" "link" in the "Student 1" "table_row" And I set the field "allocatedmarker" to "Marker 1" And I set the field "workflowstate" to "In marking" - And I set the field "Notify students" to "0" + And I set the field "Notify student" to "0" And I press "Save changes" And I am on the "Test assignment name &" Activity page diff --git a/mod/assign/tests/behat/grading_status.feature b/mod/assign/tests/behat/grading_status.feature index 1a3e006748f..4b0c438f38a 100644 --- a/mod/assign/tests/behat/grading_status.feature +++ b/mod/assign/tests/behat/grading_status.feature @@ -46,7 +46,7 @@ Feature: View the grading status of an assignment And I set the field "Grade out of 100" to "50" And I set the field "Marking workflow state" to "In review" And I set the field "Feedback comments" to "Great job! Lol, not really." - And I set the field "Notify students" to "0" + And I set the field "Notify student" to "0" And I press "Save changes" And I am on the "Test assignment name" "assign activity" page And I follow "View all submissions" @@ -80,7 +80,7 @@ Feature: View the grading status of an assignment And I click on "Grade" "link" in the "Student 1" "table_row" And I should see "1 of 1" And I set the field "Marking workflow state" to "In marking" - And I set the field "Notify students" to "0" + And I set the field "Notify student" to "0" And I press "Save changes" And I am on the "Test assignment name" "assign activity" page And I follow "View all submissions" diff --git a/mod/assign/tests/behat/steps_blind_marking.feature b/mod/assign/tests/behat/steps_blind_marking.feature index 689a3ef8c8d..e46a4c0ca52 100644 --- a/mod/assign/tests/behat/steps_blind_marking.feature +++ b/mod/assign/tests/behat/steps_blind_marking.feature @@ -40,7 +40,7 @@ Feature: Assignments correctly add feedback to the grade report when workflow an And I set the field "Grade out of 100" to "50" And I set the field "Marking workflow state" to "In review" And I set the field "Feedback comments" to "Great job! Lol, not really." - And I set the field "Notify students" to "0" + And I set the field "Notify student" to "0" And I press "Save changes" And I follow "View all submissions" And I should see "In review" in the "I'm the student's first submission" "table_row" @@ -49,7 +49,7 @@ Feature: Assignments correctly add feedback to the grade report when workflow an Scenario: Student identities are revealed after releasing the grades. When I click on "Grade" "link" in the "I'm the student's first submission" "table_row" And I set the field "Marking workflow state" to "Ready for release" - And I set the field "Notify students" to "0" + And I set the field "Notify student" to "0" And I press "Save changes" And I follow "View all submissions" And I should see "Ready for release" in the "I'm the student's first submission" "table_row" @@ -71,7 +71,7 @@ Feature: Assignments correctly add feedback to the grade report when workflow an Scenario: Student identities are revealed before releasing the grades. When I click on "Grade" "link" in the "I'm the student's first submission" "table_row" And I set the field "Marking workflow state" to "Ready for release" - And I set the field "Notify students" to "0" + And I set the field "Notify student" to "0" And I press "Save changes" And I follow "View all submissions" And I should see "Ready for release" in the "I'm the student's first submission" "table_row" diff --git a/mod/feedback/lang/en/feedback.php b/mod/feedback/lang/en/feedback.php index a1cefe5f17d..3becb386500 100644 --- a/mod/feedback/lang/en/feedback.php +++ b/mod/feedback/lang/en/feedback.php @@ -51,7 +51,7 @@ $string['completed'] = 'Completed'; $string['completedon'] = 'Completed on {$a}'; $string['completiondetail:submit'] = 'Submit feedback'; $string['completionsubmit'] = 'View as completed if the feedback is submitted'; -$string['configallowfullanonymous'] = 'If set to \'yes\', users can complete a feedback activity on the front page without being required to log in.'; +$string['configallowfullanonymous'] = 'If set to \'yes\', users can complete a feedback activity on the site home without being required to log in.'; $string['confirmdeleteentry'] = 'Are you sure you want to delete this entry?'; $string['confirmdeleteitem'] = 'Are you sure you want to delete this element?'; $string['confirmdeletetemplate'] = 'Are you sure you want to delete this template?'; @@ -175,9 +175,9 @@ $string['messageprovider:message'] = 'Feedback reminder'; $string['messageprovider:submission'] = 'Feedback notifications'; $string['mode'] = 'Mode'; $string['modulename'] = 'Feedback'; -$string['modulename_help'] = 'The feedback activity module enables a teacher to create a custom survey for collecting feedback from participants using a variety of question types including multiple choice, yes/no or text input. +$string['modulename_help'] = 'The feedback activity enables a teacher to create a custom survey for collecting feedback from participants using a variety of question types including multiple choice, yes/no or text input. -Feedback responses may be anonymous if desired, and results may be shown to all participants or restricted to teachers only. Any feedback activities on the site front page may also be completed by non-logged-in users. +Feedback responses may be anonymous if desired, and results may be shown to all participants or restricted to teachers only. Any feedback activities on the site home may also be completed by non-logged-in users. Feedback activities may be used diff --git a/mod/feedback/tests/behat/anonymous.feature b/mod/feedback/tests/behat/anonymous.feature index a2ae14902b3..b0cbf891d8c 100644 --- a/mod/feedback/tests/behat/anonymous.feature +++ b/mod/feedback/tests/behat/anonymous.feature @@ -63,7 +63,7 @@ Feature: Anonymous feedback @javascript Scenario: Complete anonymous feedback and view analysis on the front page as an authenticated user And I log in as "admin" - And I set the following system permissions of "Authenticated user on frontpage" role: + And I set the following system permissions of "Authenticated user on site home" role: | capability | permission | | mod/feedback:viewanalysepage | Allow | And I log out diff --git a/mod/feedback/tests/behat/non_anonymous.feature b/mod/feedback/tests/behat/non_anonymous.feature index a8c30b97628..80b1e4401e5 100644 --- a/mod/feedback/tests/behat/non_anonymous.feature +++ b/mod/feedback/tests/behat/non_anonymous.feature @@ -59,7 +59,7 @@ Feature: Non anonymous feedback @javascript Scenario: Complete non anonymous feedback and view analysis on the front page as an authenticated user And I log in as "admin" - And I set the following system permissions of "Authenticated user on frontpage" role: + And I set the following system permissions of "Authenticated user on site home" role: | capability | permission | | mod/feedback:viewanalysepage | Allow | And I log out diff --git a/mod/forum/lang/en/forum.php b/mod/forum/lang/en/forum.php index 55e6f5d124c..545b9d75db6 100644 --- a/mod/forum/lang/en/forum.php +++ b/mod/forum/lang/en/forum.php @@ -125,7 +125,7 @@ $string['configdigestmailtime'] = 'People who choose to have emails sent to them $string['configdisplaymode'] = 'The default display mode for discussions if one isn\'t set.'; $string['configenablerssfeeds'] = 'This switch will enable the possibility of RSS feeds for all forums. You will still need to turn feeds on manually in the settings for each forum.'; $string['configenabletimedposts'] = 'Set to \'yes\' if you want to allow setting of display periods when posting a new forum discussion.'; -$string['configlongpost'] = 'Any post over this length (in characters not including HTML) is considered long. Posts displayed on the site front page, social format course pages, or user profiles are shortened to a natural break somewhere between the forum_shortpost and forum_longpost values.'; +$string['configlongpost'] = 'Any post over this length (in characters not including HTML) is considered long. Posts displayed on the site home, social format course pages, or user profiles are shortened to a natural break somewhere between the forum_shortpost and forum_longpost values.'; $string['configmanydiscussions'] = 'Maximum number of discussions shown in a forum per page'; $string['configmaxattachments'] = 'Default maximum number of attachments allowed per post.'; $string['configmaxbytes'] = 'Default maximum size for all forum attachments on the site (subject to course limits and other local settings)'; diff --git a/question/bank/statistics/lang/en/qbank_statistics.php b/question/bank/statistics/lang/en/qbank_statistics.php index ef0f69e20bb..86ba58dfe17 100644 --- a/question/bank/statistics/lang/en/qbank_statistics.php +++ b/question/bank/statistics/lang/en/qbank_statistics.php @@ -26,7 +26,7 @@ defined('MOODLE_INTERNAL') || die(); $string['pluginname'] = 'Question statistics'; -$string['privacy:metadata'] = 'Question statistics plugin does not store any user data.'; +$string['privacy:metadata'] = 'The Question statistics question bank plugin does not store any user data.'; // Columns. $string['facility_index'] = 'Facility index'; @@ -34,7 +34,7 @@ $string['discriminative_efficiency'] = 'Discriminative efficiency'; $string['discrimination_index'] = 'Need for revision'; // Text format. -$string['verylikely'] = 'very likely'; -$string['likely'] = 'likely'; -$string['unlikely'] = 'unlikely'; +$string['verylikely'] = 'Very likely'; +$string['likely'] = 'Likely'; +$string['unlikely'] = 'Unlikely'; $string['na'] = 'N/A'; diff --git a/question/bank/statistics/tests/behat/statistics_values.feature b/question/bank/statistics/tests/behat/statistics_values.feature index ca2fb1f83a0..35ee73a47a2 100644 --- a/question/bank/statistics/tests/behat/statistics_values.feature +++ b/question/bank/statistics/tests/behat/statistics_values.feature @@ -111,12 +111,12 @@ Feature: Show statistics in question bank And I select "Questions" from the "questionbankactionselect" singleselect When I navigate to "Question bank" in current page administration And I select "Questions" from the "questionbankactionselect" singleselect - And I should see "likely" in the "TF1" "table_row" - And I should see "unlikely" in the "TF2" "table_row" - And I should see "unlikely" in the "TF3" "table_row" - And I should see "likely" in the "TF4" "table_row" - And I should see "likely" in the ".alert-warning" "css_element" - And I should see "unlikely" in the ".alert-success" "css_element" + And I should see "Likely" in the "TF1" "table_row" + And I should see "Unlikely" in the "TF2" "table_row" + And I should see "Unlikely" in the "TF3" "table_row" + And I should see "Likely" in the "TF4" "table_row" + And I should see "Likely" in the ".alert-warning" "css_element" + And I should see "Unlikely" in the ".alert-success" "css_element" Scenario: View discrimination index in question bank, bad questions Given user "student1" has attempted "Quiz 2" with responses: @@ -134,9 +134,9 @@ Feature: Show statistics in question bank When I am on the "Course 1" course page logged in as admin When I navigate to "Question bank" in current page administration And I select "Questions" from the "questionbankactionselect" singleselect - And I should see "likely" in the "TF1" "table_row" - And I should see "very likely" in the "TF2" "table_row" - And I should see "very likely" in the "TF3" "table_row" - And I should see "likely" in the "TF4" "table_row" - And I should see "very likely" in the ".alert-danger" "css_element" - And I should see "likely" in the ".alert-warning" "css_element" + And I should see "Likely" in the "TF1" "table_row" + And I should see "Very likely" in the "TF2" "table_row" + And I should see "Very likely" in the "TF3" "table_row" + And I should see "Likely" in the "TF4" "table_row" + And I should see "Very likely" in the ".alert-danger" "css_element" + And I should see "Likely" in the ".alert-warning" "css_element" diff --git a/question/bank/usage/lang/en/qbank_usage.php b/question/bank/usage/lang/en/qbank_usage.php index 9c914419966..e44c6d07b9e 100644 --- a/question/bank/usage/lang/en/qbank_usage.php +++ b/question/bank/usage/lang/en/qbank_usage.php @@ -24,7 +24,7 @@ */ $string['pluginname'] = 'Question usage'; -$string['privacy:metadata'] = 'Question usage plugin does not store any user data.'; +$string['privacy:metadata'] = 'The Question usage question bank plugin does not store any user data.'; $string['questionusage'] = 'Usage'; $string['usageheader'] = 'Question usage'; diff --git a/report/security/lang/en/report_security.php b/report/security/lang/en/report_security.php index e031725784f..330036dcd15 100644 --- a/report/security/lang/en/report_security.php +++ b/report/security/lang/en/report_security.php @@ -55,12 +55,12 @@ $string['check_embed_details'] = '

    Unlimited object embedding is very dangerou $string['check_embed_error'] = 'Unlimited object embedding enabled - this is very dangerous for the majority of servers.'; $string['check_embed_name'] = 'Allow EMBED and OBJECT'; $string['check_embed_ok'] = 'Unlimited object embedding is not allowed.'; -$string['check_frontpagerole_details'] = '

    The default frontpage role is given to all registered users for frontpage activities. Please make sure no risky capabilities are allowed for this role.

    +$string['check_frontpagerole_details'] = '

    The default site home role is given to all authenticated users for site home activities. Please make sure no risky capabilities are allowed for this role.

    It is recommended that a special role is created for this purpose and a legacy type role is not used.

    '; -$string['check_frontpagerole_error'] = 'Incorrectly defined frontpage role "{$a}" detected!'; -$string['check_frontpagerole_name'] = 'Frontpage role'; -$string['check_frontpagerole_notset'] = 'Frontpage role is not set.'; -$string['check_frontpagerole_ok'] = 'Frontpage role definition is OK.'; +$string['check_frontpagerole_error'] = 'Incorrectly defined site home role "{$a}" detected!'; +$string['check_frontpagerole_name'] = 'Site home role'; +$string['check_frontpagerole_notset'] = 'Site home role is not set.'; +$string['check_frontpagerole_ok'] = 'Site home role definition is OK.'; $string['check_crawlers_details'] = '

    The "Open to search engines" setting enables search engines to enter courses with guest access. There is no point in enabling this setting if guest login is not allowed.

    '; $string['check_crawlers_error'] = 'Search engine access is allowed but guest access is disabled.'; $string['check_crawlers_info'] = 'Search engines may enter as guests.';