You must enter the special "loginas password" to use this feature.
If you do not know it, ask your server administrator.
Hi!
@@ -1337,19 +1337,15 @@ $string['moddoesnotsupporttype'] = 'Module {$a->modname} does not support upload $string['modhide'] = 'Hide'; $string['modshow'] = 'Show'; $string['modvisible'] = 'Availability'; -$string['modvisible_help'] = 'If the availability is set to \'Show on course page\', the activity or resource is available to students (subject to any access restrictions which may be set). - -If the availability is set to \'Hide from students\', the activity or resource is only available to users with permission to view hidden activities (by default, users with the role of teacher or non-editing teacher).'; +$string['modvisible_help'] = '* Show on course page: Available to students (subject to any access restrictions which may be set). +* Hide on course page: Not available to students.'; $string['modvisiblewithstealth'] = 'Availability'; -$string['modvisiblewithstealth_help'] = 'If the availability is set to \'Show on course page\', the activity or resource is available to students (subject to any access restrictions which may be set). - -If the availability is set to \'Hide from students\', the activity or resource is only available to users with permission to view hidden activities (by default, users with the role of teacher or non-editing teacher). - -If the course contains many activities or resources, the course page may be simplified by setting the availability to \'Make available but not shown on course page\'. In this case, a link to the activity or resource must be provided from elsewhere, such as from a page resource. The activity would still be listed in the gradebook and other reports.'; +$string['modvisiblewithstealth_help'] = '* Show on course page: Available to students (subject to any access restrictions which may be set). +* Hide on course page: Not available to students. +* Make available but don\'t show on course page: Available to students if you provide a link. Activities will still appear in the gradebook and other reports.'; $string['modvisiblehiddensection'] = 'Availability'; -$string['modvisiblehiddensection_help'] = 'If the availability is set to \'Hide from students\', the activity or resource is only available to users with permission to view hidden activities (by default, users with the role of teacher or non-editing teacher). - -If the course contains many activities or resources, the course page may be simplified by setting the availability to \'Make available but not shown on course page\'. In this case, a link to the activity or resource must be provided from elsewhere, such as from a page resource. The activity would still be listed in the gradebook and other reports.'; +$string['modvisiblehiddensection_help'] = '* Hide on course page: Not available to students. +* Make available but don\'t show on course page: Available to students if you provide a link. Activities will still appear in the gradebook and other reports.'; $string['moodlelogo'] = 'Moodle logo'; $string['month'] = 'Month'; $string['months'] = 'Months'; @@ -1372,7 +1368,7 @@ $string['moreprofileinfoneeded'] = 'Please tell us more about yourself'; $string['morenavigationlinks'] = 'More...'; $string['mostrecently'] = 'most recently'; $string['move'] = 'Move'; -$string['movecoursemodule'] = 'Move resource'; +$string['movecoursemodule'] = 'Move activity'; $string['movecoursesection'] = 'Move section'; $string['movecontent'] = 'Move {$a}'; $string['movecontentafter'] = 'After "{$a}"'; diff --git a/lib/editor/tiny/plugins/accessibilitychecker/tests/behat/accessibilitychecker.feature b/lib/editor/tiny/plugins/accessibilitychecker/tests/behat/accessibilitychecker.feature index 46e5df3499b..2a18e5609a4 100644 --- a/lib/editor/tiny/plugins/accessibilitychecker/tests/behat/accessibilitychecker.feature +++ b/lib/editor/tiny/plugins/accessibilitychecker/tests/behat/accessibilitychecker.feature @@ -27,7 +27,7 @@ Feature: Tiny editor accessibility checker And I should see "Images require alternative text." in the "Accessibility checker" "dialogue" And I click on "View" "link" in the "Accessibility checker" "dialogue" And I click on the "Image" button for the "Description" TinyMCE editor - And the field "Enter URL" matches value "/broken-image" + And the field "URL" matches value "/broken-image" And I set the field "Describe this image for someone who cannot see it" to "No more warning!" And I press "Save image" And I click on the "Tools > Accessibility checker" menu item for the "Description" TinyMCE editor @@ -35,7 +35,7 @@ Feature: Tiny editor accessibility checker And I click on "Close" "button" in the "Accessibility checker" "dialogue" And I select the "img" element in position "2" of the "Description" TinyMCE editor And I click on the "Image" button for the "Description" TinyMCE editor - And I set the field "Enter URL" to "/decorative-image.png" + And I set the field "URL" to "/decorative-image.png" And I set the field "Describe this image for someone who cannot see it" to "" And I set the field "Width" to "1" And I set the field "Height" to "1" diff --git a/lib/editor/tiny/plugins/media/lang/en/tiny_media.php b/lib/editor/tiny/plugins/media/lang/en/tiny_media.php index 4b4b740453a..0d266132e91 100644 --- a/lib/editor/tiny/plugins/media/lang/en/tiny_media.php +++ b/lib/editor/tiny/plugins/media/lang/en/tiny_media.php @@ -56,10 +56,10 @@ $string['descriptions'] = 'Descriptions'; $string['descriptionssourcelabel'] = 'Description track URL'; $string['displayoptions'] = 'Display options'; $string['enteralt'] = 'Describe this image for someone who cannot see it'; -$string['entername'] = 'Enter name'; +$string['entername'] = 'Name'; $string['entersource'] = 'Source URL'; -$string['entertitle'] = 'Enter title'; -$string['enterurl'] = 'Enter URL'; +$string['entertitle'] = 'Title'; +$string['enterurl'] = 'URL'; $string['filemanager'] = 'File manager'; $string['hasmissingfiles'] = 'Warning! The following files that are referenced in the text area appear to be missing:'; $string['height'] = 'Height'; @@ -87,7 +87,7 @@ $string['presentationoraltrequired'] = 'An image must have a description, unless $string['privacy:metadata'] = 'The media plugin for TinyMCE does not store any personal data.'; $string['remove'] = 'Remove'; $string['saveimage'] = 'Save image'; -$string['size'] = 'Size'; +$string['size'] = 'Width x height (in pixels)'; $string['srclang'] = 'Language'; $string['subtitles_help'] = 'Subtitles may be used to provide a transcription or translation of the dialogue.'; $string['subtitles'] = 'Subtitles'; diff --git a/lib/editor/tiny/plugins/media/tests/behat/video.feature b/lib/editor/tiny/plugins/media/tests/behat/video.feature index feebb2a6616..abfd2c4aab4 100644 --- a/lib/editor/tiny/plugins/media/tests/behat/video.feature +++ b/lib/editor/tiny/plugins/media/tests/behat/video.feature @@ -40,7 +40,7 @@ Feature: Use the TinyMCE editor to upload a video And I select the "video" element in position "1" of the "Description" TinyMCE editor When I click on the "Multimedia" button for the "Description" TinyMCE editor And I click on "Display options" "link" - And I set the field "Enter title" to "Test title" + And I set the field "Title" to "Test title" And I click on "Advanced settings" "link" And I click on "Play automatically" "checkbox" And I click on "Muted" "checkbox" @@ -51,7 +51,7 @@ Feature: Use the TinyMCE editor to upload a video And I select the "video" element in position "1" of the "Description" TinyMCE editor And I click on the "Multimedia" button for the "Description" TinyMCE editor And I click on "Display options" "link" - And the field "Enter title" matches value "Test title" + And the field "Title" matches value "Test title" And I click on "Advanced settings" "link" And the field "Play automatically" matches value "1" And the field "Muted" matches value "1" diff --git a/mod/assign/lang/en/assign.php b/mod/assign/lang/en/assign.php index cf44e3b3b68..88071751253 100644 --- a/mod/assign/lang/en/assign.php +++ b/mod/assign/lang/en/assign.php @@ -27,7 +27,7 @@ $string['activitydate:submissionsdue'] = 'Due:'; $string['activitydate:submissionsopen'] = 'Opens:'; $string['activitydate:submissionsopened'] = 'Opened:'; $string['activityeditor'] = 'Activity instructions'; -$string['activityeditor_help'] = 'The actions you would like the student to complete for this assignment. This is only shown on the submission page where a students edits and submits their assignment.'; +$string['activityeditor_help'] = 'The actions you would like the student to complete for this assignment. This is only shown on the submission page where a student edits and submits their assignment.'; $string['activityoverview'] = 'You have assignments that need attention'; $string['addattempt'] = 'Allow another attempt'; $string['addnewattempt'] = 'Add a new attempt'; diff --git a/mod/assign/tests/behat/assign_user_override.feature b/mod/assign/tests/behat/assign_user_override.feature index ac98964a963..3f53d0cfa3a 100644 --- a/mod/assign/tests/behat/assign_user_override.feature +++ b/mod/assign/tests/behat/assign_user_override.feature @@ -208,7 +208,7 @@ Feature: Assign user override Given I am on the "Test assignment name" Activity page logged in as teacher1 And I navigate to "Settings" in current page administration And I expand all fieldsets - And I set the field "Availability" to "Hide from students" + And I set the field "Availability" to "Hide on course page" And I click on "Save and display" "button" When I navigate to "Overrides" in current page administration And I press "Add user override" diff --git a/mod/bigbluebuttonbn/lang/en/bigbluebuttonbn.php b/mod/bigbluebuttonbn/lang/en/bigbluebuttonbn.php index 00b13420ec2..bf620214419 100644 --- a/mod/bigbluebuttonbn/lang/en/bigbluebuttonbn.php +++ b/mod/bigbluebuttonbn/lang/en/bigbluebuttonbn.php @@ -183,7 +183,7 @@ $string['config_recordings_preview_default_description'] = 'If enabled the table $string['config_recordings_preview_editable'] = 'Preview feature can be edited'; $string['config_recordings_preview_editable_description'] = 'Preview feature can be edited when the instance is added or updated.'; $string['config_recordings_asc_sort'] = 'List recordings in chronological order'; -$string['config_recordings_asc_sort_description'] = 'Recordings are ordered by date, either chronological or reverse chronological order.'; +$string['config_recordings_asc_sort_description'] = 'Recordings are ordered by date, either chronological or reverse chronological order (most recent recording first).'; $string['config_importrecordings'] = 'Import recordings'; $string['config_importrecordings_description'] = 'These settings are feature specific.'; diff --git a/mod/forum/lang/en/forum.php b/mod/forum/lang/en/forum.php index 388758cb59b..98af38c6535 100644 --- a/mod/forum/lang/en/forum.php +++ b/mod/forum/lang/en/forum.php @@ -95,8 +95,8 @@ $string['cannotfavourite'] = 'Sorry, but you do not have the permission to star $string['cannottrack'] = 'Could not stop tracking that forum'; $string['cannotunsubscribe'] = 'Could not unsubscribe you from that forum'; $string['cannotupdatepost'] = 'You can not update this post'; -$string['cannotuseseperategroupsandsingletopic'] = 'Separate groups cannot be used with single discussion topic'; -$string['cannotusesingletopicandseperategroups'] = 'Single discussion topic cannot be used with separate groups'; +$string['cannotuseseperategroupsandsingletopic'] = 'Separate groups can\'t be used with a single simple discussion.'; +$string['cannotusesingletopicandseperategroups'] = 'A single simple discussion can\'t be used with separate groups.'; $string['cannotviewpostyet'] = 'You can\'t read other students\' posts in this discussion yet because you haven\'t posted.'; $string['cannotviewusersposts'] = 'There are no posts made by this user that you are able to view.'; $string['cleanreadtime'] = 'Mark old posts as read hour'; @@ -508,7 +508,7 @@ $string['parentofthispost'] = 'Parent of this post'; $string['permalink'] = 'Permalink'; $string['permanentlinktopost'] = 'Permanent link to this post'; $string['permanentlinktoparentpost'] = 'Permanent link to the parent of this post'; -$string['postisprivatereply'] = 'This is a private reply. It is only visible to you and anyone with the capability to view private replies, such as teachers or managers.'; +$string['postisprivatereply'] = 'This is a private reply. (Teachers and other users with the capability to view private replies can also see it.)'; $string['pindiscussion'] = 'Pin this discussion'; $string['pinupdated'] = 'The pin option has been updated.'; $string['posttomygroups'] = 'Post a copy to all groups'; @@ -602,7 +602,7 @@ $string['privacy:request:delete:post:message'] = 'The content of this post has b $string['privacy:request:delete:post:subject'] = 'Delete at the request of the author'; $string['privacy:subscribedtoforum'] = 'You are subscribed to this forum.'; $string['privatereply'] = 'Reply privately'; -$string['privatereply_help'] = 'A private reply can only be viewed by the author of the post being replied to, and any users with the capability to view private replies.'; +$string['privatereply_help'] = 'When you reply privately, your post is also visible to users with the capability to view private replies, such as teachers.'; $string['processingdigest'] = 'Processing email digest for user {$a}'; $string['processingpost'] = 'Processing post {$a}'; $string['prune'] = 'Split'; diff --git a/mod/forum/tests/behat/add_forum.feature b/mod/forum/tests/behat/add_forum.feature index 885a29335ca..d32f7bb8ba7 100644 --- a/mod/forum/tests/behat/add_forum.feature +++ b/mod/forum/tests/behat/add_forum.feature @@ -57,5 +57,5 @@ Feature: Add forum activities and discussions | Forum type | single | | Group mode | 1 | When I press "Save and display" - Then I should see "Separate groups cannot be used with single discussion topic" - And I should see "Single discussion topic cannot be used with separate groups" + Then I should see "Separate groups can't be used with a single simple discussion." + And I should see "A single simple discussion can't be used with separate groups." diff --git a/mod/forum/tests/behat/forum_subscriptions_availability.feature b/mod/forum/tests/behat/forum_subscriptions_availability.feature index dea0a8e8516..560528f3c67 100644 --- a/mod/forum/tests/behat/forum_subscriptions_availability.feature +++ b/mod/forum/tests/behat/forum_subscriptions_availability.feature @@ -97,7 +97,7 @@ Feature: As a teacher I need to see an accurate list of subscribed users And I am on the "Forced Forum 2" "forum activity editing" page And I set the following fields to these values: | Subscription mode | Forced subscription | - | Availability | Hide from students | + | Availability | Hide on course page | And I press "Save and return to course" And I am on the "Forced Forum 2" "forum activity" page And I navigate to "Subscriptions" in current page administration diff --git a/mod/forum/tests/behat/guest_users.feature b/mod/forum/tests/behat/guest_users.feature index 14402630c63..aba0defa276 100644 --- a/mod/forum/tests/behat/guest_users.feature +++ b/mod/forum/tests/behat/guest_users.feature @@ -28,7 +28,7 @@ Feature: Guest and not logged users could see the option to add new post or repl | Message | How awesome is this forum discussion? | And I log out And I am on "Course 1" course homepage - When I press "Log in as a guest" + When I press "Access as a guest" And I am on the "Forum" "forum activity" page Then I should not see "Add discussion topic" And I should see "Forum discussion 1" @@ -47,7 +47,7 @@ Feature: Guest and not logged users could see the option to add new post or repl | forum | Forum (single discussion) | C1 | forum | single | And I log out And I am on "Course 1" course homepage - When I press "Log in as a guest" + When I press "Access as a guest" And I am on the "Forum (single discussion)" "forum activity" page Then I should not see "Add discussion topic" And I should see "Forum (single discussion)" @@ -62,7 +62,7 @@ Feature: Guest and not logged users could see the option to add new post or repl | Message | How awesome is this forum discussion? | And I log out And I am on "Course 1" course homepage - When I press "Log in as a guest" + When I press "Access as a guest" And I am on the "Forum" "forum activity" page Then I should not see "Add discussion topic" And I should see "Forum discussion 1" @@ -79,7 +79,7 @@ Feature: Guest and not logged users could see the option to add new post or repl | Message | How awesome is this forum discussion? | And I log out And I am on "Course 1" course homepage - When I press "Log in as a guest" + When I press "Access as a guest" And I am on the "Forum" "forum activity" page Then I should see "Add discussion topic" And I click on "Add discussion topic" "link" @@ -107,7 +107,7 @@ Feature: Guest and not logged users could see the option to add new post or repl | forum | Forum (single discussion) | C1 | forum | single | And I log out And I am on "Course 1" course homepage - When I press "Log in as a guest" + When I press "Access as a guest" And I am on the "Forum (single discussion)" "forum activity" page And I should see "Forum (single discussion)" Then I should see "Reply" @@ -130,7 +130,7 @@ Feature: Guest and not logged users could see the option to add new post or repl | Message | How awesome is this forum discussion? | And I log out And I am on "Course 1" course homepage - When I press "Log in as a guest" + When I press "Access as a guest" And I am on the "Forum" "forum activity" page Then I should see "Add discussion topic" And I click on "Add discussion topic" "link" diff --git a/mod/forum/tests/behat/inpage_reply.feature b/mod/forum/tests/behat/inpage_reply.feature index b55fd7e8005..73ded216451 100644 --- a/mod/forum/tests/behat/inpage_reply.feature +++ b/mod/forum/tests/behat/inpage_reply.feature @@ -42,6 +42,6 @@ Feature: Students can reply to a discussion in page. | post | Discussion contents 1, third message | | privatereply | 1 | Then I should see "Discussion contents 1, third message" - Then I should see "This is a private reply. It is only visible to you and anyone with the capability to view private replies, such as teachers or managers." + Then I should see "This is a private reply. (Teachers and other users with the capability to view private replies can also see it.)" When I reload the page Then I should see "Discussion contents 1, third message" diff --git a/mod/label/tests/behat/label_visibility.feature b/mod/label/tests/behat/label_visibility.feature index c57e0392f32..a4ea75942d4 100644 --- a/mod/label/tests/behat/label_visibility.feature +++ b/mod/label/tests/behat/label_visibility.feature @@ -57,8 +57,8 @@ Feature: Check label visibility works And "Swanky label" actions menu should not have "Make unavailable" item And I click on "Edit settings" "link" in the "Swanky label" activity And I expand all fieldsets - And the "Availability" select box should contain "Hide from students" - And the "Availability" select box should not contain "Make available but not shown on course page" + And the "Availability" select box should contain "Hide on course page" + And the "Availability" select box should not contain "Make available but don't show on course page" And the "Availability" select box should not contain "Show on course page" And I log out And I log in as "student" diff --git a/mod/lesson/tests/behat/lesson_user_override.feature b/mod/lesson/tests/behat/lesson_user_override.feature index 7a331f5ca25..47a33997384 100644 --- a/mod/lesson/tests/behat/lesson_user_override.feature +++ b/mod/lesson/tests/behat/lesson_user_override.feature @@ -329,7 +329,7 @@ Feature: Lesson user override Scenario: Create a user override when the lesson is not available to the student Given I am on the "Test lesson name" "lesson activity editing" page logged in as teacher1 And I expand all fieldsets - And I set the field "Availability" to "Hide from students" + And I set the field "Availability" to "Hide on course page" And I click on "Save and display" "button" When I navigate to "Overrides" in current page administration And I follow "Add user override" diff --git a/mod/quiz/accessrule/seb/lang/en/quizaccess_seb.php b/mod/quiz/accessrule/seb/lang/en/quizaccess_seb.php index c2b478343a7..34481a850d4 100644 --- a/mod/quiz/accessrule/seb/lang/en/quizaccess_seb.php +++ b/mod/quiz/accessrule/seb/lang/en/quizaccess_seb.php @@ -64,7 +64,7 @@ $string['fileparsefailed'] = 'The uploaded file could not be saved as a SEB conf $string['httplinkbutton'] = 'Download configuration'; $string['invalid_browser_key'] = "Invalid SEB browser key"; $string['invalid_config_key'] = "Invalid SEB config key"; -$string['invalidkeys'] = "The config key or browser exam keys could not be validated. Please ensure you are using the Safe Exam Browser with correct configuration file."; +$string['invalidkeys'] = 'The Safe Exam Browser keys could not be validated. Check that you\'re using Safe Exam Browser with the correct configuration file.'; $string['invalidtemplate'] = "Invalid SEB config template"; $string['manage_templates'] = 'Safe Exam Browser templates'; $string['managetemplates'] = 'Manage templates'; @@ -180,7 +180,7 @@ $string['seb_use_upload'] = 'Yes – Upload my own config'; $string['seb_userconfirmquit'] = 'Ask user to confirm quitting'; $string['seb_userconfirmquit_help'] = 'If enabled, users have to confirm quitting of SEB when a quit link is detected.'; $string['sebdownloadbutton'] = 'Download Safe Exam Browser'; -$string['sebkeysvalidationfailed'] = 'SEB keys validation failed'; +$string['sebkeysvalidationfailed'] = 'Error validating SEB keys'; $string['seblinkbutton'] = 'Launch Safe Exam Browser'; $string['sebrequired'] = "This quiz has been configured so that students may only attempt it using the Safe Exam Browser."; $string['setting:autoreconfigureseb'] = 'Auto-configure SEB'; diff --git a/mod/quiz/accessrule/seb/tests/rule_test.php b/mod/quiz/accessrule/seb/tests/rule_test.php index b36c20b24c9..dccca8fc453 100644 --- a/mod/quiz/accessrule/seb/tests/rule_test.php +++ b/mod/quiz/accessrule/seb/tests/rule_test.php @@ -344,8 +344,8 @@ class rule_test extends \advanced_testcase { // Check that correct error message is returned. $errormsg = $this->make_rule()->prevent_access(); $this->assertNotEmpty($errormsg); - $this->assertStringContainsString("The config key or browser exam keys could not be validated. " - . "Please ensure you are using the Safe Exam Browser with correct configuration file.", $errormsg); + $this->assertStringContainsString("The Safe Exam Browser keys could not be validated. " + . "Check that you're using Safe Exam Browser with the correct configuration file.", $errormsg); $this->assertStringContainsString($this->get_seb_download_link(), $errormsg); $this->assertStringContainsString($this->get_seb_launch_link(), $errormsg); $this->assertStringContainsString($this->get_seb_config_download_link(), $errormsg); @@ -601,8 +601,8 @@ class rule_test extends \advanced_testcase { // Check that correct error message is returned. $errormsg = $this->make_rule()->prevent_access(); $this->assertNotEmpty($errormsg); - $this->assertStringContainsString("The config key or browser exam keys could not be validated. " - . "Please ensure you are using the Safe Exam Browser with correct configuration file.", $errormsg); + $this->assertStringContainsString("The Safe Exam Browser keys could not be validated. " + . "Check that you're using Safe Exam Browser with the correct configuration file.", $errormsg); if ($downloadseblink) { $this->assertStringContainsString($this->get_seb_download_link(), $errormsg);