From 7ff6b2daef613b5c1ee73fa25b394288a82f6d4e Mon Sep 17 00:00:00 2001 From: Helen Foster Date: Wed, 16 Feb 2022 22:32:59 +0000 Subject: [PATCH 1/2] MDL-73812 lang: Import fixed English strings (en_fix) --- .../lang/en/tool_admin_presets.php | 10 +- .../lpimportcsv/lang/en/tool_lpimportcsv.php | 2 +- .../lang/en/tool_uploadcourse.php | 8 +- .../uploaduser/lang/en/tool_uploaduser.php | 4 +- .../tool/usertours/lang/en/tool_usertours.php | 20 +- admin/tool/xmldb/lang/en/tool_xmldb.php | 8 +- cache/stores/file/lang/en/cachestore_file.php | 2 +- lang/en/admin.php | 4 +- lang/en/adminpresets.php | 16 +- lang/en/badges.php | 2 +- lang/en/block.php | 2 +- lang/en/cohort.php | 5 +- lang/en/error.php | 4 +- lang/en/grades.php | 2 +- lang/en/group.php | 4 +- lang/en/moodle.php | 4 +- lang/en/reportbuilder.php | 2 +- .../lang/en/bigbluebuttonbn.php | 405 +++++++++--------- mod/data/lang/en/data.php | 4 +- .../lang/en/qbank_customfields.php | 2 +- .../onedrive/lang/en/repository_onedrive.php | 2 +- theme/boost/lang/en/theme_boost.php | 8 +- 22 files changed, 264 insertions(+), 256 deletions(-) diff --git a/admin/tool/admin_presets/lang/en/tool_admin_presets.php b/admin/tool/admin_presets/lang/en/tool_admin_presets.php index cf05563c682..da5faff64d3 100644 --- a/admin/tool/admin_presets/lang/en/tool_admin_presets.php +++ b/admin/tool/admin_presets/lang/en/tool_admin_presets.php @@ -33,8 +33,8 @@ $string['author'] = 'Author'; $string['basedescription'] = 'Presets allow you to easily switch between different site admin configurations. After selecting a preset, you can turn on more features any time as required.'; $string['created'] = 'Created'; $string['currentvalue'] = 'Current value'; -$string['deletepreset'] = 'Are you sure you want to delete "{$a}" site admin preset?'; -$string['deletepreviouslyapplied'] = 'This preset has been previously applied. Deleting a preset removes it from your site completely. You will not be able to revert your settings to how they were before applying this preset'; +$string['deletepreset'] = 'Are you sure you want to delete the site admin preset {$a}?'; +$string['deletepreviouslyapplied'] = 'This preset has been previously applied. Deleting a preset removes it from your site completely. You will not be able to revert your settings to how they were before applying this preset.'; $string['deletepresettitle'] = 'Delete {$a} preset?'; $string['deleteshow'] = 'Delete site admin preset'; $string['eventpresetdeleted'] = 'Preset deleted'; @@ -55,7 +55,7 @@ $string['importdescription'] = 'Import site admin settings as a preset to apply $string['importexecute'] = 'Import site admin preset'; $string['importshow'] = 'Import site admin preset'; $string['includesensiblesettings'] = 'Include settings with passwords'; -$string['includesensiblesettings_help'] = 'Settings with passwords contain sensitive information specific to your site. Only include these settings if you are creating a preset to reuse on your site. You can find the list of settings with passwords in Site admin preset settings in the Site administration'; +$string['includesensiblesettings_help'] = 'Settings with passwords contain sensitive information specific to your site. Only include these settings if you are creating a preset to reuse on your site.'; $string['loaddescription'] = 'Review the setting changes before applying this preset.'; $string['loadexecute'] = 'Site admin preset applied'; $string['loadpreview'] = 'Preview site admin preset'; @@ -77,8 +77,8 @@ $string['privacy:metadata'] = 'The Site admin presets tool does not store any pe $string['renamepreset'] = 'Name (optional)'; $string['rollback'] = 'Restore this version'; $string['rollbackdescription'] = 'Use the \'Restore this version\' link to revert to the settings just before the preset was applied.'; -$string['rollbackexecute'] = 'Restored version from "{$a}" site admin preset'; -$string['rollbackfailures'] = 'The following settings can not be restored, the actual values differs from the values applied by the preset'; +$string['rollbackexecute'] = 'Restored version from the site admin preset {$a}'; +$string['rollbackfailures'] = 'The following settings cannot be reverted, as the value was changed after applying the preset.'; $string['rollbackresults'] = 'Settings successfully restored'; $string['rollbackshow'] = '{$a} preset version history'; $string['selectfile'] = 'Select file'; diff --git a/admin/tool/lpimportcsv/lang/en/tool_lpimportcsv.php b/admin/tool/lpimportcsv/lang/en/tool_lpimportcsv.php index 8f6df02f635..5f779f63f36 100644 --- a/admin/tool/lpimportcsv/lang/en/tool_lpimportcsv.php +++ b/admin/tool/lpimportcsv/lang/en/tool_lpimportcsv.php @@ -26,7 +26,7 @@ $string['competencyscale'] = 'Competency scale: {$a}'; $string['competencyscaledescription'] = 'Competency scale created by import'; $string['confirmcolumnmappings'] = 'Confirm the column mappings'; $string['confirm'] = 'Confirm'; -$string['csvdelimiter'] = 'CSV delimiter'; +$string['csvdelimiter'] = 'CSV separator'; $string['description'] = 'Description'; $string['descriptionformat'] = 'Description format'; $string['encoding'] = 'Encoding'; diff --git a/admin/tool/uploadcourse/lang/en/tool_uploadcourse.php b/admin/tool/uploadcourse/lang/en/tool_uploadcourse.php index 1cbea0f5166..1db81b0ab3b 100644 --- a/admin/tool/uploadcourse/lang/en/tool_uploadcourse.php +++ b/admin/tool/uploadcourse/lang/en/tool_uploadcourse.php @@ -70,9 +70,9 @@ $string['courseupdated'] = 'Course updated'; $string['createall'] = 'Create all, increment shortname if needed'; $string['createnew'] = 'Create new courses only, skip existing ones'; $string['createorupdate'] = 'Create new courses, or update existing ones'; -$string['csvdelimiter'] = 'CSV delimiter'; -$string['csvdelimiter_help'] = 'CSV delimiter of the CSV file.'; -$string['csvfileerror'] = 'There is something wrong with the format of the CSV file. Please check the number of headings and columns match, and that the delimiter and file encoding are correct: {$a}'; +$string['csvdelimiter'] = 'CSV separator'; +$string['csvdelimiter_help'] = 'The character separating the series of data in each record.'; +$string['csvfileerror'] = 'There is something wrong with the format of the CSV file. Please check the number of headings and columns match, and that the separator and file encoding are correct. {$a}'; $string['csvline'] = 'Line'; $string['defaultvalues'] = 'Default course values'; $string['defaultvaluescustomfieldcategory'] = 'Default values for \'{$a}\''; @@ -131,7 +131,7 @@ $string['uploadcourses'] = 'Upload courses'; $string['uploadcourses_help'] = 'Courses may be uploaded via text file. The format of the file should be as follows: * Each line of the file contains one record -* Each record is a series of data separated by commas (or other delimiters) +* Each record is a series of data separated by the selected separator * The first record contains a list of fieldnames defining the format of the rest of the file * Required fieldnames are shortname, fullname, and category'; $string['uploadcoursespreview'] = 'Upload courses preview'; diff --git a/admin/tool/uploaduser/lang/en/tool_uploaduser.php b/admin/tool/uploaduser/lang/en/tool_uploaduser.php index 9f65fa594b0..eb8cc3df6da 100644 --- a/admin/tool/uploaduser/lang/en/tool_uploaduser.php +++ b/admin/tool/uploaduser/lang/en/tool_uploaduser.php @@ -35,7 +35,7 @@ $string['clihelp'] = 'Print out this help.'; $string['climissingargument'] = 'Argument --{$a} is required'; $string['clititle'] = 'Command line Upload user tool.'; $string['clivalidationerror'] = 'Validation error:'; -$string['csvdelimiter'] = 'CSV delimiter'; +$string['csvdelimiter'] = 'CSV separator'; $string['defaultvalues'] = 'Default values'; $string['deleteerrors'] = 'Delete errors'; $string['encoding'] = 'Encoding'; @@ -76,7 +76,7 @@ $string['uploadusers'] = 'Upload users'; $string['uploadusers_help'] = 'Users may be uploaded (and optionally enrolled in courses) via text file. The format of the file should be as follows: * Each line of the file contains one record -* Each record is a series of data separated by commas (or other delimiters) +* Each record is a series of data separated by the selected separator * The first record contains a list of fieldnames defining the format of the rest of the file * Required fieldnames are username, password, firstname, lastname, email'; $string['uploadusers_link'] = 'admin/tool/uploaduser/index'; diff --git a/admin/tool/usertours/lang/en/tool_usertours.php b/admin/tool/usertours/lang/en/tool_usertours.php index 00b260b791f..6f3ab06dcfc 100644 --- a/admin/tool/usertours/lang/en/tool_usertours.php +++ b/admin/tool/usertours/lang/en/tool_usertours.php @@ -44,12 +44,10 @@ $string['content'] = 'Content'; $string['content_heading'] = 'Content'; $string['content_help'] = 'Content describing the step may be added as plain text, enclosed in multilang tags (for use with the multi-language content filter) if required.'; $string['content_type'] = 'Content type'; -$string['content_type_help'] = 'Content types are: - -* Read from language pack - Language string ID may be entered in the format identifier,component (with no brackets or space after the comma). -* Enter manually - Using an editor to input the content'; -$string['content_type_langstring'] = 'Read from language pack'; -$string['content_type_manual'] = 'Enter manually'; +$string['content_type_help'] = '* Manual - content is entered using a text editor +* Language string ID - in the format string identifier,component (with no space after the comma)'; +$string['content_type_langstring'] = 'Language string ID'; +$string['content_type_manual'] = 'Manual'; $string['cssselector'] = 'CSS selector'; $string['defaultvalue'] = 'Default ({$a})'; $string['delay'] = 'Delay before showing the step'; @@ -60,7 +58,7 @@ $string['editstep'] = 'Editing "{$a}"'; $string['tourisenabled'] = 'Tour is enabled'; $string['enabled'] = 'Enabled'; $string['endtourlabel'] = 'End tour button\'s label'; -$string['endtourlabel_help'] = 'You can optionally specify a custom label for the end tour button. The default label is "Got it" for single-step, and "End tour" for multiple-step tours.. +$string['endtourlabel_help'] = 'You can optionally specify a custom label for the end tour button. The default label is \'Got it\' for single-step and \'End tour\' for multiple-step tours. Alternatively, a language string ID may be entered in the format identifier,component (with no brackets or space after the comma).'; $string['event_tour_started'] = 'Tour started'; @@ -89,10 +87,10 @@ $string['filter_theme_help'] = 'Show the tour when the user is using one of the $string['filter_role'] = 'Role'; $string['filter_role_help'] = 'A tour may be restricted to users with selected roles in the context where the tour is shown. For example, restricting a Dashboard tour to users with the role of student won\'t work if users have the role of student in a course (as is generally the case). A Dashboard tour can only be restricted to users with a system role.'; $string['importtour'] = 'Import tour'; -$string['invalid_lang_id'] = 'Invalid language identifier'; +$string['invalid_lang_id'] = 'Invalid language string ID'; $string['left'] = 'Left'; $string['modifyshippedtourwarning'] = 'This is a user tour that has shipped with Moodle. Any modifications you make may be overridden during your next site upgrade.'; -$string['moodle_language_identifier'] = 'Moodle language identifier'; +$string['moodle_language_identifier'] = 'Language string ID'; $string['movestepdown'] = 'Move step down'; $string['movestepup'] = 'Move step up'; $string['movetourdown'] = 'Move tour down'; @@ -282,8 +280,8 @@ $string['tour_navigation_course_student_tour_name'] = 'Course index'; $string['tour_navigation_course_teacher_tour_des'] = 'Edit mode, drag and drop of activities and posting announcements in a course'; $string['tour_navigation_course_teacher_tour_name'] = 'Course editing'; $string['tour_navigation_dashboard_content'] = '@@PIXICON::tour/tour_dashboard::tool_usertours@@
This side panel can contain more features.'; -$string['tour_navigation_dashboard_title'] = 'Expand to explore!'; -$string['tour_navigation_dashboard_tour_des'] = 'Where blocks can be found on the Dashboard'; +$string['tour_navigation_dashboard_title'] = 'Expand to explore'; +$string['tour_navigation_dashboard_tour_des'] = 'Where blocks can be found'; $string['tour_navigation_dashboard_tour_name'] = 'Block drawer'; $string['tour_navigation_mycourses_content'] = '@@PIXICON::tour/tour_mycourses::tool_usertours@@
Add, copy, delete and hide courses from this menu.'; $string['tour_navigation_mycourses_endtourlabel'] = 'I understand'; diff --git a/admin/tool/xmldb/lang/en/tool_xmldb.php b/admin/tool/xmldb/lang/en/tool_xmldb.php index 786de3fc70c..d2f4eb684ae 100644 --- a/admin/tool/xmldb/lang/en/tool_xmldb.php +++ b/admin/tool/xmldb/lang/en/tool_xmldb.php @@ -177,11 +177,11 @@ $string['persistentfieldsexist'] = 'The following fields already exist: '; $string['pluginname'] = 'XMLDB editor'; $string['primarykeyonlyallownotnullfields'] = 'Primary keys cannot be null'; $string['reconcilefiles'] = 'Reconcile XMLDB files'; -$string['reconcile_files'] = 'Look for XMLDB files needing reconcile'; -$string['reconcile_files_intro'] = 'This functionality looks for the current contents of all the XMLDB files, verifying that they match the results of generating them from the XMLDB Editor. +$string['reconcile_files'] = 'Look for XMLDB files needing reconciling'; +$string['reconcile_files_intro'] = 'This functionality looks though the contents of all XMLDB files to verify that they match the results of generating them from the XMLDB editor. -A list of files needing to be reconciled (regenerated) will be displayed and the XMLDB Editor should be used to fix them.'; -$string['reconcile_files_no'] = 'All files are ok, no reconcile action needed'; +A list of files needing to be reconciled (regenerated) will be displayed and the XMLDB editor can be used to fix them.'; +$string['reconcile_files_no'] = 'All files are OK. No reconciling is needed.'; $string['reconcile_files_yes'] = 'Found files to reconcile: '; $string['reserved'] = 'Reserved'; $string['reservedwords'] = 'Reserved words'; diff --git a/cache/stores/file/lang/en/cachestore_file.php b/cache/stores/file/lang/en/cachestore_file.php index 6a981c8e927..ceb1bfe9ae8 100644 --- a/cache/stores/file/lang/en/cachestore_file.php +++ b/cache/stores/file/lang/en/cachestore_file.php @@ -29,7 +29,7 @@ defined('MOODLE_INTERNAL') || die(); $string['asyncpurge'] = 'Asynchronously purge directory'; -$string['asyncpurge_help'] = 'If enabled, new directory is created with cache revision and old directory will be deleted Asynchronously via schedule task'; +$string['asyncpurge_help'] = 'If enabled, the new directory is created with cache revision and the old directory will be deleted asynchronously via a scheduled task.'; $string['autocreate'] = 'Auto create directory'; $string['autocreate_help'] = 'If enabled the directory specified in path will be automatically created if it does not already exist.'; $string['path'] = 'Cache path'; diff --git a/lang/en/admin.php b/lang/en/admin.php index a3ae61fc53f..a57937e197b 100644 --- a/lang/en/admin.php +++ b/lang/en/admin.php @@ -209,7 +209,7 @@ $string['configdebug'] = 'If you turn this on, then PHP\'s error_reporting will $string['configdebugdisplay'] = 'Set to on, the error reporting will go to the HTML page. This is practical, but breaks XHTML, JS, cookies and HTTP headers in general. Set to off, it will send the output to your server logs, allowing better debugging. The PHP setting error_log controls which log this goes to.'; $string['configdebugpageinfo'] = 'Enable if you want page information printed in page footer.'; $string['configdebugvalidators'] = 'Enable if you want to have links to external validator servers in page footer. You may need to create new user with username w3cvalidator, and enable guest access. These changes may allow unauthorized access to server, do not enable on production sites!'; -$string['configdefaulthomepage'] = 'This determines the first link in the navigation for logged-in users.'; +$string['configdefaulthomepage'] = 'Which page should users be redirected to after logging in to the site? The setting also determines the first link in the navigation for users of Classic-based themes.'; $string['configdefaultrequestcategory'] = 'Courses requested by users with the capability to request new courses in the system context will be placed in this category unless users are able to select a different category.'; $string['configdefaultrequestedcategory'] = 'Default category to put courses that were requested into, if they\'re approved.'; $string['configdefaultuserroleid'] = 'All logged in users will be given the capabilities of the role you specify here, at the site level, in ADDITION to any other roles they may have been given. The default is the Authenticated user role. Note that this will not conflict with other roles they have unless you prohibit capabilities, it just ensures that all users have capabilities that are not assignable at the course level (eg post blog entries, manage own calendar, etc).'; @@ -481,7 +481,7 @@ $string['debugvalidators'] = 'Show validator links'; $string['defaultcity'] = 'Default city'; $string['defaultcity_help'] = 'A city entered here will be the default city when creating new user accounts.'; $string['defaultformatnotset'] = 'Error determining default course format. Please check site settings.'; -$string['defaulthomepage'] = 'Home page for users'; +$string['defaulthomepage'] = 'Start page for users'; $string['defaultrequestcategory'] = 'Default category for course requests'; $string['defaultsettinginfo'] = 'Default: {$a}'; $string['defaultuserroleid'] = 'Default role for all users'; diff --git a/lang/en/adminpresets.php b/lang/en/adminpresets.php index 2b3af85c57a..07c0dd06885 100644 --- a/lang/en/adminpresets.php +++ b/lang/en/adminpresets.php @@ -27,24 +27,24 @@ $string['disabledwithvalue'] = 'Disabled ({$a})'; $string['enabled'] = 'Enabled'; $string['errordeleting'] = 'Error deleting from database.'; $string['errorinserting'] = 'Error inserting into database.'; -$string['errornopreset'] = 'It doesn\'t exist a preset with that name.'; +$string['errornopreset'] = 'A preset with this name doesn\'t exist.'; $string['fullpreset'] = 'Full'; $string['fullpresetdescription'] = 'All the Starter features plus External (LTI) tool, SCORM, Workshop, Analytics, Badges, Competencies, Learning plans and lots more.'; $string['markedasadvanced'] = 'marked as advanced'; $string['markedasforced'] = 'marked as forced'; $string['markedaslocked'] = 'marked as locked'; -$string['markedasnonadvanced'] = 'marked as non advanced'; -$string['markedasnonforced'] = 'marked as non forced'; -$string['markedasnonlocked'] = 'marked as non locked'; +$string['markedasnonadvanced'] = 'not marked as advanced'; +$string['markedasnonforced'] = 'not marked as forced'; +$string['markedasnonlocked'] = 'not marked as locked'; $string['privacy:metadata:adminpresets'] = 'The list of configuration presets.'; -$string['privacy:metadata:adminpresets:comments'] = 'A description about the preset.'; -$string['privacy:metadata:adminpresets:moodlerelease'] = 'The Moodle release version where the preset is based on.'; +$string['privacy:metadata:adminpresets:comments'] = 'The description of the preset.'; +$string['privacy:metadata:adminpresets:moodlerelease'] = 'The Moodle release version that the preset is based on.'; $string['privacy:metadata:adminpresets:name'] = 'The name of the preset.'; $string['privacy:metadata:adminpresets:site'] = 'The Moodle site where this preset was created.'; $string['privacy:metadata:adminpresets:timecreated'] = 'The time that the change was made.'; $string['privacy:metadata:adminpresets:userid'] = 'The user who create the preset.'; $string['privacy:metadata:adminpresets_app'] = 'The configuration presets that have been applied.'; -$string['privacy:metadata:adminpresets_app:adminpresetid'] = 'The id of the preset applied.'; +$string['privacy:metadata:adminpresets_app:adminpresetid'] = 'The ID of the preset applied.'; $string['privacy:metadata:adminpresets_app:time'] = 'The time that the preset was applied.'; $string['privacy:metadata:adminpresets_app:userid'] = 'The user who applied the preset.'; $string['sensiblesettings'] = 'Settings with passwords'; @@ -52,4 +52,4 @@ $string['sensiblesettingstext'] = 'Settings with passwords or other sensitive in $string['siteadminpresetspluginname'] = 'Site admin presets'; $string['starterpreset'] = 'Starter'; $string['starterpresetdescription'] = 'Moodle with all of the most popular features, including Assignment, Feedback, Forum, H5P, Quiz and Completion tracking.'; -$string['wrongid'] = 'Wrong id'; +$string['wrongid'] = 'Wrong ID'; diff --git a/lang/en/badges.php b/lang/en/badges.php index 35313af6957..390c4bfea1a 100644 --- a/lang/en/badges.php +++ b/lang/en/badges.php @@ -417,7 +417,7 @@ $string['nobackpack'] = 'There is no backpack service connected to this account. $string['nobackpackbadgessummary'] = 'There are no badges in the collections you have selected.'; $string['nobackpackcollectionssummary'] = 'No badge collections have been selected.'; $string['nobackpacks'] = 'There are no backpacks available'; -$string['nobadges'] = 'There are no badges available.'; +$string['nobadges'] = 'There are currently no badges available for users to earn.'; $string['nocompetencies'] = 'No competencies selected.'; $string['nocriteria'] = 'Criteria for this badge have not been set up yet.'; $string['noendorsement'] = 'This badge does not have an endorsement.'; diff --git a/lang/en/block.php b/lang/en/block.php index fbfb2d53363..b8025043ce7 100644 --- a/lang/en/block.php +++ b/lang/en/block.php @@ -25,7 +25,7 @@ $string['anypagematchingtheabove'] = 'Any page matching the above'; $string['appearsinsubcontexts'] = 'Appears in sub-contexts'; $string['assignrolesinblock'] = 'Assign roles in {$a} block'; -$string['blocksdrawertoggle'] = 'Hide/show blocks drawer'; +$string['blocksdrawertoggle'] = 'Hide/show block drawer'; $string['blocksettings'] = 'Block settings'; $string['bracketfirst'] = '{$a} (first)'; $string['bracketlast'] = '{$a} (last)'; diff --git a/lang/en/cohort.php b/lang/en/cohort.php index 074e3a22b72..81b2386ca0d 100644 --- a/lang/en/cohort.php +++ b/lang/en/cohort.php @@ -88,11 +88,10 @@ $string['searchcohort'] = 'Search cohort'; $string['uploadcohorts_help'] = 'Cohorts may be uploaded via text file. The format of the file should be as follows: * Each line of the file contains one record -* Each record is a series of data separated by commas (or other delimiters) +* Each record is a series of data separated by the selected separator * The first record contains a list of fieldnames defining the format of the rest of the file * Required fieldname is name -* Optional fieldnames are idnumber, description, descriptionformat, visible, context, category, category_id, category_idnumber, category_path -'; +* Optional fieldnames are idnumber, description, descriptionformat, visible, context, category, category_id, category_idnumber, category_path'; $string['visible'] = 'Visible'; $string['visible_help'] = "Any cohort can be viewed by users who have 'moodle/cohort:view' capability in the cohort context.
Visible cohorts can also be viewed by users in the underlying courses."; diff --git a/lang/en/error.php b/lang/en/error.php index eda71342b97..6b31bda3b47 100644 --- a/lang/en/error.php +++ b/lang/en/error.php @@ -197,8 +197,8 @@ $string['coursemisconf'] = 'Course is misconfigured'; $string['courserequestdisabled'] = 'Sorry, but course requests have been disabled by the administrator.'; $string['csvcolumnduplicates'] = 'Duplicate columns detected'; $string['csvemptyfile'] = 'The CSV file is empty'; -$string['csvfileerror'] = 'There is something wrong with the format of the CSV file. Please check the number of headings and columns match, and that the delimiter and file encoding are correct. {$a}'; -$string['csvfewcolumns'] = 'Not enough columns, please verify the delimiter setting'; +$string['csvfileerror'] = 'There is something wrong with the format of the CSV file. Please check the number of headings and columns match, and that the separator and file encoding are correct. {$a}'; +$string['csvfewcolumns'] = 'Not enough columns, please verify the separator setting'; $string['csvinvalidcols'] = 'Invalid CSV file: First line must include "Header Fields" and the file must be type of
"Expanded Fields/Comma Separated"
or
"Expanded Fields with CAVV Result Code/Comma Separated"'; $string['csvinvalidcolsnum'] = 'Invalid CSV file - each line must include 49 or 70 fields'; $string['csvloaderror'] = 'An error occurred while loading the CSV file: {$a}'; diff --git a/lang/en/grades.php b/lang/en/grades.php index 05c5986a278..e24f1c34481 100644 --- a/lang/en/grades.php +++ b/lang/en/grades.php @@ -403,7 +403,7 @@ $string['importcsv'] = 'Import CSV'; $string['importcsv_help'] = 'Grades can be imported via a CSV file with format as follows: * Each line of the file contains one record -* Each record is a series of data separated by commas or an alternative separator +* Each record is a series of data separated by the selected separator * The first record contains a list of fieldnames defining the format of the rest of the file * A fieldname containing user identity data is required - either username or ID number or email address diff --git a/lang/en/group.php b/lang/en/group.php index d290ea22436..5dcaaa5a91e 100644 --- a/lang/en/group.php +++ b/lang/en/group.php @@ -43,7 +43,7 @@ $string['creategrouping'] = 'Create grouping'; $string['creategroupinselectedgrouping'] = 'Create group in grouping'; $string['createingrouping'] = 'Grouping of auto-created groups'; $string['createorphangroup'] = 'Create orphan group'; -$string['csvdelimiter'] = 'CSV delimiter'; +$string['csvdelimiter'] = 'CSV separator'; $string['databaseupgradegroups'] = 'Groups version is now {$a}'; $string['defaultgrouping'] = 'Default grouping'; $string['defaultgroupingname'] = 'Grouping'; @@ -138,7 +138,7 @@ $string['importgroups'] = 'Import groups'; $string['importgroups_help'] = 'Groups may be imported via text file. The format of the file should be as follows: * Each line of the file contains one record -* Each record is a series of data separated by commas +* Each record is a series of data separated by the selected separator * The first record contains a list of fieldnames defining the format of the rest of the file * Required fieldname is groupname * Optional fieldnames are groupidnumber, description, enrolmentkey, groupingname, enablemessaging'; diff --git a/lang/en/moodle.php b/lang/en/moodle.php index d07eb7058a6..fc09577e834 100644 --- a/lang/en/moodle.php +++ b/lang/en/moodle.php @@ -495,8 +495,8 @@ $string['defaultcoursesummary'] = 'Write a concise and interesting paragraph her $string['defaultcourseteacher'] = 'Teacher'; $string['defaultcourseteacherdescription'] = 'Teachers can do anything within a course, including changing the activities and grading students.'; $string['defaultcourseteachers'] = 'Teachers'; -$string['defaulthomepageuser'] = 'Home page'; -$string['defaulthomepageuser_help'] = 'Your home page is the first link in the navigation.'; +$string['defaulthomepageuser'] = 'Start page'; +$string['defaulthomepageuser_help'] = 'Which page should you be redirected to after logging in to the site?'; $string['delete'] = 'Delete'; $string['deleteablock'] = 'Delete a block'; $string['deleteall'] = 'Delete all'; diff --git a/lang/en/reportbuilder.php b/lang/en/reportbuilder.php index 507c7d602b8..e8d3fc36b65 100644 --- a/lang/en/reportbuilder.php +++ b/lang/en/reportbuilder.php @@ -213,7 +213,7 @@ $string['recurrence'] = 'Recurrence'; $string['recurrenceannually'] = 'Annually'; $string['recurrencedaily'] = 'Daily'; $string['recurrencemonthly'] = 'Monthly'; -$string['recurrenceweekdays'] = 'Daily (Week days only)'; +$string['recurrenceweekdays'] = 'Daily (weekdays only)'; $string['recurrenceweekly'] = 'Weekly'; $string['renameaudience'] = 'Rename audience \'{$a}\''; $string['renamecolumn'] = 'Rename column \'{$a}\''; diff --git a/mod/bigbluebuttonbn/lang/en/bigbluebuttonbn.php b/mod/bigbluebuttonbn/lang/en/bigbluebuttonbn.php index 6fa8a8ca150..0a9c77cfe0e 100644 --- a/mod/bigbluebuttonbn/lang/en/bigbluebuttonbn.php +++ b/mod/bigbluebuttonbn/lang/en/bigbluebuttonbn.php @@ -25,16 +25,16 @@ */ defined('MOODLE_INTERNAL') || die(); -$string['activityoverview'] = 'You have upcoming bigbluebuttonbn sessions'; -$string['bbbduetimeoverstartingtime'] = 'The due time for this activity must be greater than the starting time'; +$string['activityoverview'] = 'You have upcoming BigBlueButton sessions'; +$string['bbbduetimeoverstartingtime'] = 'The close time must be later than the open time.'; $string['bbbdurationwarning'] = 'The maximum duration for this session is %duration% minutes.'; $string['bbbrecordwarning'] = 'This session may be recorded.'; -$string['bbbrecordallfromstartwarning'] = 'This session is being recorded from start.'; -$string['bigbluebuttonbn:addinstance'] = 'Add a new bigbluebuttonbn room/activity'; -$string['bigbluebuttonbn:join'] = 'Join a bigbluebuttonbn meeting'; -$string['bigbluebuttonbn:view'] = 'View a room/activity'; -$string['bigbluebuttonbn:addinstancewithmeeting'] = 'Create instances with live meeting capabilities'; -$string['bigbluebuttonbn:addinstancewithrecording'] = 'Create instances with recording capabilities'; +$string['bbbrecordallfromstartwarning'] = 'This session is being recorded from the start.'; +$string['bigbluebuttonbn:addinstance'] = 'Add a new BigBlueButton room'; +$string['bigbluebuttonbn:join'] = 'Join a BigBlueButton room'; +$string['bigbluebuttonbn:view'] = 'View BigBlueButton room'; +$string['bigbluebuttonbn:addinstancewithmeeting'] = 'Create live sessions instance'; +$string['bigbluebuttonbn:addinstancewithrecording'] = 'Create instance with recordings'; $string['bigbluebuttonbn:managerecordings'] = 'Manage recordings'; $string['bigbluebuttonbn:publishrecordings'] = 'Publish recordings'; $string['bigbluebuttonbn:unpublishrecordings'] = 'Unpublish recordings'; @@ -50,11 +50,11 @@ $string['indicator:socialbreadth'] = 'BigBlueButton social'; $string['indicator:socialbreadth_help'] = 'This indicator is based on the social breadth reached by the student in a BigBlueButton activity.'; $string['modulename'] = 'BigBlueButton'; $string['modulenameplural'] = 'BigBlueButton'; -$string['modulename_help'] = 'BigBlueButton lets you create from within Moodle links to real-time on-line classrooms using BigBlueButton, an open source web conferencing system for distance education. +$string['modulename_help'] = 'BigBlueButton is an open-source web conferencing system designed for online learning, which supports real-time sharing of audio, video, chat, slides, screen sharing, a multi-user whiteboard, breakout rooms, polling and emojis. -Using BigBlueButton you can specify for the title, description, calendar entry (which gives a date range for joining the session), groups, and details about the recording of the on-line session.'; +Using BigBlueButton you can create a room for sessions such as live online classes, virtual office hours or group collaboration with remote students. The session can be recorded for later playback.'; $string['modulename_link'] = 'BigBlueButton/view'; -$string['nosuchinstance'] = 'No such an instance {$a->entity} with id: {$a->id} '; +$string['nosuchinstance'] = 'No such instance {$a->entity} with ID {$a->id}'; $string['pluginadministration'] = 'BigBlueButton administration'; $string['pluginname'] = 'BigBlueButton'; @@ -66,98 +66,103 @@ $string['resetevents'] = 'Delete events'; $string['resettags'] = 'Delete tags'; $string['resetlogs'] = 'Delete custom logs'; $string['resetrecordings'] = 'Delete recordings'; -$string['resetlogs_help'] = 'Deleting the logs will cause the lost of references to recordings'; -$string['resetrecordings_help'] = 'Deleting the recordings will make them inaccessible from anywhere and it can not be undone'; +$string['resetlogs_help'] = 'Deleting the logs will result in lost references to recordings.'; +$string['resetrecordings_help'] = 'Deleting the recordings will make them inaccessible from anywhere. This action cannot be undone!'; $string['search:activity'] = 'BigBlueButton - activity information'; $string['search:tags'] = 'BigBlueButton - tags information'; $string['settings'] = 'BigBlueButton settings'; -$string['privacy:metadata:bigbluebuttonbn'] = 'Stores the configuration for the room or activity that defines the features and general behaviour of the BigBlueButton session.'; -$string['privacy:metadata:bigbluebuttonbn:participants'] = 'A list of rules that define the role users will in the live meeting. A user ID may be stored as permissions can be granted per role or user.'; +$string['privacy:metadata:bigbluebuttonbn'] = 'BigBlueButton session configuration'; +$string['privacy:metadata:bigbluebuttonbn:participants'] = 'A list of rules that define the role users will have in the BigBlueButton session. A user ID may be stored as permissions can be granted per role or per user.'; $string['privacy:metadata:bigbluebuttonbn_logs'] = 'Stores events triggered when using the plugin.'; $string['privacy:metadata:bigbluebuttonbn_logs:userid'] = 'The user ID of the user who triggered the event.'; -$string['privacy:metadata:bigbluebuttonbn_logs:timecreated'] = 'The time at which the log was created.'; -$string['privacy:metadata:bigbluebuttonbn_logs:meetingid'] = 'The meeting ID the user had access to.'; +$string['privacy:metadata:bigbluebuttonbn_logs:timecreated'] = 'The time when the log was created.'; +$string['privacy:metadata:bigbluebuttonbn_logs:meetingid'] = 'The session ID the user had access to.'; $string['privacy:metadata:bigbluebuttonbn_logs:log'] = 'The type of event triggered by the user.'; -$string['privacy:metadata:bigbluebuttonbn_logs:meta'] = 'May include extra information related to the meeting or the recording afected by the event.'; +$string['privacy:metadata:bigbluebuttonbn_logs:meta'] = 'Additional information related to the session or the recording.'; $string['privacy:metadata:bigbluebutton'] = 'In order to create and join BigBlueButton sessions, user data needs to be exchanged with the server.'; -$string['privacy:metadata:bigbluebutton:userid'] = 'The userid of the user accessing the BigBlueButton server.'; -$string['privacy:metadata:bigbluebutton:fullname'] = 'The fullname of the user accessing the BigBlueButton server.'; +$string['privacy:metadata:bigbluebutton:userid'] = 'The user ID of the user accessing the BigBlueButton server.'; +$string['privacy:metadata:bigbluebutton:fullname'] = 'The full name of the user accessing the BigBlueButton server.'; $string['privacy:metadata:bigbluebuttonbn_recordings'] = 'Stores metadata about recordings.'; $string['privacy:metadata:bigbluebuttonbn_recordings:userid'] = 'The user ID of the user who last changed a recording.'; -$string['completionattendance'] = 'Student must attend the meeting for:'; -$string['completionattendance_desc'] = 'Student must attend the meeting and remain in the session for at least {$a} minute(s)'; -$string['completionattendance_event_desc'] = 'Student has attended the meeting or remained in the session for at least {$a} minute(s)'; +$string['completionattendance'] = 'Student must attend the session for:'; +$string['completionattendance_desc'] = 'Student must enter the room and remain in the session for at least {$a} minute(s)'; +$string['completionattendance_event_desc'] = 'Student has entered the room and remained in the session for at least {$a} minute(s)'; $string['completionattendancegroup'] = 'Require attendance'; -$string['completionattendancegroup_help'] = 'Attending the meeting for (n) minutes is required for completion'; +$string['completionattendancegroup_help'] = 'Attending the meeting for (n) minutes is required for completion.'; -$string['completionengagementchats'] = 'Require chats events'; -$string['completionengagementchats_desc'] = 'Student must take participate into {$a} chat(s) events to complete it'; -$string['completionengagementchats_event_desc'] = 'Has raised {$a} Chat(s) event(s)'; -$string['completionengagementtalks'] = 'Talk events'; +$string['completionengagementchats'] = 'Chats'; +$string['completionengagementchats_desc'] = 'Student must participate in {$a} chat(s) to complete it.'; +$string['completionengagementchats_event_desc'] = 'Has raised {$a} chat(s)'; +$string['completionengagementtalks'] = 'Talk'; $string['completionengagementtalks_desc'] = 'Student must talk {$a} time(s) to complete it'; -$string['completionengagementtalks_event_desc'] = 'Has raised {$a} Talk(s) event(s)'; -$string['completionengagementraisehand'] = 'Require raise hand events'; -$string['completionengagementraisehand_desc'] = 'Student must raise hand {$a} time(s) to complete it'; -$string['completionengagementraisehand_event_desc'] = 'Has raised {$a} Raise Hand event(s)'; +$string['completionengagementtalks_event_desc'] = 'Has raised {$a} talk(s)'; +$string['completionengagementraisehand'] = 'Require raised hand'; +$string['completionengagementraisehand_desc'] = 'Student must raise hand {$a} time(s) to complete it.'; +$string['completionengagementraisehand_event_desc'] = 'Has raised hand {$a} times'; $string['completionengagementpollvotes'] = 'Poll votes'; -$string['completionengagementpollvotes_desc'] = 'Student must vote into polls {$a} time(s) to complete it'; -$string['completionengagementpollvotes_event_desc'] = 'Has raised {$a} Poll vote(s) events'; +$string['completionengagementpollvotes_desc'] = 'Student must vote in polls {$a} time(s) to complete it.'; +$string['completionengagementpollvotes_event_desc'] = 'Has raised {$a} poll vote(s)'; $string['completionengagementemojis'] = 'Emojis'; -$string['completionengagementemojis_desc'] = 'Student must send {$a} emoji(s) into polls to complete it'; -$string['completionengagementemojis_event_desc'] = 'Has raised {$a} Emoji(s) event(s)'; +$string['completionengagementemojis_desc'] = 'Student must send {$a} emoji(s) into polls to complete it.'; +$string['completionengagementemojis_event_desc'] = 'Has raised {$a} emoji(s)'; $string['completionengagement_desc'] = 'Student must engage in activities during the meeting'; -$string['completionengagementgroup'] = 'Require engagement'; -$string['completionengagementgroup_help'] = 'Active participation during the session is required for completion'; +$string['completionengagementgroup'] = 'Require participation'; +$string['completionengagementgroup_help'] = 'Active participation during the session is required for completion.'; $string['completionupdatestate'] = 'Completion update state'; $string['completionvalidatestate'] = 'Validate completion'; $string['completionvalidatestatetriggered'] = 'Validate completion has been triggered.'; $string['completionview'] = 'Require view'; -$string['completionview_desc'] = 'Student must join a meeting or play a recording to complete it.'; -$string['completionview_event_desc'] = 'Has joined the meeting or played a recording {$a} time(s).'; +$string['completionview_desc'] = 'Student must join a room or play a recording to complete it.'; +$string['completionview_event_desc'] = 'Has joined the room or played a recording {$a} time(s)'; $string['sendnotification'] = 'Send notification'; $string['minute'] = 'minute'; $string['minutes'] = 'minutes'; -$string['config_general'] = 'General configuration'; -$string['config_general_description'] = 'These settings are always used'; -$string['config_server_url'] = 'BigBlueButton Server URL'; -$string['config_server_url_description'] = 'The URL of your BigBlueButton server must end with /bigbluebutton/. (This default URL is for a BigBlueButton server provided by Blindside Networks that you can use for testing.)'; -$string['config_shared_secret'] = 'BigBlueButton Shared Secret'; -$string['config_shared_secret_description'] = 'The security secret of your BigBlueButton server. (This default secret is for a BigBlueButton server provided by Blindside Networks that you can use for testing.)'; +$string['config_general'] = 'General settings'; +$string['config_general_description'] = 'These settings are always used.'; +$string['config_server_url'] = 'BigBlueButton server URL'; +$string['config_server_url_description'] = 'The default credentials are for a free BigBlueButton service for Moodle (opens in new window) provided by Blindside Networks with restrictions as follows: +
    +
  1. The maximum length for each session is 60 minutes
    2. +
  2. The maximum number of concurrent users per session is 25
    3. +
  3. Recordings expire after seven (7) days and are not downloadable
    4. +
  4. Student webcams are only visible to the moderator.
    5. +
'; +$string['config_shared_secret'] = 'BigBlueButton shared secret'; +$string['config_shared_secret_description'] = 'The security secret of your BigBlueButton server. The default secret is for a free BigBlueButton server provided by Blindside Networks.'; -$string['config_recording'] = 'Configuration for "Record meeting" feature'; +$string['config_recording'] = 'Recording'; $string['config_recording_description'] = 'These settings are feature specific'; -$string['config_recording_default'] = 'Recording feature enabled by default'; -$string['config_recording_default_description'] = 'If enabled the sessions created in BigBlueButton will have recording capabilities.'; -$string['config_recording_editable'] = 'Recording feature can be edited'; -$string['config_recording_editable_description'] = 'If checked the interface includes an option for enable and disable the recording feature.'; +$string['config_recording_default'] = 'Recording enabled by default'; +$string['config_recording_default_description'] = 'Should the setting \'Session can be recorded\' be enabled by default when adding a new BigBlueButton room?'; +$string['config_recording_editable'] = 'Session can be recorded editable'; +$string['config_recording_editable_description'] = 'Should \'Session can be recorded\' be editable in the BigBlueButton activity settings?'; $string['config_recording_protect_editable'] = 'Protected recordings state can be edited'; $string['config_recording_protect_editable_description'] = 'If checked the interface includes an option for protecting/unprotecting recordings.'; -$string['config_recording_icons_enabled'] = 'Icons for recording management'; -$string['config_recording_icons_enabled_description'] = 'When enabled, the recording management panel shows icons for the publish/unpublish and delete actions.'; -$string['config_recording_all_from_start_default'] = 'Record all from start'; -$string['config_recording_all_from_start_default_description'] = 'If checked the meeting will record to start'; -$string['config_recording_all_from_start_editable'] = 'Record all from start can be edited'; -$string['config_recording_all_from_start_editable_description'] = 'If checked the interface includes an option for enable and disable the record all from start feature.'; +$string['config_recording_icons_enabled'] = 'Publish recording options'; +$string['config_recording_icons_enabled_description'] = 'Should options to publish, unpublish and delete recordings be provided?'; +$string['config_recording_all_from_start_default'] = 'Start recording from the beginning'; +$string['config_recording_all_from_start_default_description'] = 'Should the setting \'Start recording from the beginning\' be enabled by default when adding a new BigBlueButton room?'; +$string['config_recording_all_from_start_editable'] = 'Start recording from the beginning editable'; +$string['config_recording_all_from_start_editable_description'] = 'Should \'Start recording from the beginning\' be editable in the BigBlueButton activity settings?'; $string['config_recording_hide_button_default'] = 'Hide recording button'; $string['config_recording_hide_button_default_description'] = 'If checked the button for record will be hidden'; -$string['config_recording_hide_button_editable'] = 'Hide recording button can be edited'; -$string['config_recording_hide_button_editable_description'] = 'If checked the interface includes an option for enable and disable the hide recording button feature.'; +$string['config_recording_hide_button_editable'] = 'Hide recording button editable'; +$string['config_recording_hide_button_editable_description'] = 'Should \'Hide recording button\' be editable in the BigBlueButton activity settings?'; $string['config_recording_refresh_period'] = 'Recording refresh period (in seconds)'; -$string['config_recording_refresh_period_description'] = 'To avoid querying the Bigbluebutton server too often we cache information - for recording. This is the refresh period in seconds which will decide how often we can/would refresh remote information for a given recording. Defaults to 300s (5mins).'; -$string['config_recordings'] = 'Configuration for "Show recordings" feature'; +$string['config_recording_refresh_period_description'] = 'How often should the BigBlueButton server be queried to refresh remote information for a recording?'; +$string['config_recordings'] = 'Show recordings'; $string['config_recordings_description'] = 'These settings are feature specific'; $string['config_recordings_general'] = 'Show recording settings'; $string['config_recordings_general_description'] = 'These settings are used only when showing recordings'; $string['config_recordings_deleted_default'] = 'Include recordings from deleted activities enabled by default'; -$string['config_recordings_deleted_default_description'] = 'If enabled the recording table will include the recordings belonging to deleted activities if there is any.'; +$string['config_recordings_deleted_default_description'] = 'If enabled, the recording table will include recordings of any activities which have since been deleted.'; $string['config_recordings_deleted_editable'] = 'Include recordings from deleted activities feature can be edited'; $string['config_recordings_deleted_editable_description'] = 'Include recordings from deleted activities by default can be edited when the instance is added or updated.'; $string['config_recordings_imported_default'] = 'Show only imported links enabled by default'; @@ -171,86 +176,86 @@ $string['config_recordings_preview_editable_description'] = 'Preview feature can $string['config_recordings_sortorder'] = 'Order the recordings in ascending order.'; $string['config_recordings_sortorder_description'] = 'By default recordings are displayed in descending order. When checked they will be sorted in ascending order.'; -$string['config_importrecordings'] = 'Configuration for "Import recordings" feature'; -$string['config_importrecordings_description'] = 'These settings are feature specific'; +$string['config_importrecordings'] = 'Import recordings'; +$string['config_importrecordings_description'] = 'These settings are feature specific.'; $string['config_importrecordings_enabled'] = 'Import recordings enabled'; $string['config_importrecordings_enabled_description'] = 'When this and the recording feature are enabled, it is possible to import recordings from different courses into an activity.'; $string['config_importrecordings_from_deleted_enabled'] = 'Import recordings from deleted activities enabled'; $string['config_importrecordings_from_deleted_enabled_description'] = 'When this and the import recording feature are enabled, it is possible to import recordings from activities that are no longer in the course.'; -$string['config_waitformoderator'] = 'Configuration for "Wait for moderator" feature'; +$string['config_waitformoderator'] = 'Wait for moderator'; $string['config_waitformoderator_description'] = 'These settings are feature specific'; $string['config_waitformoderator_default'] = 'Wait for moderator enabled by default'; -$string['config_waitformoderator_default_description'] = 'Wait for moderator feature is enabled by default when a new room or conference is added.'; -$string['config_waitformoderator_editable'] = 'Wait for moderator feature can be edited'; -$string['config_waitformoderator_editable_description'] = 'Wait for moderator value by default can be edited when the room or conference is added or updated.'; +$string['config_waitformoderator_default_description'] = 'Should the setting \'Wait for moderator\' be enabled by default when adding a new BigBlueButton room?'; +$string['config_waitformoderator_editable'] = 'Wait for moderator editable'; +$string['config_waitformoderator_editable_description'] = 'Should \'Wait for moderator\' be editable in the BigBlueButton activity settings?'; $string['config_waitformoderator_ping_interval'] = 'Wait for moderator ping (seconds)'; -$string['config_waitformoderator_ping_interval_description'] = 'When the wait for moderator feature is enabled, the client pings for the status of the session each [number] seconds. This parameter defines the interval for requests made to the Moodle server'; +$string['config_waitformoderator_ping_interval_description'] = 'How often should the server be pinged to check if the moderator has entered the room?'; $string['config_waitformoderator_cache_ttl'] = 'Wait for moderator cache TTL (seconds)'; $string['config_waitformoderator_cache_ttl_description'] = 'To support a heavy load of clients this plugin makes use of a cache. This parameter defines the time the cache will be kept before the next request is sent to the BigBlueButton server.'; -$string['config_voicebridge'] = 'Configuration for "Voice bridge" feature'; +$string['config_voicebridge'] = 'Voice bridge'; $string['config_voicebridge_description'] = 'These settings enable or disable options in the UI and also define default values for these options.'; $string['config_voicebridge_editable'] = 'Conference voice bridge can be edited'; -$string['config_voicebridge_editable_description'] = 'Conference voice bridge number can be permanently assigned to a room conference. When assigned, the number can not be used by any other room or conference'; +$string['config_voicebridge_editable_description'] = 'A conference voice bridge number can be permanently assigned to a room. When assigned, the number cannot be used for any other room.'; -$string['config_preuploadpresentation'] = 'Configuration for "Pre-upload presentation" feature'; -$string['config_preuploadpresentation_description'] = 'These settings enable or disable options in the UI and also define default values for these options. The feature works only if the Moodle server is accessible to BigBlueButton..'; -$string['config_preuploadpresentation_enabled'] = 'Pre-uploading presentation enabled'; -$string['config_preuploadpresentation_enabled_description'] = 'Preupload presentation feature is enabled in the UI when the room or conference is added or updated.'; +$string['config_preuploadpresentation'] = 'Pre-upload presentation'; +$string['config_preuploadpresentation_description'] = 'These settings enable or disable options in the UI and also define default values for these options. The feature works only if the Moodle server is accessible to BigBlueButton.'; +$string['config_preuploadpresentation_enabled'] = 'Pre-upload presentation'; +$string['config_preuploadpresentation_enabled_description'] = 'If enabled, an option is provided in the BigBlueButton activity settings to upload presentation files ready for use in the room.'; -$string['config_presentation_default'] = 'Default file for "Pre-upload presentation" feature'; -$string['config_presentation_default_description'] = 'This setting allow to select a file to use as default in all BBB instances if "Pre-upload presentation" is enabled.'; +$string['config_presentation_default'] = 'Default presentation file'; +$string['config_presentation_default_description'] = 'A file may be provided for use in all rooms.'; -$string['config_participant'] = 'Participant configuration'; -$string['config_participant_description'] = 'These settings define the role by default for participants in a conference.'; -$string['config_participant_moderator_default'] = 'Moderator by default'; +$string['config_participant'] = 'Participants'; +$string['config_participant_description'] = 'These settings define the default role for participants.'; +$string['config_participant_moderator_default'] = 'Moderator'; $string['config_participant_moderator_default_description'] = 'This rule is used by default when a new room is added.'; -$string['config_userlimit'] = 'Configuration for "User limit" feature'; +$string['config_userlimit'] = 'User limit'; $string['config_userlimit_description'] = 'These settings enable or disable options in the UI and also define default values for these options.'; $string['config_userlimit_default'] = 'User limit enabled by default'; -$string['config_userlimit_default_description'] = 'The number of users allowed in a session by default when a new room or conference is added. If the number is set to 0, no limit is established'; +$string['config_userlimit_default_description'] = 'The number of users allowed in a session by default when a new room is added. Set to 0 to allow an unlimited number of users.'; $string['config_userlimit_editable'] = 'User limit feature can be edited'; $string['config_userlimit_editable_description'] = 'User limit value by default can be edited when the room or conference is added or updated.'; -$string['config_scheduled'] = 'Configuration for "Scheduled sessions"'; -$string['config_scheduled_description'] = 'These settings define some of the behaviour by default for scheduled sessions.'; -$string['config_scheduled_pre_opening'] = 'Accessible before opening time (minutes)'; -$string['config_scheduled_pre_opening_description'] = 'The time in minutes for the session to be acceessible before the schedules opening time is due.'; +$string['config_scheduled'] = 'Scheduled sessions'; +$string['config_scheduled_description'] = 'These settings define default behaviour for scheduled sessions.'; +$string['config_scheduled_pre_opening'] = 'Accessible before opening time'; +$string['config_scheduled_pre_opening_description'] = 'The time in minutes that the room is open for prior to the scheduled opening time.'; -$string['config_extended_capabilities'] = 'Configuration for extended capabilities'; +$string['config_extended_capabilities'] = 'Extended capabilities'; $string['config_extended_capabilities_description'] = 'Configuration for extended capabilities when the BigBlueButton server offers them.'; $string['config_uidelegation_enabled'] = 'UI delegation is enabled'; $string['config_uidelegation_enabled_description'] = 'These settings enable or disable the UI delegation to the BigBlueButton server.'; -$string['config_recordingready_enabled'] = 'Send notifications when a recording is ready'; -$string['config_recordingready_enabled_description'] = 'Enable the plugin for sending notifications when the recording is ready. (It will only work if the script post_publish_recording_ready_callback is enabled in the BigBlueButton server)'; -$string['config_meetingevents_enabled'] = 'Register live events'; -$string['config_meetingevents_enabled_description'] = 'Enable the plugin for accepting and processing live events after the session ends. (It must be enabled for "Activity completion" and will only work if the BigBlueButton server is capable of processing post_events scripts)'; +$string['config_recordingready_enabled'] = 'Send recording available notification'; +$string['config_recordingready_enabled_description'] = 'If enabled, a notification will be sent when a recording link is available. This feature requires the script post_publish_recording_ready_callback to be enabled on the BigBlueButton server.'; +$string['config_meetingevents_enabled'] = 'Register live sessions'; +$string['config_meetingevents_enabled_description'] = 'If enabled, live sessions will be processed after the session ends. This feature is required for Activity completion and will only work if the BigBlueButton server is capable of processing post_events scripts.'; $string['config_warning_curl_not_installed'] = 'This feature requires the CURL extension for php installed and enabled. The settings will be accessible only if this condition is fulfilled.'; -$string['config_warning_bigbluebuttonbn_cfg_deprecated'] = 'BigBlueButton is making use of config.php with a global variable that has been deprecated. Please convert the file as it will not be supported in future versions'; +$string['config_warning_bigbluebuttonbn_cfg_deprecated'] = 'BigBlueButton makes use of config.php with a global variable that has been deprecated. Please convert the file as it will not be supported in future versions.'; -$string['config_muteonstart'] = 'Configuration for "Mute on Start" feature'; +$string['config_muteonstart'] = 'Mute on start'; $string['config_muteonstart_description'] = 'These settings enable or disable options in the UI and also define default values for these options.'; $string['config_muteonstart_default'] = 'Mute on start enabled by default'; $string['config_muteonstart_default_description'] = 'If enabled the session will be muted on start.'; $string['config_muteonstart_editable'] = 'Mute on start can be edited'; $string['config_muteonstart_editable_description'] = 'Mute on start by default can be edited when the instance is added or updated.'; $string['config_welcome_default'] = 'Default welcome message'; -$string['config_welcome_default_description'] = 'Replaces the default message setted up for the BigBlueButton server. The message can includes keywords (%%CONFNAME%%, %%DIALNUM%%, %%CONFNUM%%) which will be substituted automatically, and also html tags like ... or '; +$string['config_welcome_default_description'] = 'The welcome message is displayed when participants enter the room. If the field is left blank, then a message set on the BigBlueButton server is displayed.'; $string['config_welcome_editable'] = 'Default welcome message is editable by teachers'; $string['config_welcome_editable_description'] = 'Welcome message can be edited when the instance is added or updated'; $string['config_default_messages'] = 'Default messages'; $string['config_default_messages_description'] = 'Set message defaults for activities'; $string['config_locksettings'] = 'Configuration for locking settings'; -$string['config_locksettings_description'] = 'These setttings enable or disable options in the UI for locking settings, and also define default values for these options.'; +$string['config_locksettings_description'] = 'These settings enable or disable options in the UI for locking settings, and also define default values for these options.'; -$string['config_disablecam_default'] = 'Disable cam enabled by default'; +$string['config_disablecam_default'] = 'Disable webcam enabled by default'; $string['config_disablecam_default_description'] = 'If enabled the webcams will be disabled.'; -$string['config_disablecam_editable'] = 'Disable cam can be edited'; -$string['config_disablecam_editable_description'] = 'Disable cam by default can be edited when the instance is added or updated.'; +$string['config_disablecam_editable'] = 'Disable webcam can be edited'; +$string['config_disablecam_editable_description'] = 'Disable webcam by default can be edited when the instance is added or updated.'; $string['config_disablemic_default'] = 'Disable mic enabled by default'; $string['config_disablemic_default_description'] = 'If enabled the microphones will be disabled.'; @@ -292,23 +297,23 @@ $string['config_lockonjoinconfigurable_default_description'] = 'If enabled the s $string['config_lockonjoinconfigurable_editable'] = 'Lock configuration can be edited'; $string['config_lockonjoinconfigurable_editable_description'] = 'Lock configuration by default can be edited when the instance is added or updated.'; -$string['config_experimental_features'] = 'Configuration for experimental features'; +$string['config_experimental_features'] = 'Experimental features'; $string['config_experimental_features_description'] = 'Configuration for experimental features.'; $string['general_error_unable_connect'] = 'Unable to connect. Please check the url of the BigBlueButton server AND check to see if the BigBlueButton server is running. Details : {$a}'; $string['general_error_no_answer'] = 'Empty response. Please check the url of the BigBlueButton server AND check to see if the BigBlueButton server is running.'; -$string['general_error_not_allowed_to_create_instances'] = 'User is not allowed to create any type of instances.'; +$string['general_error_not_allowed_to_create_instances'] = 'User is not allowed to create any type of instance.'; $string['general_error_not_found'] = 'Entity not found : {$a}.'; -$string['general_error_cannot_create_meeting'] = 'Cannot create meeting.'; +$string['general_error_cannot_create_meeting'] = 'Cannot create session.'; $string['general_error_cannot_get_recordings'] = 'Cannot get recordings.'; -$string['index_confirm_end'] = 'Do you wish to end the virtual class?'; +$string['index_confirm_end'] = 'Do you want to end the session?'; $string['index_disabled'] = 'disabled'; $string['index_enabled'] = 'enabled'; -$string['index_ending'] = 'Ending the virtual classroom ... please wait'; -$string['index_error_checksum'] = 'A checksum error occurred. Make sure you entered the correct secret.'; -$string['index_error_forciblyended'] = 'Unable to join this meeting because it has been manually ended.'; -$string['index_error_unable_display'] = 'Unable to display the meetings. Please check the url of the BigBlueButton server AND check to see if the BigBlueButton server is running.'; +$string['index_ending'] = 'Ending the session ... please wait'; +$string['index_error_checksum'] = 'A checksum error occurred. Please check that you entered the correct secret.'; +$string['index_error_forciblyended'] = 'Unable to join the session because it has been manually ended.'; +$string['index_error_unable_display'] = 'Unable to display the sessions. Please check the url of the BigBlueButton server AND check to see if the BigBlueButton server is running.'; $string['index_heading_actions'] = 'Actions'; $string['index_heading_group'] = 'Group'; $string['index_heading_moderator'] = 'Moderators'; @@ -316,39 +321,39 @@ $string['index_heading_name'] = 'Room'; $string['index_heading_recording'] = 'Recording'; $string['index_heading_users'] = 'Users'; $string['index_heading_viewer'] = 'Viewers'; -$string['index_heading'] = 'BigBlueButton Rooms'; +$string['index_heading'] = 'BigBlueButton rooms'; $string['instanceprofilewithoutrecordings'] = 'This instance profile cannot display recordings'; -$string['mod_form_block_general'] = 'General settings'; -$string['mod_form_block_room'] = 'Activity/Room settings'; -$string['mod_form_block_recordings'] = 'View for recording'; +$string['mod_form_block_general'] = 'General'; +$string['mod_form_block_room'] = 'Room settings'; +$string['mod_form_block_recordings'] = 'Recording view'; $string['mod_form_block_presentation'] = 'Presentation content'; $string['mod_form_block_presentation_default'] = 'Presentation default content'; $string['mod_form_block_participants'] = 'Role assigned during live session'; -$string['mod_form_block_schedule'] = 'Schedule for session'; +$string['mod_form_block_schedule'] = 'Session timing'; $string['mod_form_block_record'] = 'Record settings'; -$string['mod_form_field_openingtime'] = 'Join open'; -$string['mod_form_field_closingtime'] = 'Join closed'; +$string['mod_form_field_openingtime'] = 'Open'; +$string['mod_form_field_closingtime'] = 'Close'; $string['mod_form_field_intro'] = 'Description'; -$string['mod_form_field_intro_help'] = 'A short description for the room or conference.'; +$string['mod_form_field_intro_help'] = 'A short description of the room.'; $string['mod_form_field_duration_help'] = 'Setting the duration for a meeting will establish the maximum time for a meeting to keep alive before the recording finish'; $string['mod_form_field_duration'] = 'Duration'; $string['mod_form_field_userlimit'] = 'User limit'; -$string['mod_form_field_userlimit_help'] = 'Maximum limit of users allowed in a meeting. If the limit is set to 0 the number of users will be unlimited.'; -$string['mod_form_field_name'] = 'Virtual classroom name'; +$string['mod_form_field_userlimit_help'] = 'The maximum number of users allowed in a session. Set to 0 to allow an unlimited number of users.'; +$string['mod_form_field_name'] = 'Room name'; $string['mod_form_field_room_name'] = 'Room name'; -$string['mod_form_field_conference_name'] = 'Conference name'; -$string['mod_form_field_record'] = 'Session can be recorded'; +$string['mod_form_field_conference_name'] = 'Session name'; +$string['mod_form_field_record'] = 'The session may be recorded.'; $string['mod_form_field_voicebridge'] = 'Voice bridge [####]'; -$string['mod_form_field_voicebridge_help'] = 'Voice conference number that participants enter to join the voice conference when using dial-in. A number between 1 and 9999 must be typed. If the value is 0 the static voicebridge number will be ignored and a random number will be generated by BigBlueButton. A number 7 will preced to the four digits typed'; +$string['mod_form_field_voicebridge_help'] = 'A number between 1 and 9999 that participants enter to join the voice session when using dial-in. If the value is 0 then the static voice bridge number will be ignored and a random number will be generated by BigBlueButton. A number 7 will prefix the four digits typed.'; $string['mod_form_field_voicebridge_format_error'] = 'Format error. You should input a number between 1 and 9999.'; -$string['mod_form_field_voicebridge_notunique_error'] = 'Not a unique value. This number is being used by another room or conference.'; +$string['mod_form_field_voicebridge_notunique_error'] = 'Not a unique value. This number is being used by another room.'; $string['mod_form_field_wait'] = 'Wait for moderator'; -$string['mod_form_field_wait_help'] = 'Viewers must wait until a moderator enters the session before they can do so'; +$string['mod_form_field_wait_help'] = 'Do participants have to wait for a moderator before they can enter the room?'; $string['mod_form_field_welcome'] = 'Welcome message'; -$string['mod_form_field_welcome_help'] = 'Replaces the default message setted up for the BigBlueButton server. The message can includes keywords (%%CONFNAME%%, %%DIALNUM%%, %%CONFNUM%%) which will be substituted automatically, and also html tags like <b>...</b>, <br />, <u></u> or <i></i> '; -$string['mod_form_field_welcome_default'] = '
Welcome to %%CONFNAME%%!

For help on using BigBlueButton see these (short) tutorial videos.

To join the audio bridge click the phone icon (top center). Please use a headset to avoid causing background noise for others.'; -$string['mod_form_field_participant_add'] = 'Add assignation'; -$string['mod_form_field_participant_list'] = 'Assignation list'; +$string['mod_form_field_welcome_help'] = 'The welcome message is displayed when participants enter the room. If the field is left blank, then a default message set in the site administration is displayed.'; +$string['mod_form_field_welcome_default'] = 'Welcome to %%CONFNAME%%.'; +$string['mod_form_field_participant_add'] = 'Add assignee'; +$string['mod_form_field_participant_list'] = 'Assignee'; $string['mod_form_field_participant_list_type_all'] = 'All users enrolled'; $string['mod_form_field_participant_list_type_role'] = 'Role'; $string['mod_form_field_participant_list_type_user'] = 'User'; @@ -359,9 +364,9 @@ $string['mod_form_field_participant_list_action_remove'] = 'Remove'; $string['mod_form_field_participant_bbb_role_moderator'] = 'Moderator'; $string['mod_form_field_participant_bbb_role_viewer'] = 'Viewer'; $string['mod_form_field_instanceprofiles'] = 'Instance type'; -$string['mod_form_field_instanceprofiles_help'] = 'Select the type for this BigBlueButton instance.'; +$string['mod_form_field_instanceprofiles_help'] = 'If a session is to be recorded, select \'Room with recordings\', otherwise \'Room only\'. After a session is recorded, if there are to be no more sessions, select \'Recordings only\'.'; $string['mod_form_field_muteonstart'] = 'Mute on start'; -$string['mod_form_field_recordings_html'] = 'Show the table in plain html'; +$string['mod_form_field_recordings_html'] = 'Show the table in plain HTML'; $string['mod_form_field_recordings_deleted'] = 'Include recordings from deleted activities'; $string['mod_form_field_recordings_imported'] = 'Show only imported links'; $string['mod_form_field_recordings_preview'] = 'Show recording preview'; @@ -385,26 +390,26 @@ $string['started_at'] = 'Started'; $string['ends_at'] = 'Ends'; $string['calendarstarts'] = '{$a} is scheduled for'; $string['recordings_from_deleted_activities'] = 'Recordings from deleted activities'; -$string['view_error_no_group_student'] = 'You have not been enrolled in a group. Please contact your Teacher or the Administrator.'; -$string['view_error_no_group_teacher'] = 'There are no groups configured yet. Please set up groups or contact the Administrator.'; -$string['view_error_no_group'] = 'There are no groups configured yet. Please set up groups before trying to join the meeting.'; -$string['view_error_unable_join_student'] = 'Unable to connect to the BigBlueButton server. Please contact your Teacher or the Administrator.'; -$string['view_error_unable_join_teacher'] = 'Unable to connect to the BigBlueButton server. Please contact the Administrator.'; -$string['view_error_unable_join'] = 'Unable to join the meeting. Please check the url of the BigBlueButton server AND check to see if the BigBlueButton server is running.'; +$string['view_error_no_group_student'] = 'You have not been added to a group. Please contact your teacher.'; +$string['view_error_no_group_teacher'] = 'There are no groups. You need to create some groups.'; +$string['view_error_no_group'] = 'There are no groups. You need to create some groups before trying to join the session.'; +$string['view_error_unable_join_student'] = 'Unable to connect to the BigBlueButton server.'; +$string['view_error_unable_join_teacher'] = 'Unable to connect to the BigBlueButton server. Please contact an administrator.'; +$string['view_error_unable_join'] = 'Unable to enter the room. Please check the URL of the BigBlueButton server AND check to see if the BigBlueButton server is running.'; $string['view_error_bigbluebutton'] = 'BigBlueButton responded with errors. {$a}'; -$string['view_error_create'] = 'The BigBlueButton server responded with an error message, the meeting could not be created.'; -$string['view_error_max_concurrent'] = 'Number of concurrent meetings allowed has been reached.'; -$string['view_error_userlimit_reached'] = 'The number of users allowed in a meeting has been reached.'; +$string['view_error_create'] = 'The BigBlueButton server responded with an error message. The room could not be created.'; +$string['view_error_max_concurrent'] = 'The number of concurrent sessions allowed has been reached.'; +$string['view_error_userlimit_reached'] = 'The number of users allowed in a session has been reached.'; $string['view_error_url_missing_parameters'] = 'There are parameters missing in this URL'; -$string['view_error_import_no_courses'] = 'No courses to look up for recordings'; -$string['view_error_import_no_recordings'] = 'No recordings in this course for importing'; -$string['view_error_invalid_session'] = 'The session is expired. Go back to the activity main page.'; +$string['view_error_import_no_courses'] = 'There are no courses to look up for recordings.'; +$string['view_error_import_no_recordings'] = 'There are no recordings in this course for importing.'; +$string['view_error_invalid_session'] = 'The session has expired. Go back to the activity page.'; $string['view_groups_selection_join'] = 'Join'; $string['view_groups_selection'] = 'Select the group you want to join and confirm the action'; $string['view_login_moderator'] = 'Logging in as moderator ...'; $string['view_login_viewer'] = 'Logging in as viewer ...'; -$string['view_noguests'] = 'The BigBlueButton is not open to guests'; -$string['view_nojoin'] = 'You are not in a role allowed to join this session.'; +$string['view_noguests'] = 'The BigBlueButton room is not open to guests.'; +$string['view_nojoin'] = 'You do not have a role that is allowed to join this session.'; $string['view_recording_list_actionbar_edit'] = 'Edit'; $string['view_recording_list_actionbar_delete'] = 'Delete'; $string['view_recording_list_actionbar_import'] = 'Import'; @@ -441,7 +446,7 @@ $string['view_recording_format_video'] = 'Video'; $string['view_recording_format_errror_unreachable'] = 'The URL for this recording format is unreachable.'; $string['view_section_title_presentation'] = 'Presentation file'; $string['view_section_title_recordings'] = 'Recordings'; -$string['view_message_norecordings'] = 'There are no recording to show.'; +$string['view_message_norecordings'] = 'There are no recordings available.'; $string['view_message_finished'] = 'This activity is over.'; $string['view_message_notavailableyet'] = 'This session is not yet available.'; $string['view_recording_select_course'] = 'Select a course first in the drop down menu'; @@ -471,59 +476,59 @@ $string['view_message_and'] = 'and'; $string['view_message_room_closed'] = 'This room is closed.'; $string['view_message_room_ready'] = 'This room is ready.'; $string['view_message_room_open'] = 'This room is open.'; -$string['view_message_conference_room_ready'] = 'This conference room is ready. You can join the session now.'; -$string['view_message_conference_not_started'] = 'This conference has not started yet.'; +$string['view_message_conference_room_ready'] = 'This room is ready. You can join the session now.'; +$string['view_message_conference_not_started'] = 'The session has not started yet.'; $string['view_message_conference_wait_for_moderator'] = 'Waiting for a moderator to join.'; -$string['view_message_conference_in_progress'] = 'This conference is in progress.'; -$string['view_message_conference_has_ended'] = 'This conference has ended.'; +$string['view_message_conference_in_progress'] = 'The session is in progress.'; +$string['view_message_conference_has_ended'] = 'The session has ended.'; $string['view_message_tab_close'] = 'This tab/window must be closed manually'; -$string['view_message_recordings_disabled'] = 'Recordings were disabled on this server. BigBlueButton instances for recordings only can not be used.'; -$string['view_message_importrecordings_disabled'] = 'Feature for import recording links is disabled on this server.'; +$string['view_message_recordings_disabled'] = 'Recordings are disabled on the server. BigBlueButton activities of type \'Recordings only\' cannot be used.'; +$string['view_message_importrecordings_disabled'] = 'Import recording links is disabled on the server.'; -$string['view_groups_selection_warning'] = 'There is a conference room for each group and you have access to more than one. Be sure to select the correct one.'; +$string['view_groups_selection_warning'] = 'There is a room for each group and you have access to more than one. Be sure to select the correct one.'; $string['view_groups_nogroups_warning'] = 'The room was configured for using groups but the course does not have groups defined.'; -$string['view_groups_notenrolled_warning'] = 'The room was configured for using groups but you are not enrolled in any of them.'; +$string['view_groups_notenrolled_warning'] = 'The room was configured for using groups but you are not a member of a group.'; $string['view_conference_action_join'] = 'Join session'; $string['view_conference_action_end'] = 'End session'; $string['view_recording'] = 'recording'; $string['view_recording_link'] = 'imported link'; -$string['view_recording_link_warning'] = 'This is a link pointing to a recording that was created in a different course or activity'; -$string['view_recording_delete_confirmation'] = 'Are you sure to delete this {$a}?'; -$string['view_recording_delete_confirmation_warning_s'] = 'This recording has {$a} link associated that was imported in a different course or activity. If the recording is deleted that link will also be removed'; -$string['view_recording_delete_confirmation_warning_p'] = 'This recording has {$a} links associated that were imported in different courses or activities. If the recording is deleted those links will also be removed'; -$string['view_recording_publish_confirmation'] = 'Are you sure to publish this {$a}?'; -$string['view_recording_publish_confirmation_warning_s'] = 'This recording has {$a} link associated that was imported in a different course or activity. If the recording is published that link will also be published'; -$string['view_recording_publish_confirmation_warning_p'] = 'This recording has {$a} links associated that were imported in different courses or activities. If the recording is published those links will also be published'; -$string['view_recording_publish_link_deleted'] = 'This link can not be re-published because the actual recording does not exist in the current BigBlueButton server. The link should be removed.'; -$string['view_recording_publish_link_not_published'] = 'This link can not be re-published because the actual recording is unpublished'; +$string['view_recording_link_warning'] = 'This is a link pointing to a recording that was created in a different course or activity.'; +$string['view_recording_delete_confirmation'] = 'Are you sure you want to delete {$a}?'; +$string['view_recording_delete_confirmation_warning_s'] = 'This recording has {$a} link associated that was imported into a different course or activity. If the recording is deleted, this link will also be removed.'; +$string['view_recording_delete_confirmation_warning_p'] = 'This recording has {$a} links associated that were imported into different courses or activities. If the recording is deleted, these links will also be removed.'; +$string['view_recording_publish_confirmation'] = 'Are you sure you want to publish this {$a}?'; +$string['view_recording_publish_confirmation_warning_s'] = 'This recording has {$a} link associated that was imported into a different course or activity. If the recording is published, this link will also be published.'; +$string['view_recording_publish_confirmation_warning_p'] = 'This recording has {$a} links associated that were imported into different courses or activities. If the recording is published, these links will also be published.'; +$string['view_recording_publish_link_deleted'] = 'This link cannot be republished because the original recording does not exist on the BigBlueButton server. The link should be removed.'; +$string['view_recording_publish_link_not_published'] = 'This link cannot be republished because the original recording is unpublished.'; $string['view_recording_unpublish_confirmation'] = 'Are you sure to unpublish this {$a}?'; -$string['view_recording_unpublish_confirmation_warning_s'] = 'This recording has {$a} link associated that was imported in a different course or activity. If the recording is unpublished that link will also be unpublished'; -$string['view_recording_unpublish_confirmation_warning_p'] = 'This recording has {$a} links associated that were imported in different courses or activities. If the recording is unpublished those links will also be unpublished'; -$string['view_recording_protect_confirmation'] = 'Are you sure to protect this {$a}?'; -$string['view_recording_protect_confirmation_warning_s'] = 'This recording has {$a} link associated that was imported in a different course or activity. If the recording is protected it will also affect the imported links'; -$string['view_recording_protect_confirmation_warning_p'] = 'This recording has {$a} links associated that were imported in different courses or activities. If the recording is protected it will also affect the imported links'; -$string['view_recording_unprotect_confirmation'] = 'Are you sure to unprotect this {$a}?'; -$string['view_recording_unprotect_confirmation_warning_s'] = 'This recording has {$a} link associated that was imported in a different course or activity. If the recording is unprotected it will also affect the imported links'; -$string['view_recording_unprotect_confirmation_warning_p'] = 'This recording has {$a} links associated that were imported in different courses or activities. If the recording is unprotected it will also affect the imported links'; -$string['view_recording_import_confirmation'] = 'Are you sure to import this recording?'; -$string['view_recording_unprotect_link_deleted'] = 'This link can not be un-protected because the actual recording does not exist in the current BigBlueButton server. The link should be removed.'; -$string['view_recording_unprotect_link_not_unprotected'] = 'This link can not be un-protected because the actual recording is protected'; +$string['view_recording_unpublish_confirmation_warning_s'] = 'This recording has {$a} link associated that was imported into a different course or activity. If the recording is unpublished, this link will also be unpublished.'; +$string['view_recording_unpublish_confirmation_warning_p'] = 'This recording has {$a} links associated that were imported into different courses or activities. If the recording is unpublished, these links will also be unpublished.'; +$string['view_recording_protect_confirmation'] = 'Are you sure you want to protect this {$a}?'; +$string['view_recording_protect_confirmation_warning_s'] = 'This recording has {$a} link associated that was imported into a different course or activity. If the recording is protected it will also affect the imported links.'; +$string['view_recording_protect_confirmation_warning_p'] = 'This recording has {$a} links associated that were imported into different courses or activities. If the recording is protected it will also affect the imported links.'; +$string['view_recording_unprotect_confirmation'] = 'Are you sure you want to unprotect this {$a}?'; +$string['view_recording_unprotect_confirmation_warning_s'] = 'This recording has {$a} link associated that was imported into a different course or activity. If the recording is unprotected it will also affect the imported links.'; +$string['view_recording_unprotect_confirmation_warning_p'] = 'This recording has {$a} links associated that were imported into different courses or activities. If the recording is unprotected it will also affect the imported links.'; +$string['view_recording_import_confirmation'] = 'Are you sure you want to import this recording?'; +$string['view_recording_unprotect_link_deleted'] = 'This link cannot be unprotected because the original recording does not exist on the BigBlueButton server. The link should be removed.'; +$string['view_recording_unprotect_link_not_unprotected'] = 'This link cannot be unprotected because the original recording is protected.'; $string['view_recording_actionbar'] = 'Toolbar'; $string['view_recording_activity'] = 'Activity'; $string['view_recording_course'] = 'Course'; $string['view_recording_date'] = 'Date'; $string['view_recording_description'] = 'Description'; -$string['view_recording_description_editlabel'] = 'Edit Description'; -$string['view_recording_description_edithint'] = 'Edit the description. It will help to find the recording later'; +$string['view_recording_description_editlabel'] = 'Edit description'; +$string['view_recording_description_edithint'] = 'A description may be added to help identify the recording.'; $string['view_recording_length'] = 'Length'; $string['view_recording_meeting'] = 'Meeting'; $string['view_recording_duration'] = 'Duration'; $string['view_recording_recording'] = 'Recording'; $string['view_recording_duration_min'] = 'min'; $string['view_recording_name'] = 'Name'; -$string['view_recording_name_editlabel'] = 'Edit Name'; -$string['view_recording_name_edithint'] = 'Edit the name. It will help to find the recording later'; +$string['view_recording_name_editlabel'] = 'Edit name'; +$string['view_recording_name_edithint'] = 'A name may be added to help identify the recording.'; $string['view_recording_tags'] = 'Tags'; $string['view_recording_playback'] = 'Playback'; $string['view_recording_preview'] = 'Preview'; @@ -557,49 +562,55 @@ $string['event_recording_unprotected'] = 'Recording unprotected'; $string['event_live_session'] = 'Live session event'; $string['event_unknown'] = 'Unknown event'; -$string['instance_type_default'] = 'Room/Activity with recordings'; -$string['instance_type_room_only'] = 'Room/Activity only'; +$string['instance_type_default'] = 'Room with recordings'; +$string['instance_type_room_only'] = 'Room only'; $string['instance_type_recording_only'] = 'Recordings only'; -$string['messageprovider:instance_updated'] = 'BigBlueButton meeting updated'; -$string['messageprovider:recording_ready'] = 'BigBlueButton recording ready to view'; +$string['messageprovider:instance_updated'] = 'BigBlueButton session updated'; +$string['messageprovider:recording_ready'] = 'BigBlueButton recording available'; $string['new_bigblubuttonbn_activities'] = 'BigBlueButton activity'; -$string['notification_instance_created_intro'] = 'The {$a->name} BigBlueButton activity has been created.'; -$string['notification_instance_created_small'] = 'A new BigBlueButton meeting named {$a->name} was created'; -$string['notification_instance_created_subject'] = 'A new BigBlueButton meeting activity has been created'; +$string['notification_instance_created_intro'] = 'The {$a->name} BigBlueButton room has been created.'; +$string['notification_instance_created_small'] = 'A new BigBlueButton room named {$a->name} was created.'; +$string['notification_instance_created_subject'] = 'A new BigBlueButton room has been created'; $string['notification_instance_description'] = 'Description'; $string['notification_instance_end_date'] = 'End date'; $string['notification_instance_name'] = 'Title'; $string['notification_instance_start_date'] = 'Start date'; -$string['notification_instance_updated_intro'] = 'The {$a->name} BigBlueButton activity has been updated.'; -$string['notification_instance_updated_small'] = 'The {$a->name} BigBlueButton meeting was updated'; -$string['notification_instance_updated_subject'] = 'Your BigBlueButton meeting activity has been updated'; -$string['notification_recording_ready_small'] = 'A new recording is available for the {$a->name} BigBlueButton meeting'; -$string['notification_recording_ready_html'] = 'A recording is now available for a recent meeting in {$a->name}.'; -$string['notification_recording_ready_plain'] = 'A recording is now available for a recent meeting in {$a->name}. See {$a->link} to view the meeting.'; -$string['notification_recording_ready_subject'] = 'Recording ready'; +$string['notification_instance_updated_intro'] = 'The {$a->name} BigBlueButton room has been updated.'; +$string['notification_instance_updated_small'] = 'The {$a->name} BigBlueButton session was updated'; +$string['notification_instance_updated_subject'] = 'Your BigBlueButton room has been updated'; +$string['notification_recording_ready_small'] = 'A recording is available for the BigBlueButton room {$a->name}.'; +$string['notification_recording_ready_html'] = 'A recording is now available for the session in the BigBlueButton room {$a->name}.'; +$string['notification_recording_ready_plain'] = 'A recording is now available for the session in the BigBlueButton room {$a->name}. Go to {$a->link} to access the recording link.'; +$string['notification_recording_ready_subject'] = 'Recording available'; -$string['view_error_meeting_not_running'] = 'Something went wrong, the meeting is not running.'; +$string['view_error_meeting_not_running'] = 'Something went wrong; the session is not running.'; $string['view_error_current_state_not_found'] = 'Current state was not found. The recording may have been deleted or the BigBlueButton server is not compatible with the action performed.'; $string['view_error_action_not_completed'] = 'Action could not be completed'; -$string['view_warning_default_server'] = 'This Moodle server is making use of the BigBlueButton testing server that comes pre-configured by default. It should be replaced for production.'; +$string['view_warning_default_server'] = 'This site is using a free BigBlueButton service for Moodle (opens in new window) provided by Blindside Networks with restrictions as follows: +
    +
  1. The maximum length for each session is 60 minutes
    2. +
  2. The maximum number of concurrent users per session is 25
    3. +
  3. Recordings expire after seven (7) days and are not downloadable
    4. +
  4. Student webcams are only visible to the moderator.
    5. +
'; $string['view_room'] = 'View room'; -$string['index_error_noinstances'] = 'There are no instances of bigbluebuttonbn'; +$string['index_error_noinstances'] = 'There are no instances of BigBlueButton rooms'; $string['index_error_bbtn'] = 'BigBlueButton ID {$a} is incorrect'; -$string['view_mobile_message_reload_page_creation_time_meeting'] = 'You exceeded the 45 seconds in this page, please reload the page to join correctly to the meeting.'; -$string['view_mobile_message_groups_not_supported'] = 'This instance is enable to work with groups but the mobile app has not support for this. Please open in desktop if you want to use the group support.'; +$string['view_mobile_message_reload_page_creation_time_meeting'] = 'You exceeded 45 seconds on this page. Please refresh the page to join the session.'; +$string['view_mobile_message_groups_not_supported'] = 'This instance is enabled to work with groups but the mobile app doesn\'t yet support it. Please use the web version.'; $string['end_session_confirm_title'] = 'Really end session?'; -$string['end_session_confirm'] = 'Are you sure you want to end the virtual classroom session?'; -$string['end_session_notification'] = 'The session has now been closed.'; +$string['end_session_confirm'] = 'Are you sure you want to end the session?'; +$string['end_session_notification'] = 'The session has ended.'; $string['cachedef_currentfetch'] = 'Data to list any recording fetched recently.'; $string['cachedef_serverinfo'] = 'Remote server information'; $string['cachedef_recordings'] = 'Recording metadata'; $string['cachedef_validatedurls'] = 'Cache of validated URL checks'; $string['taskname:check_pending_recordings'] = 'Fetch pending recordings'; -$string['userlimitreached'] = 'The number of users allowed in a meeting has been reached.'; +$string['userlimitreached'] = 'The number of users allowed in a session has been reached.'; $string['waitformoderator'] = 'Waiting for a moderator to join.'; $string['recordingurlnotfound'] = 'The recording URL is invalid.'; diff --git a/mod/data/lang/en/data.php b/mod/data/lang/en/data.php index e5f0d5c49b1..5495b77bf46 100644 --- a/mod/data/lang/en/data.php +++ b/mod/data/lang/en/data.php @@ -164,7 +164,7 @@ $string['failedpresetdelete'] = 'Error deleting a preset!'; $string['fieldadded'] = 'Field added'; $string['fieldallowautolink'] = 'Allow autolink'; $string['fielddeleted'] = 'Field deleted'; -$string['fielddelimiter'] = 'Field delimiter'; +$string['fielddelimiter'] = 'Field separator'; $string['fielddescription'] = 'Field description'; $string['fieldenclosure'] = 'Field enclosure'; $string['fieldheight'] = 'Height'; @@ -413,7 +413,7 @@ $string['uploadrecords'] = 'Upload entries from a file'; $string['uploadrecords_help'] = 'Entries may be uploaded via text file. The format of the file should be as follows: * Each line of the file contains one record -* Each record is a series of data separated by commas (or other delimiters) +* Each record is a series of data separated by the selected separator * The first record contains a list of fieldnames defining the format of the rest of the file The field enclosure is a character that surrounds each field in each record. It can normally be left unset.'; diff --git a/question/bank/customfields/lang/en/qbank_customfields.php b/question/bank/customfields/lang/en/qbank_customfields.php index 92287dd081d..f358c9a74ad 100644 --- a/question/bank/customfields/lang/en/qbank_customfields.php +++ b/question/bank/customfields/lang/en/qbank_customfields.php @@ -24,7 +24,7 @@ */ $string['pluginname'] = 'Question custom fields'; -$string['privacy:metadata'] = 'Question custom fields plugin does not store any user data.'; +$string['privacy:metadata'] = 'The Question custom fields question bank plugin does not store any personal data.'; $string['customfield'] = 'Question custom fields'; $string['customfield_islocked'] = 'Locked'; diff --git a/repository/onedrive/lang/en/repository_onedrive.php b/repository/onedrive/lang/en/repository_onedrive.php index b59019ee85a..4bd91c0371e 100644 --- a/repository/onedrive/lang/en/repository_onedrive.php +++ b/repository/onedrive/lang/en/repository_onedrive.php @@ -42,7 +42,7 @@ $string['pluginname'] = 'Microsoft OneDrive'; $string['removetempaccesstask'] = 'Remove temporary write access from controlled links'; $string['searchfor'] = 'Search for {$a}'; $string['servicenotenabled'] = 'Access not configured.'; -$string['skydrivefilesexist'] = 'The Microsoft SkyDrive repository is enabled but it has been deprecated, however, the files may be imported to the Microsoft OneDrive repository. If you haven\'t migrated the files from the SkyDrive repository yet, please migrate them before upgrading to Moodle 4.4, because by then it will not be possible to import them so they will be completely lost.'; +$string['skydrivefilesexist'] = 'The Microsoft SkyDrive repository is enabled but it has been deprecated. Please ensure you migrate files from SkyDrive to the OneDrive repository as soon as possible. In Moodle 4.4 it will no longer be possible.'; $string['skydrivefilesimported'] = 'All files were imported from the Microsoft SkyDrive repository.'; $string['skydrivefilesnotimported'] = 'Some files could not be imported from the Microsoft SkyDrive repository.'; $string['onedrive:view'] = 'View OneDrive repository'; diff --git a/theme/boost/lang/en/theme_boost.php b/theme/boost/lang/en/theme_boost.php index e948043e5a1..2c65106a296 100644 --- a/theme/boost/lang/en/theme_boost.php +++ b/theme/boost/lang/en/theme_boost.php @@ -50,15 +50,15 @@ $string['rawscsspre'] = 'Raw initial SCSS'; $string['rawscsspre_desc'] = 'In this field you can provide initialising SCSS code, it will be injected before everything else. Most of the time you will use this setting to define variables.'; $string['region-side-pre'] = 'Right'; $string['showfooter'] = 'Show footer'; -$string['unaddableblocks'] = 'Unaddable blocks'; -$string['unaddableblocks_desc'] = 'The blocks defined in this field will not be displayed in the "Add a block" list.'; +$string['unaddableblocks'] = 'Unneeded blocks'; +$string['unaddableblocks_desc'] = 'The blocks specified are not needed when using this theme and will not be listed in the \'Add a block\' menu.'; $string['privacy:metadata:preference:draweropenblock'] = 'The user\'s preference for hiding or showing the drawer with blocks.'; $string['privacy:metadata:preference:draweropenindex'] = 'The user\'s preference for hiding or showing the drawer with course index.'; $string['privacy:metadata:preference:draweropennav'] = 'The user\'s preference for hiding or showing the drawer menu navigation.'; $string['privacy:drawerindexclosed'] = 'The current preference for the index drawer is closed.'; $string['privacy:drawerindexopen'] = 'The current preference for the index drawer is open.'; -$string['privacy:drawerblockclosed'] = 'The current preference for the blocks drawer is closed.'; -$string['privacy:drawerblockopen'] = 'The current preference for the blocks drawer is open.'; +$string['privacy:drawerblockclosed'] = 'The current preference for the block drawer is closed.'; +$string['privacy:drawerblockopen'] = 'The current preference for the block drawer is open.'; $string['privacy:drawernavclosed'] = 'The current preference for the navigation drawer is closed.'; $string['privacy:drawernavopen'] = 'The current preference for the navigation drawer is open.'; From efdd77a157cc79575d7f6c16999f00122ace77fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20D=C3=A9niz?= Date: Thu, 17 Feb 2022 16:02:56 +0000 Subject: [PATCH 2/2] MDL-73812 lang: Replace modified strings in tests --- .../admin_presets/tests/behat/delete.feature | 4 +-- .../usertours/tests/behat/create_tour.feature | 26 +++++++++---------- .../tests/behat/duplicate_tour.feature | 2 +- .../usertours/tests/behat/reset_tour.feature | 2 +- .../tests/behat/tour_accessibility.feature | 8 +++--- .../tests/behat/tour_content_type.feature | 26 +++++++++---------- .../usertours/tests/behat/tour_filter.feature | 18 ++++++------- .../tests/behat/tour_navigation.feature | 14 +++++----- .../tests/behat/reconcile_xmldb_files.feature | 4 +-- badges/tests/behat/add_badge.feature | 6 ++--- badges/tests/behat/award_badge.feature | 4 +-- badges/tests/behat/nobadge_navigation.feature | 4 +-- .../tests/behat/add_instance.feature | 24 ++++++++--------- .../tests/behat/edit_instance.feature | 10 +++---- .../tests/behat/join_meeting.feature | 2 +- .../tests/behat/recordings.feature | 4 +-- .../tests/external/get_join_url_test.php | 2 +- mod/bigbluebuttonbn/tests/lib_test.php | 4 +-- mod/bigbluebuttonbn/tests/meeting_test.php | 2 +- theme/boost/tests/behat/primarynav.feature | 6 ++--- theme/boost/tests/behat/reset_tour.feature | 2 +- theme/boost/tests/behat/tour_filter.feature | 4 +-- user/tests/behat/set_default_homepage.feature | 8 +++--- 23 files changed, 93 insertions(+), 93 deletions(-) diff --git a/admin/tool/admin_presets/tests/behat/delete.feature b/admin/tool/admin_presets/tests/behat/delete.feature index aa358509d21..c6d6b821d81 100644 --- a/admin/tool/admin_presets/tests/behat/delete.feature +++ b/admin/tool/admin_presets/tests/behat/delete.feature @@ -23,7 +23,7 @@ Feature: Admin preset deletion Given I should see "Custom preset" And I open the action menu in "Custom preset" "table_row" When I choose "Delete" in the open action menu - And I should see "Are you sure you want to delete \"Custom preset\" site admin preset?" + And I should see "Are you sure you want to delete the site admin preset Custom preset?" And I should not see "This preset has been previously applied" And I click on "Cancel" "button" And I should see "Presets allow you to easily switch between different site admin configurations." @@ -42,7 +42,7 @@ Feature: Admin preset deletion And I navigate to "Site admin presets" in site administration When I open the action menu in "Custom preset" "table_row" And I choose "Delete" in the open action menu - And I should see "Are you sure you want to delete \"Custom preset\" site admin preset?" + And I should see "Are you sure you want to delete the site admin preset Custom preset?" Then I should see "This preset has been previously applied" And I click on "Delete" "button" And I should see "Presets allow you to easily switch between different site admin configurations" diff --git a/admin/tool/usertours/tests/behat/create_tour.feature b/admin/tool/usertours/tests/behat/create_tour.feature index 9a96340e426..cc15fb90436 100644 --- a/admin/tool/usertours/tests/behat/create_tour.feature +++ b/admin/tool/usertours/tests/behat/create_tour.feature @@ -17,14 +17,14 @@ Feature: Add a new user tour | Tour is enabled | 1 | And I add steps to the "First tour" tour: | targettype | Title | id_content | Content type | - | Display in middle of page | Welcome | Welcome to your personal learning space. We'd like to give you a quick tour to show you some of the areas you may find helpful | Enter manually | + | Display in middle of page | Welcome | Welcome to your personal learning space. We'd like to give you a quick tour to show you some of the areas you may find helpful | Manual | And I add steps to the "First tour" tour: | targettype | targetvalue_block | Title | id_content | Content type | - | Block | Timeline | Timeline | This is the Timeline. All of your upcoming activities can be found here | Enter manually | - | Block | Calendar | Calendar | This is the Calendar. All of your assignments and due dates can be found here | Enter manually | + | Block | Timeline | Timeline | This is the Timeline. All of your upcoming activities can be found here | Manual | + | Block | Calendar | Calendar | This is the Calendar. All of your assignments and due dates can be found here | Manual | And I add steps to the "First tour" tour: | targettype | targetvalue_selector | Title | id_content | Content type | - | Selector | .usermenu | User menu | This is your personal user menu. You'll find your personal preferences and your user profile here. | Enter manually | + | Selector | .usermenu | User menu | This is your personal user menu. You'll find your personal preferences and your user profile here. | Manual | When I am on homepage Then I should see "Welcome to your personal learning space. We'd like to give you a quick tour to show you some of the areas you may find helpful" And I click on "Next" "button" in the "[data-role='flexitour-step']" "css_element" @@ -54,7 +54,7 @@ Feature: Add a new user tour | Tour is enabled | 0 | And I add steps to the "First tour" tour: | targettype | Title | id_content | Content type | - | Display in middle of page | Welcome | Welcome to your personal learning space. We'd like to give you a quick tour to show you some of the areas you may find helpful | Enter manually | + | Display in middle of page | Welcome | Welcome to your personal learning space. We'd like to give you a quick tour to show you some of the areas you may find helpful | Manual | When I am on homepage Then I should not see "Welcome to your personal learning space. We'd like to give you a quick tour to show you some of the areas you may find helpful" @@ -71,7 +71,7 @@ Feature: Add a new user tour | Tour is enabled | 0 | And I add steps to the "First tour" tour: | targettype | Title | id_content | Content type | - | Display in middle of page | Welcome | Welcome to your personal learning space. We'd like to give you a quick tour to show you some of the areas you may find helpful | Enter manually | + | Display in middle of page | Welcome | Welcome to your personal learning space. We'd like to give you a quick tour to show you some of the areas you may find helpful | Manual | And I open the User tour settings page When I click on "Enable" "link" in the "My first tour" "table_row" And I am on homepage @@ -92,11 +92,11 @@ Feature: Add a new user tour | End tour button's label | Sample end label | And I add steps to the "Steps tour" tour: | targettype | Title | id_content | Content type | - | Display in middle of page | Welcome | First step of the Tour | Enter manually | + | Display in middle of page | Welcome | First step of the Tour | Manual | And I add steps to the "Steps tour" tour: | targettype | targetvalue_block | Title | id_content | Content type | - | Block | Timeline | Timeline | Second step of the Tour | Enter manually | - | Block | Calendar | Calendar | Third step of the Tour | Enter manually | + | Block | Timeline | Timeline | Second step of the Tour | Manual | + | Block | Calendar | Calendar | Third step of the Tour | Manual | When I am on homepage Then I should see "First step of the Tour" And I should see "Next (1/3)" @@ -126,11 +126,11 @@ Feature: Add a new user tour | Display step numbers | 0 | And I add steps to the "Steps tour" tour: | targettype | Title | id_content | Content type | - | Display in middle of page | Welcome | First step of the Tour | Enter manually | + | Display in middle of page | Welcome | First step of the Tour | Manual | And I add steps to the "Steps tour" tour: | targettype | targetvalue_block | Title | id_content | Content type | - | Block | Timeline | Timeline | Second step of the Tour | Enter manually | - | Block | Calendar | Calendar | Third step of the Tour | Enter manually | + | Block | Timeline | Timeline | Second step of the Tour | Manual | + | Block | Calendar | Calendar | Third step of the Tour | Manual | When I am on homepage Then I should see "First step of the Tour" And I should see "Next" @@ -154,7 +154,7 @@ Feature: Add a new user tour | Display step numbers | 1 | And I add steps to the "Steps tour" tour: | targettype | Title | id_content | Content type | - | Display in middle of page | Welcome | This is a single step tour | Enter manually | + | Display in middle of page | Welcome | This is a single step tour | Manual | When I am on homepage Then I should see "This is a single step tour" And I should not see "Next (1/1)" diff --git a/admin/tool/usertours/tests/behat/duplicate_tour.feature b/admin/tool/usertours/tests/behat/duplicate_tour.feature index 4b7e23eb3f4..44b84227b32 100644 --- a/admin/tool/usertours/tests/behat/duplicate_tour.feature +++ b/admin/tool/usertours/tests/behat/duplicate_tour.feature @@ -16,7 +16,7 @@ Feature: Duplicate a user tour | Tour is enabled | 0 | And I add steps to the "First tour" tour: | targettype | Title | id_content | Content type | - | Display in middle of page | Welcome | Welcome to your personal learning space. We'd like to give you a quick tour to show you some of the areas you may find helpful | Enter manually | + | Display in middle of page | Welcome | Welcome to your personal learning space. We'd like to give you a quick tour to show you some of the areas you may find helpful | Manual | And I open the User tour settings page And I should see "1" occurrences of "First tour" in the "admintable" "table" And I click on "Duplicate" "link" in the "My first tour" "table_row" diff --git a/admin/tool/usertours/tests/behat/reset_tour.feature b/admin/tool/usertours/tests/behat/reset_tour.feature index 9d5612d54b2..f6799be3c42 100644 --- a/admin/tool/usertours/tests/behat/reset_tour.feature +++ b/admin/tool/usertours/tests/behat/reset_tour.feature @@ -14,7 +14,7 @@ Feature: Reset a tour | Show with backdrop | 1 | And I add steps to the "First tour" tour: | targettype | Title | id_content | Content type | - | Display in middle of page | Welcome | Welcome tour. | Enter manually | + | Display in middle of page | Welcome | Welcome tour. | Manual | @javascript Scenario: Reset the tour with mobile view diff --git a/admin/tool/usertours/tests/behat/tour_accessibility.feature b/admin/tool/usertours/tests/behat/tour_accessibility.feature index 94c5fbc5b62..e69c90fb82d 100644 --- a/admin/tool/usertours/tests/behat/tour_accessibility.feature +++ b/admin/tool/usertours/tests/behat/tour_accessibility.feature @@ -10,14 +10,14 @@ Feature: Apply accessibility to a tour | Show with backdrop | 1 | And I add steps to the "First tour" tour: | targettype | Title | id_content | Content type | - | Display in middle of page | Welcome | Welcome tour. | Enter manually | + | Display in middle of page | Welcome | Welcome tour. | Manual | And I add steps to the tour: | targettype | targetvalue_selector | Title | id_content | Content type | - | Selector | .usermenu | User menu | Next page | Enter manually | - | Selector | .navbar-brand | Page 2 | Next page | Enter manually | + | Selector | .usermenu | User menu | Next page | Manual | + | Selector | .navbar-brand | Page 2 | Next page | Manual | And I add steps to the tour: | targettype | Title | id_content | Content type | - | Display in middle of page | Page 3 | Final page. | Enter manually | + | Display in middle of page | Page 3 | Final page. | Manual | @javascript Scenario: Check tabbing working correctly. diff --git a/admin/tool/usertours/tests/behat/tour_content_type.feature b/admin/tool/usertours/tests/behat/tour_content_type.feature index 46a3c381a79..a2e15329abb 100644 --- a/admin/tool/usertours/tests/behat/tour_content_type.feature +++ b/admin/tool/usertours/tests/behat/tour_content_type.feature @@ -23,14 +23,14 @@ Feature: Apply content type to a tour And I click on "View" "link" in the "My first tour" "table_row" When I click on "New step" "link" Then "Content type" "select" should exist - And the "Content type" select box should contain "Read from language pack" - And the "Content type" select box should contain "Enter manually" - And I select "Read from language pack" from the "Content type" singleselect - And I should see " Moodle language identifier" + And the "Content type" select box should contain "Language string ID" + And the "Content type" select box should contain "Manual" + And I select "Language string ID" from the "Content type" singleselect + And I should see " Language string ID" And "#fgroup_id_contenthtmlgrp" "css_element" should not be visible - And I select "Enter manually" from the "Content type" singleselect + And I select "Manual" from the "Content type" singleselect And "#fgroup_id_contenthtmlgrp" "css_element" should be visible - And I should not see "Moodle language identifier" + And I should not see "Language string ID" in the "#fitem_id_contentlangstring" "css_element" @javascript Scenario: Create a new step with Moodle Language content type @@ -38,18 +38,18 @@ Feature: Apply content type to a tour And I click on "View" "link" in the "My first tour" "table_row" And I click on "New step" "link" And I set the field "Title" to "tour_activityinfo_course_teacher_title,tool_usertours" - And I select "Read from language pack" from the "Content type" singleselect - And I set the field "Moodle language identifier" to "tour_activityinfo_course_teacher_content_abc,tool_usertours" + And I select "Language string ID" from the "Content type" singleselect + And I set the field "Language string ID" to "tour_activityinfo_course_teacher_content_abc,tool_usertours" When I press "Save changes" - Then I should see "Invalid language identifier" - And I set the field "Moodle language identifier" to "tour_activityinfo_course_teacher_content,tool_usertours" + Then I should see "Invalid language string ID" + And I set the field "Language string ID" to "tour_activityinfo_course_teacher_content,tool_usertours" And I press "Save changes" And I should see "New: Activity information" And I should see "New course settings 'Show completion conditions' and 'Show activity dates' enable you to choose whether activity completion conditions (if set) and/or dates are displayed for students on the course page." And I click on "Edit" "link" in the "New: Activity information" "table_row" And I should see "Editing \"New: Activity information\"" And the field "Title" matches value "tour_activityinfo_course_teacher_title,tool_usertours" - And the field "Moodle language identifier" matches value "tour_activityinfo_course_teacher_content,tool_usertours" + And the field "Language string ID" matches value "tour_activityinfo_course_teacher_content,tool_usertours" @javascript Scenario: Create a new step with manual content type @@ -57,14 +57,14 @@ Feature: Apply content type to a tour And I click on "View" "link" in the "My first tour" "table_row" And I click on "New step" "link" And I set the field "Title" to "tour_activityinfo_course_teacher_title,tool_usertours" - And I select "Enter manually" from the "Content type" singleselect + And I select "Manual" from the "Content type" singleselect And I set the field "id_content" to "Test content" And I press "Save changes" And I should see "New: Activity information" And I should see "Test content" And I click on "Edit" "link" in the "New: Activity information" "table_row" And I should see "Editing \"New: Activity information\"" - And I should not see "Moodle language identifier" + And I should not see "Language string ID" in the "#fitem_id_contentlangstring" "css_element" And the field "Title" matches value "tour_activityinfo_course_teacher_title,tool_usertours" And the field "id_content" matches value "Test content" diff --git a/admin/tool/usertours/tests/behat/tour_filter.feature b/admin/tool/usertours/tests/behat/tour_filter.feature index 6f75015287e..cad3d64736f 100644 --- a/admin/tool/usertours/tests/behat/tour_filter.feature +++ b/admin/tool/usertours/tests/behat/tour_filter.feature @@ -28,7 +28,7 @@ Feature: Apply tour filters to a tour | Role | Student,Non-editing teacher | And I add steps to the "First tour" tour: | targettype | Title | id_content | Content type | - | Display in middle of page | Welcome | Welcome to your course tour. | Enter manually | + | Display in middle of page | Welcome | Welcome to your course tour. | Manual | And I log out And I log in as "editor1" When I am on "Course 1" course homepage @@ -69,7 +69,7 @@ Feature: Apply tour filters to a tour | Category | MainCat | And I add steps to the "First tour" tour: | targettype | Title | id_content | Content type | - | Display in middle of page | Welcome | Welcome to your course tour. | Enter manually | + | Display in middle of page | Welcome | Welcome to your course tour. | Manual | And I log out And I log in as "student1" When I am on "Course 1" course homepage @@ -101,7 +101,7 @@ Feature: Apply tour filters to a tour | Course format | Weekly format | And I add steps to the "First tour" tour: | targettype | Title | id_content | Content type | - | Display in middle of page | Welcome | Welcome to your course tour. | Enter manually | + | Display in middle of page | Welcome | Welcome to your course tour. | Manual | And I log out And I log in as "student1" When I am on "Course 1" course homepage @@ -133,7 +133,7 @@ Feature: Apply tour filters to a tour | Courses | C1 | And I add steps to the "First tour" tour: | targettype | Title | id_content | Content type | - | Display in middle of page | Welcome | Welcome to your course tour. | Enter manually | + | Display in middle of page | Welcome | Welcome to your course tour. | Manual | And I log out And I log in as "student1" When I am on "Course 1" course homepage @@ -172,7 +172,7 @@ Feature: Apply tour filters to a tour | CSS selector | .modtype_wiki | And I add steps to the "Wiki tour" tour: | targettype | Title | id_content | Content type | - | Display in middle of page | Welcome | Welcome to the Wiki tour | Enter manually | + | Display in middle of page | Welcome | Welcome to the Wiki tour | Manual | And I add a new user tour with: | Name | Forum tour | | Description | A tour with both matches | @@ -181,7 +181,7 @@ Feature: Apply tour filters to a tour | CSS selector | .modtype_forum | And I add steps to the "Forum tour" tour: | targettype | Title | id_content | Content type | - | Display in middle of page | Welcome | Welcome to the Forum tour | Enter manually | + | Display in middle of page | Welcome | Welcome to the Forum tour | Manual | And I am on "Course 1" course homepage Then I should see "Welcome to the Wiki tour" And I am on "Course 2" course homepage @@ -201,7 +201,7 @@ Feature: Apply tour filters to a tour | CSS selector | #page-my-index | And I add steps to the "First tour" tour: | targettype | Title | id_content | Content type | - | Display in middle of page | Welcome | Welcome to the First tour | Enter manually | + | Display in middle of page | Welcome | Welcome to the First tour | Manual | And I add a new user tour with: | Name | Second tour | | Description | The second tour | @@ -210,7 +210,7 @@ Feature: Apply tour filters to a tour | CSS selector | #page-my-index | And I add steps to the "Second tour" tour: | targettype | Title | id_content | Content type | - | Display in middle of page | Welcome | Welcome to the Second tour | Enter manually | + | Display in middle of page | Welcome | Welcome to the Second tour | Manual | And I add a new user tour with: | Name | Third tour | | Description | The third tour | @@ -219,7 +219,7 @@ Feature: Apply tour filters to a tour | CSS selector | #page-my-index | And I add steps to the "Third tour" tour: | targettype | Title | id_content | Content type | - | Display in middle of page | Welcome | Welcome to the Third tour | Enter manually | + | Display in middle of page | Welcome | Welcome to the Third tour | Manual | And I am on homepage Then I should see "Welcome to the First tour" And I open the User tour settings page diff --git a/admin/tool/usertours/tests/behat/tour_navigation.feature b/admin/tool/usertours/tests/behat/tour_navigation.feature index 200651775e0..8be2070cd94 100644 --- a/admin/tool/usertours/tests/behat/tour_navigation.feature +++ b/admin/tool/usertours/tests/behat/tour_navigation.feature @@ -14,7 +14,7 @@ Feature: Steps can be navigated within a tour | Tour is enabled | 1 | And I add steps to the "Calendar tour" tour: | targettype | Block | Title | id_content | Content type | - | Block | Calendar | Calendar events | This is the calendar block | Enter manually | + | Block | Calendar | Calendar events | This is the calendar block | Manual | And I change window size to "large" And I follow "Dashboard" And I wait until the page is ready @@ -33,7 +33,7 @@ Feature: Steps can be navigated within a tour | Tour is enabled | 1 | And I add steps to the "Calendar tour" tour: | targettype | Block | Title | id_content | Content type | - | Block | Calendar | Calendar events | This is the calendar block | Enter manually | + | Block | Calendar | Calendar events | This is the calendar block | Manual | And I change window size to "large" And I follow "Dashboard" And I wait until the page is ready @@ -50,11 +50,11 @@ Feature: Steps can be navigated within a tour | Tour is enabled | 1 | And I add steps to the "First tour" tour: | targettype | Title | id_content | Content type | - | Display in middle of page | Welcome | Welcome to your personal learning space. We'd like to give you a quick tour to show you some of the areas you may find helpful | Enter manually | + | Display in middle of page | Welcome | Welcome to your personal learning space. We'd like to give you a quick tour to show you some of the areas you may find helpful | Manual | And I add steps to the "First tour" tour: | targettype | targetvalue_block | Title | id_content | Content type | - | Block | Timeline | Timeline | This is the Timeline. All of your upcoming activities can be found here | Enter manually | - | Block | Calendar | Calendar | This is the Calendar. All of your assignments and due dates can be found here | Enter manually | + | Block | Timeline | Timeline | This is the Timeline. All of your upcoming activities can be found here | Manual | + | Block | Calendar | Calendar | This is the Calendar. All of your assignments and due dates can be found here | Manual | When I am on homepage Then I should see "Skip tour" And I should see "Next (1/3)" @@ -74,7 +74,7 @@ Feature: Steps can be navigated within a tour | End tour button's label | CustomText | And I add steps to the "Calendar tour" tour: | targettype | Block | Title | id_content | Content type | - | Block | Calendar | Calendar events | This is the calendar block | Enter manually | + | Block | Calendar | Calendar events | This is the calendar block | Manual | And I change window size to "large" And I follow "Dashboard" And I wait until the page is ready @@ -92,7 +92,7 @@ Feature: Steps can be navigated within a tour | End tour button's label | exporttour,tool_usertours | And I add steps to the "Calendar tour" tour: | targettype | Block | Title | id_content | Content type | - | Block | Calendar | Calendar events | This is the calendar block | Enter manually | + | Block | Calendar | Calendar events | This is the calendar block | Manual | And I change window size to "large" And I follow "Dashboard" And I wait until the page is ready diff --git a/admin/tool/xmldb/tests/behat/reconcile_xmldb_files.feature b/admin/tool/xmldb/tests/behat/reconcile_xmldb_files.feature index 9d45a54b667..6ebe74e4d23 100644 --- a/admin/tool/xmldb/tests/behat/reconcile_xmldb_files.feature +++ b/admin/tool/xmldb/tests/behat/reconcile_xmldb_files.feature @@ -8,5 +8,5 @@ Feature: The Reconcile XMLDB files report works and all the files are ok Given I log in as "admin" And I navigate to "Development > XMLDB editor" in site administration When I follow "[Reconcile XMLDB files]" - Then I should see "Look for XMLDB files needing reconcile" - And I should see "All files are ok, no reconcile action needed" + Then I should see "Look for XMLDB files needing reconciling" + And I should see "All files are OK. No reconciling is needed." diff --git a/badges/tests/behat/add_badge.feature b/badges/tests/behat/add_badge.feature index c4c3240918a..276ca6546e6 100644 --- a/badges/tests/behat/add_badge.feature +++ b/badges/tests/behat/add_badge.feature @@ -17,7 +17,7 @@ Feature: Add badges to the system And I add the "Navigation" block if not present And I click on "Site pages" "list_item" in the "Navigation" "block" Given I click on "Site badges" "link" in the "Navigation" "block" - Then I should see "There are no badges available." + Then I should see "There are currently no badges available for users to earn." @javascript @_file_upload Scenario: Add a badge @@ -47,7 +47,7 @@ Feature: Add badges to the system And I should see "Test Badge Site" And I should see "testuser@example.com" And I navigate to "Badges > Manage badges" in site administration - And I should not see "There are no badges available." + And I should not see "There are currently no badges available for users to earn." @javascript @_file_upload Scenario: Add a badge related @@ -159,7 +159,7 @@ Feature: Add badges to the system And I should see "Alignments (0)" And I should not see "Create badge" And I navigate to "Badges > Manage badges" in site administration - And I should not see "There are no badges available." + And I should not see "There are currently no badges available for users to earn." # See buttons from the "Site badges" page. And I am on homepage When I click on "Site pages" "list_item" in the "Navigation" "block" diff --git a/badges/tests/behat/award_badge.feature b/badges/tests/behat/award_badge.feature index 8ca0a4bb0dd..96e51b0184d 100644 --- a/badges/tests/behat/award_badge.feature +++ b/badges/tests/behat/award_badge.feature @@ -104,7 +104,7 @@ Feature: Award badges And I add the "Navigation" block if not present And I click on "Site pages" "list_item" in the "Navigation" "block" And I click on "Site badges" "link" in the "Navigation" "block" - Then I should see "There are no badges available." + Then I should see "There are currently no badges available for users to earn." And I should not see "Manage badges" And I should not see "Add a new badge" @@ -138,7 +138,7 @@ Feature: Award badges And I press "Update profile" And I follow "Profile" in the user menu Then I should see "Profile Badge" - And I should not see "There are no badges available." + And I should not see "There are currently no badges available for users to earn." @javascript Scenario: Award site badge diff --git a/badges/tests/behat/nobadge_navigation.feature b/badges/tests/behat/nobadge_navigation.feature index 9b3a76354ae..a295649cb6c 100644 --- a/badges/tests/behat/nobadge_navigation.feature +++ b/badges/tests/behat/nobadge_navigation.feature @@ -4,7 +4,7 @@ Feature: Manage badges is not shown when there are no existing badges. Scenario: Check navigation at site level with no badges Given I log in as "admin" When I navigate to "Badges > Manage badges" in site administration - And I should see "There are no badges available" + And I should see "There are currently no badges available for users to earn" Then "Manage badges" "button" should not exist Scenario: Check navigation at course level with no badges @@ -99,4 +99,4 @@ Feature: Manage badges is not shown when there are no existing badges. And I follow "Badges" And "Manage badges" "button" should not exist And "Add a new badge" "button" should not exist - And I should not see "There are no badges available." + And I should not see "There are currently no badges available for users to earn." diff --git a/mod/bigbluebuttonbn/tests/behat/add_instance.feature b/mod/bigbluebuttonbn/tests/behat/add_instance.feature index a0dd51dfd5e..9aaf7767339 100644 --- a/mod/bigbluebuttonbn/tests/behat/add_instance.feature +++ b/mod/bigbluebuttonbn/tests/behat/add_instance.feature @@ -10,30 +10,30 @@ Feature: bigbluebuttonbn instance | fullname | shortname | category | | Test course | Test course | 0 | - Scenario: Add a mod_bigbluebuttonbn instance with Room/Activity with recordings + Scenario: Add a mod_bigbluebuttonbn instance with Room with recordings Given I am on the "Test course" "course" page logged in as "admin" And I am on "Test course" course homepage with editing mode on When I add a "BigBlueButton" to section "1" and I fill the form with: | name | BBB Instance name | - | Instance type | Room/Activity with recordings | - | Virtual classroom name | BBB Instance name | + | Instance type | Room with recordings | + | Room name | BBB Instance name | And I am on the "Test course" course page Then I should see "BBB Instance name" And I am on the "BBB Instance name" "bigbluebuttonbn activity" page - And I should see "This conference room is ready. You can join the session now." + And I should see "This room is ready. You can join the session now." And I should see "Join session" And I should see "Recordings" - Scenario: Add a mod_bigbluebuttonbn instance with Room/Activity only + Scenario: Add a mod_bigbluebuttonbn instance with Room only Given I am on the "Test course" "course" page logged in as "admin" And I am on "Test course" course homepage with editing mode on When I add a "BigBlueButton" to section "1" and I fill the form with: - | Instance type | Room/Activity only | - | Virtual classroom name | BBB Instance name | + | Instance type | Room only | + | Room name | BBB Instance name | And I am on the "Test course" course page Then I should see "BBB Instance name" And I am on the "BBB Instance name" "bigbluebuttonbn activity" page - And I should see "This conference room is ready. You can join the session now." + And I should see "This room is ready. You can join the session now." And I should see "Join session" And I should not see "Recordings" @@ -42,11 +42,11 @@ Feature: bigbluebuttonbn instance And I am on "Test course" course homepage with editing mode on When I add a "BigBlueButton" to section "1" and I fill the form with: | Instance type | Recordings only | - | Virtual classroom name | BBB Instance name | + | Room name | BBB Instance name | And I am on the "Test course" course page Then I should see "BBB Instance name" And I am on the "BBB Instance name" "bigbluebuttonbn activity" page - And I should not see "This conference room is ready. You can join the session now." + And I should not see "This room is ready. You can join the session now." And I should not see "Join session" And I should see "Recordings" @@ -59,6 +59,6 @@ Feature: bigbluebuttonbn instance Examples: | type | - | Room/Activity with recordings | - | Room/Activity only | + | Room with recordings | + | Room only | | Recordings only | diff --git a/mod/bigbluebuttonbn/tests/behat/edit_instance.feature b/mod/bigbluebuttonbn/tests/behat/edit_instance.feature index f2a577fcd2f..8777403a8bf 100644 --- a/mod/bigbluebuttonbn/tests/behat/edit_instance.feature +++ b/mod/bigbluebuttonbn/tests/behat/edit_instance.feature @@ -10,21 +10,21 @@ When a bibluebutton instance has been created I can edit it | fullname | shortname | category | | Test course | Test course | 0 | - Scenario Outline: Add a mod_bigbluebuttonbn instance with Room/Activity with recordings + Scenario Outline: Add a mod_bigbluebuttonbn instance with Room with recordings Then I log in as "admin" And I am on "Test course" course homepage with editing mode on When I add a "BigBlueButton" to section "1" and I fill the form with: | name | | | Instance type | | - | Virtual classroom name | | + | Room name | | Given I am on the "" "bigbluebuttonbn activity" page logged in as admin And I click on "Settings" "link" And the field "Instance type" matches value "" And I "Role assigned during live session" And I expand all fieldsets - And I "Session can be recorded" + And I "The session may be recorded." Examples: | activityname | instancetype | shouldseerole | shouldseesession | - | Activity with recording | Room/Activity with recordings | should see | should see | - | Activity only | Room/Activity only | should see | should see | + | Activity with recording | Room with recordings | should see | should see | + | Activity only | Room only | should see | should see | | Recordings only | Recordings only | should not see | should not see | diff --git a/mod/bigbluebuttonbn/tests/behat/join_meeting.feature b/mod/bigbluebuttonbn/tests/behat/join_meeting.feature index 96b5357cfc3..02aac8301e2 100644 --- a/mod/bigbluebuttonbn/tests/behat/join_meeting.feature +++ b/mod/bigbluebuttonbn/tests/behat/join_meeting.feature @@ -35,4 +35,4 @@ Feature: Test the ability to run the full meeting lifecycle (start to end) And I switch to the main window And I reload the page Then I should see "Room recordings" - And I should see "This conference room is ready. You can join the session now." + And I should see "This room is ready. You can join the session now." diff --git a/mod/bigbluebuttonbn/tests/behat/recordings.feature b/mod/bigbluebuttonbn/tests/behat/recordings.feature index b930270aadd..ec6ccde5fa4 100644 --- a/mod/bigbluebuttonbn/tests/behat/recordings.feature +++ b/mod/bigbluebuttonbn/tests/behat/recordings.feature @@ -53,7 +53,7 @@ Feature: The recording can be managed through the room page Scenario: I can rename the recording Given the BigBlueButtonBN server has sent recording ready notifications And I am on the "RoomRecordings" "bigbluebuttonbn activity" page logged in as admin - When I set the field "Edit Name" in the "Recording 1" "table_row" to "Recording with an updated name 1" + When I set the field "Edit name" in the "Recording 1" "table_row" to "Recording with an updated name 1" Then I should see "Recording with an updated name 1" And I should see "Recording 2" And I reload the page @@ -64,7 +64,7 @@ Feature: The recording can be managed through the room page Scenario: I can set a new description for this recording Given the BigBlueButtonBN server has sent recording ready notifications And I am on the "RoomRecordings" "bigbluebuttonbn activity" page logged in as admin - When I set the field "Edit Description" in the "Recording 1" "table_row" to "This is a new recording description 1" + When I set the field "Edit description" in the "Recording 1" "table_row" to "This is a new recording description 1" Then I should see "This is a new recording description 1" And I should see "Description 2" in the "Recording 2" "table_row" And I reload the page diff --git a/mod/bigbluebuttonbn/tests/external/get_join_url_test.php b/mod/bigbluebuttonbn/tests/external/get_join_url_test.php index 93889a272f0..141c57c9950 100644 --- a/mod/bigbluebuttonbn/tests/external/get_join_url_test.php +++ b/mod/bigbluebuttonbn/tests/external/get_join_url_test.php @@ -64,7 +64,7 @@ class get_join_url_test extends \externallib_advanced_testcase { * Test execute API CALL with no instance */ public function test_execute_no_instance() { - $this->expectExceptionMessageMatches('/No such an instance.*/'); + $this->expectExceptionMessageMatches('/No such instance.*/'); $joinurl = $this->get_join_url(1234, 5678); $this->assertIsArray($joinurl); diff --git a/mod/bigbluebuttonbn/tests/lib_test.php b/mod/bigbluebuttonbn/tests/lib_test.php index 32c545ac744..53c1e4ca7f7 100644 --- a/mod/bigbluebuttonbn/tests/lib_test.php +++ b/mod/bigbluebuttonbn/tests/lib_test.php @@ -123,7 +123,7 @@ class lib_test extends \advanced_testcase { logger::log_recording_played_event($instance, 1); $result = bigbluebuttonbn_user_outline($this->get_course(), $user, $bbactivitycm, $bbactivity); - $this->assertStringContainsString('Has joined the meeting or played a recording 2 time(s)', $result->info); + $this->assertStringContainsString(get_string('completionview_event_desc', 'mod_bigbluebuttonbn', 2), $result->info); } /** @@ -149,7 +149,7 @@ class lib_test extends \advanced_testcase { bigbluebuttonbn_user_complete($this->get_course(), $user, $bbactivitycm, $bbactivity); $output = ob_get_contents(); ob_end_clean(); - $this->assertStringContainsString('Has joined the meeting or played a recording', $output); + $this->assertStringContainsString(get_string('completionview_event_desc', 'mod_bigbluebuttonbn', 2), $output); } /** diff --git a/mod/bigbluebuttonbn/tests/meeting_test.php b/mod/bigbluebuttonbn/tests/meeting_test.php index cc9cf30a4e0..81c3e1a1e1a 100644 --- a/mod/bigbluebuttonbn/tests/meeting_test.php +++ b/mod/bigbluebuttonbn/tests/meeting_test.php @@ -175,7 +175,7 @@ class meeting_test extends \advanced_testcase { $this->assertEquals($canjoin['useringroup'], $meeting->can_join()); if ($meeting->can_join()) { $meetinginfo = $meeting->get_meeting_info(); - $this->assertStringContainsString("This conference is in progress", $meetinginfo->statusmessage); + $this->assertStringContainsString("The session is in progress.", $meetinginfo->statusmessage); } if ($groupname) { $this->setUser($usernotingroup); diff --git a/theme/boost/tests/behat/primarynav.feature b/theme/boost/tests/behat/primarynav.feature index ec0299271fa..ce2c9653e4e 100644 --- a/theme/boost/tests/behat/primarynav.feature +++ b/theme/boost/tests/behat/primarynav.feature @@ -28,11 +28,11 @@ Feature: Primary navigation Scenario Outline: Admin sets defaulthomepage to user preference and verifies the landing page based on it Given I log in as "admin" And I navigate to "Appearance > Navigation" in site administration - And I set the field "Home page for users" to "User preference" + And I set the field "Start page for users" to "User preference" And I press "Save changes" And I follow "Preferences" in the user menu - And I follow "Home page" - And I set the field "Home page" to "" + And I follow "Start page" + And I set the field "Start page" to "" And I press "Save changes" And the following config values are set as admin: | defaulthomepage | 2 | diff --git a/theme/boost/tests/behat/reset_tour.feature b/theme/boost/tests/behat/reset_tour.feature index 4a1c0f2bc5c..dc080d79d86 100644 --- a/theme/boost/tests/behat/reset_tour.feature +++ b/theme/boost/tests/behat/reset_tour.feature @@ -14,7 +14,7 @@ Feature: Reset a tour for Boost | Show with backdrop | 1 | And I add steps to the "First tour" tour: | targettype | Title | id_content | Content type | - | Display in middle of page | Welcome | Welcome tour. | Enter manually | + | Display in middle of page | Welcome | Welcome tour. | Manual | @javascript Scenario: Reset the tour with desktop view diff --git a/theme/boost/tests/behat/tour_filter.feature b/theme/boost/tests/behat/tour_filter.feature index ad87463ec2f..dee42f4ccf6 100644 --- a/theme/boost/tests/behat/tour_filter.feature +++ b/theme/boost/tests/behat/tour_filter.feature @@ -15,7 +15,7 @@ Feature: Apply tour filters to a tour for Classic | Theme | Classic | And I add steps to the "First tour" tour: | targettype | Title | id_content | Content type | - | Display in middle of page | Welcome | Welcome to your personal learning space. We'd like to give you a quick tour to show you some of the areas you may find helpful | Enter manually | + | Display in middle of page | Welcome | Welcome to your personal learning space. We'd like to give you a quick tour to show you some of the areas you may find helpful | Manual | When I am on homepage Then I should not see "Welcome to your personal learning space. We'd like to give you a quick tour to show you some of the areas you may find helpful" @@ -30,6 +30,6 @@ Feature: Apply tour filters to a tour for Classic | Theme | Boost | And I add steps to the "First tour" tour: | targettype | Title | id_content | Content type | - | Display in middle of page | Welcome | Welcome to your personal learning space. We'd like to give you a quick tour to show you some of the areas you may find helpful | Enter manually | + | Display in middle of page | Welcome | Welcome to your personal learning space. We'd like to give you a quick tour to show you some of the areas you may find helpful | Manual | When I am on homepage Then I should see "Welcome to your personal learning space. We'd like to give you a quick tour to show you some of the areas you may find helpful" diff --git a/user/tests/behat/set_default_homepage.feature b/user/tests/behat/set_default_homepage.feature index 1af719b2af7..eeb51b72c78 100644 --- a/user/tests/behat/set_default_homepage.feature +++ b/user/tests/behat/set_default_homepage.feature @@ -33,7 +33,7 @@ Feature: Set the site home page and dashboard as the default home page | Page contexts | Display throughout the entire site | And I press "Save changes" And I navigate to "Appearance > Navigation" in site administration - And I set the field "Home page for users" to "User preference" + And I set the field "Start page for users" to "User preference" And I press "Save changes" And I am on site homepage And I follow "Make this my home page" @@ -57,13 +57,13 @@ Feature: Set the site home page and dashboard as the default home page Scenario Outline: User can configure their preferred default home page when allowed by admin Given I log in as "admin" And I navigate to "Appearance > Navigation" in site administration - And I set the field "Home page for users" to "User preference" + And I set the field "Start page for users" to "User preference" And I press "Save changes" And I log out When I log in as "user1" And I follow "Preferences" in the user menu - And I follow "Home page" - And I set the field "Home page" to "" + And I follow "Start page" + And I set the field "Start page" to "" And I press "Save changes" And I log out And I log in as "user1"