diff --git a/admin/tool/licensemanager/lang/en/tool_licensemanager.php b/admin/tool/licensemanager/lang/en/tool_licensemanager.php index 97e372a21b8..eaffab4cc95 100644 --- a/admin/tool/licensemanager/lang/en/tool_licensemanager.php +++ b/admin/tool/licensemanager/lang/en/tool_licensemanager.php @@ -21,14 +21,14 @@ * @copyright 2019 Tom Dickman * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -$string['pluginname'] = 'License manager'; +$string['pluginname'] = 'Licence manager'; $string['createlicense'] = 'Create custom licence'; $string['createlicensebuttontext'] = 'Create licence'; $string['deletelicense'] = 'Delete licence'; $string['deletelicenseconfirmmessage'] = 'Are you sure you want to delete this licence?'; -$string['deletelicensename'] = 'Delete license \'{$a}\''; +$string['deletelicensename'] = 'Delete licence \'{$a}\''; $string['disablelicensename'] = 'Disable licence \'{$a}\''; -$string['duplicatelicenseshortname'] = 'Licence shortname must be unique, duplicate value found.'; +$string['duplicatelicenseshortname'] = 'The licence short name must be unique.'; $string['editlicense'] = 'Edit licence'; $string['editlicensename'] = 'Edit licence \'{$a}\''; $string['enablelicensename'] = 'Enable licence \'{$a}\''; @@ -37,11 +37,11 @@ $string['fullnamerequirederror'] = 'You must enter a full name for the licence.' $string['invalidurl'] = 'Invalid source URL'; $string['license'] = 'Licence'; $string['licensemanager'] = 'Licence manager'; -$string['movelicensedownname'] = 'Move \'{$a}\' license down order'; -$string['movelicenseupname'] = 'Move \'{$a}\' license up order'; +$string['movelicensedownname'] = 'Move \'{$a}\' licence down'; +$string['movelicenseupname'] = 'Move \'{$a}\' licence up'; $string['privacy:metadata'] = 'The tool_licensemanager plugin stores no personal data.'; $string['shortname'] = 'Licence short name'; -$string['sitedefaultlicenselock'] = 'This is the site default license. It cannot be disabled.'; +$string['sitedefaultlicenselock'] = 'This is the site default licence. It cannot be disabled.'; $string['shortnamerequirederror'] = 'You must enter a short name for the licence.'; $string['source'] = 'Licence source'; $string['source_help'] = 'The URL (with http:// or https:// prefix) where the licence terms and conditions can be found.'; diff --git a/admin/tool/licensemanager/tests/behat/license_manager.feature b/admin/tool/licensemanager/tests/behat/license_manager.feature index 2977d12c991..0ff21b929d1 100644 --- a/admin/tool/licensemanager/tests/behat/license_manager.feature +++ b/admin/tool/licensemanager/tests/behat/license_manager.feature @@ -1,8 +1,8 @@ @tool @tool_licensemanager -Feature: License manager - In order to manage licenses +Feature: Licence manager + In order to manage licences As an admin - I need to be able to view and alter licence preferences in the license manager. + I need to be able to view and alter licence preferences in the licence manager. Scenario: I should be able to see the default Moodle licences. Given I log in as "admin" @@ -17,19 +17,19 @@ Feature: License manager And I should see "Creative Commons - No Commercial ShareAlike" in the "cc-nc-sa" "table_row" And I should see "Creative Commons - ShareAlike" in the "cc-sa" "table_row" - Scenario: I should be able to enable and disable licenses + Scenario: I should be able to enable and disable licences Given I log in as "admin" And I navigate to "Licence > Licence settings" in site administration When I set the field "Default site licence" to "Public domain" And I press "Save changes" And I navigate to "Licence > Licence manager" in site administration - Then "This is the site default license" "icon" should exist in the "public" "table_row" - And "Enable license" "icon" should not exist in the "public" "table_row" - And "This is the site default license" "icon" should not exist in the "cc" "table_row" + Then "This is the site default licence" "icon" should exist in the "public" "table_row" + And "Enable licence" "icon" should not exist in the "public" "table_row" + And "This is the site default licence" "icon" should not exist in the "cc" "table_row" And I navigate to "Licence > Licence settings" in site administration And I set the field "Default site licence" to "Creative Commons" And I press "Save changes" And I navigate to "Licence > Licence manager" in site administration - And "This is the site default license" "icon" should exist in the "cc" "table_row" - And "Enable license" "icon" should not exist in the "cc" "table_row" - And "This is the site default license" "icon" should not exist in the "public" "table_row" + And "This is the site default licence" "icon" should exist in the "cc" "table_row" + And "Enable licence" "icon" should not exist in the "cc" "table_row" + And "This is the site default licence" "icon" should not exist in the "public" "table_row" diff --git a/contentbank/contenttype/h5p/lang/en/contenttype_h5p.php b/contentbank/contenttype/h5p/lang/en/contenttype_h5p.php index 7e2e49e78ff..1b908b382af 100644 --- a/contentbank/contenttype/h5p/lang/en/contenttype_h5p.php +++ b/contentbank/contenttype/h5p/lang/en/contenttype_h5p.php @@ -22,7 +22,7 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -$string['description'] = 'H5P Interactive Content'; +$string['description'] = 'H5P interactive content'; $string['pluginname'] = 'H5P'; $string['pluginname_help'] = 'Content bank to upload and share H5P content'; $string['privacy:metadata'] = 'The H5P content bank plugin does not store any personal data.'; diff --git a/files/tests/behat/license_help_modal.feature b/files/tests/behat/license_help_modal.feature index 43a2a5a17af..3aa3de0e2ac 100644 --- a/files/tests/behat/license_help_modal.feature +++ b/files/tests/behat/license_help_modal.feature @@ -1,32 +1,32 @@ @core @core_files -Feature: View license links - In order to get select the applicable license when uploading a file +Feature: View licence links + In order to get select the applicable licence when uploading a file As a user - I need to be able to navigate to a page containing license terms from the file manager + I need to be able to navigate to a page containing licence terms from the file manager @javascript - Scenario: Uploading a file displays license list modal + Scenario: Uploading a file displays licence list modal Given I log in as "admin" And I follow "Manage private files..." And I wait until the page is ready And I follow "Add..." And I follow "Upload a file" - And I click on "Help with Choose license" "icon" in the "File picker" "dialogue" - Then I should see "Follow these links for further information on the available license options:" + And I click on "Help with Choose licence" "icon" in the "File picker" "dialogue" + Then I should see "Follow these links for further information on the available licence options:" @javascript @_file_upload - Scenario: Altering a file should display license list modal + Scenario: Altering a file should display licence list modal Given I log in as "admin" And I follow "Manage private files..." And I upload "lib/tests/fixtures/empty.txt" file to "Files" filemanager And I press "Save changes" And I follow "Manage private files..." And I click on "empty.txt" "link" - And I click on "Help with Choose license" "icon" - Then I should see "Follow these links for further information on the available license options:" + And I click on "Help with Choose licence" "icon" + Then I should see "Follow these links for further information on the available licence options:" @javascript @_file_upload - Scenario: Recent files should display license list modal + Scenario: Recent files should display licence list modal Given I log in as "admin" And I follow "Manage private files..." And I upload "lib/tests/fixtures/empty.txt" file to "Files" filemanager @@ -35,11 +35,11 @@ Feature: View license links And I follow "Add..." And I click on "Recent files" "link" in the "File picker" "dialogue" And I click on "empty.txt" "link" in the "File picker" "dialogue" - And I click on "Help with Choose license" "icon" in the ".fp-setlicense" "css_element" - Then I should see "Follow these links for further information on the available license options:" + And I click on "Help with Choose licence" "icon" in the ".fp-setlicense" "css_element" + Then I should see "Follow these links for further information on the available licence options:" @javascript @_file_upload - Scenario: Private files should display license list modal + Scenario: Private files should display licence list modal Given I log in as "admin" And I follow "Manage private files..." And I upload "lib/tests/fixtures/empty.txt" file to "Files" filemanager @@ -48,5 +48,5 @@ Feature: View license links And I follow "Add..." And I click on "Private files" "link" in the "File picker" "dialogue" And I click on "empty.txt" "link" in the "File picker" "dialogue" - And I click on "Help with Choose license" "icon" in the ".fp-setlicense" "css_element" - Then I should see "Follow these links for further information on the available license options:" + And I click on "Help with Choose licence" "icon" in the ".fp-setlicense" "css_element" + Then I should see "Follow these links for further information on the available licence options:" diff --git a/lang/en/analytics.php b/lang/en/analytics.php index c32225abae5..17f165464df 100644 --- a/lang/en/analytics.php +++ b/lang/en/analytics.php @@ -32,7 +32,7 @@ $string['analyticslogstore_help'] = 'The log store that will be used by the anal $string['analyticssettings'] = 'Analytics settings'; $string['analyticssiteinfo'] = 'Site information'; $string['defaulttimesplittingmethods'] = 'Default analysis intervals for model\'s evaluation'; -$string['defaulttimesplittingmethods_help'] = 'The analysis interval defines when the system will calculate predictions and the portion of activity logs that will be considered for those predictions.The model evaluation process will iterate through these analysis intervals unless a specific analysis interval is specified.'; +$string['defaulttimesplittingmethods_help'] = 'The analysis interval defines when the system will calculate predictions and the portion of activity logs that will be considered for those predictions. The model evaluation process will iterate through these analysis intervals unless a specific analysis interval is specified.'; $string['defaultpredictionsprocessor'] = 'Default predictions processor'; $string['defaultpredictoroption'] = 'Default processor ({$a})'; $string['disabledmodel'] = 'Disabled model'; diff --git a/lang/en/backup.php b/lang/en/backup.php index 261eb57aa94..4ff7fceeabb 100644 --- a/lang/en/backup.php +++ b/lang/en/backup.php @@ -271,8 +271,8 @@ $string['lockedbyconfig'] = 'This setting has been locked by the default backup $string['lockedbyhierarchy'] = 'Locked by dependencies'; $string['loglifetime'] = 'Keep logs for'; $string['managefiles'] = 'Manage backup files'; -$string['keptroles'] = 'Keep enrolments of role'; -$string['keptroles_help'] = 'Select which roles and the users with those roles in the source course that you want to keep enrolments for in the new course. Any users with those roles will be copied into the new course.'; +$string['keptroles'] = 'Include role enrolments'; +$string['keptroles_help'] = 'Users with the selected roles will be enrolled into the new course. No user data will be copied unless \'Include user data\' is enabled.'; $string['missingfilesinpool'] = 'Some files could not be saved during the backup, and so it will not be possible to restore them.'; $string['moodleversion'] = 'Moodle version'; $string['moreresults'] = 'There are too many results, enter a more specific search.'; @@ -397,8 +397,8 @@ $string['totalcategorysearchresults'] = 'Total categories: {$a}'; $string['totalcoursesearchresults'] = 'Total courses: {$a}'; $string['undefinedrolemapping'] = 'Role mapping undefined for \'{$a}\' archetype.'; $string['unnamedsection'] = 'Unnamed section'; -$string['userdata'] = 'Keep user data'; -$string['userdata_help'] = 'When enabled user generated data in the source course will be copied into the new course. This includes forum posts, assignment submissions, etc.'; +$string['userdata'] = 'Include user data'; +$string['userdata_help'] = 'If enabled, data such as forum posts, assignment submissions etc. will be copied into the new course for any users with a role selected in \'Include role enrolments\'.'; $string['userinfo'] = 'Userinfo'; $string['module'] = 'Module'; $string['morecoursesearchresults'] = 'More than {$a} courses found, showing first {$a} results'; diff --git a/lang/en/cache.php b/lang/en/cache.php index 6c2245214f1..8ca427a1d8e 100644 --- a/lang/en/cache.php +++ b/lang/en/cache.php @@ -79,7 +79,7 @@ $string['cachedef_recommendation_favourite_course_content_items'] = 'Recommendat $string['cachedef_repositories'] = 'Repositories instances data'; $string['cachedef_roledefs'] = 'Role definitions'; $string['cachedef_grade_categories'] = 'Grade category queries'; -$string['cachedef_grade_letters'] = 'Grade letters queries'; +$string['cachedef_grade_letters'] = 'Grade letter queries'; $string['cachedef_string'] = 'Language string cache'; $string['cachedef_tags'] = 'Tags collections and areas'; $string['cachedef_temp_tables'] = 'Temporary tables cache'; diff --git a/lang/en/contentbank.php b/lang/en/contentbank.php index d34dcfe18a0..6e9176d5805 100644 --- a/lang/en/contentbank.php +++ b/lang/en/contentbank.php @@ -31,8 +31,8 @@ $string['contentnotdeleted'] = 'An error was encountered while trying to delete $string['contentnotrenamed'] = 'An error was encountered while trying to rename the content.'; $string['contentrenamed'] = 'The content has been renamed.'; $string['contentsmoved'] = 'Content bank contents moved to {$a}.'; -$string['contenttypenoaccess'] = 'You can not view this {$a} instance'; -$string['contenttypenoedit'] = 'You can not edit contents of the {$a} content type'; +$string['contenttypenoaccess'] = 'You cannot view this {$a} instance.'; +$string['contenttypenoedit'] = 'You cannot edit contents of the {$a} content type.'; $string['eventcontentcreated'] = 'Content created'; $string['eventcontentdeleted'] = 'Content deleted'; $string['eventcontentupdated'] = 'Content updated'; diff --git a/lang/en/repository.php b/lang/en/repository.php index 3500ab8e396..84526147fba 100644 --- a/lang/en/repository.php +++ b/lang/en/repository.php @@ -134,8 +134,8 @@ $string['getfile'] = 'Select this file'; $string['getfiletimeout'] = 'Get file timeout'; $string['help'] = 'Help'; $string['choosealink'] = 'Choose a link...'; -$string['chooselicense'] = 'Choose license'; -$string['chooselicense_help'] = 'Follow these links for further information on the available license options:'; +$string['chooselicense'] = 'Choose licence'; +$string['chooselicense_help'] = 'Follow these links for further information on the available licence options:'; $string['createfolder'] = 'Create folder'; $string['iconview'] = 'View as icons'; $string['imagesize'] = '{$a->width} x {$a->height} px'; @@ -153,7 +153,7 @@ $string['invalidparams'] = 'Invalid parameters'; $string['isactive'] = 'Active?'; $string['keyword'] = 'Keyword'; $string['lastmodified'] = 'Last modified'; -$string['license'] = 'License'; +$string['license'] = 'Licence'; $string['linkexternal'] = 'Link external'; $string['listview'] = 'View as list'; $string['loading'] = 'Loading...'; diff --git a/mod/quiz/accessrule/seb/lang/en/quizaccess_seb.php b/mod/quiz/accessrule/seb/lang/en/quizaccess_seb.php index 7fc990d1902..4d64533f720 100644 --- a/mod/quiz/accessrule/seb/lang/en/quizaccess_seb.php +++ b/mod/quiz/accessrule/seb/lang/en/quizaccess_seb.php @@ -65,7 +65,7 @@ $string['invalidkeys'] = "The config key or browser exam keys could not be valid $string['invalidtemplate'] = "Invalid SEB config template"; $string['manage_templates'] = 'Safe Exam Browser templates'; $string['managetemplates'] = 'Manage templates'; -$string['missingrequiredsettings'] = 'Config settings not provided all required settings.'; +$string['missingrequiredsettings'] = 'Config settings are missing some required values.'; $string['name'] = 'Name'; $string['newtemplate'] = 'New template'; $string['noconfigfilefound'] = 'No uploaded SEB config file could be found for quiz with cmid: {$a}'; @@ -110,7 +110,7 @@ $string['seb:manage_seb_showtime'] = 'Change SEB quiz setting: Show time'; $string['seb:manage_seb_showwificontrol'] = 'Change SEB quiz setting: Show Wi-Fi control'; $string['seb:manage_seb_showsebdownloadlink'] = 'Change SEB quiz setting: Show download link'; $string['seb:manage_seb_templateid'] = 'Change SEB quiz setting: Select SEB template'; -$string['seb:manage_seb_userconfirmquit'] = 'Change SE quiz setting: Confirm on quit'; +$string['seb:manage_seb_userconfirmquit'] = 'Change SEB quiz setting: Confirm on quit'; $string['seb:managetemplates'] = 'Manage SEB configuration templates'; $string['seb_activateurlfiltering'] = 'Enable URL filtering'; $string['seb_activateurlfiltering_help'] = 'If enabled, URLs will be filtered when loading web pages. The filter set has to be defined below.'; diff --git a/repository/contentbank/lang/en/repository_contentbank.php b/repository/contentbank/lang/en/repository_contentbank.php index 6b469d96e38..fe29059ac13 100644 --- a/repository/contentbank/lang/en/repository_contentbank.php +++ b/repository/contentbank/lang/en/repository_contentbank.php @@ -30,5 +30,5 @@ $string['emptyfilelist'] = 'There are no files to show'; $string['contentbank:view'] = 'View content bank repository'; $string['contentbank:accesscoursecontent'] = 'Access course content bank files'; $string['contentbank:accesscoursecategorycontent'] = 'Access course category content bank files'; -$string['contentbank:accessgeneralcontent'] = 'Access system content bank files and content bank files from course categories which have an accessible course'; +$string['contentbank:accessgeneralcontent'] = 'Access system content bank files'; $string['privacy:metadata'] = 'The Content bank repository plugin does not store or transmit any personal data.';