mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-83238-main-enfix' of https://github.com/mudrd8mz/moodle

Browse Source
This commit is contained in:
Jun Pataleta 2024-10-03 16:01:53 +08:00
commit 62b8b3709d
No known key found for this signature in database
GPG Key ID: F83510526D99E2C7
29 changed files with 62 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/tool/behat/tests/behat/tabs.feature
View File

@ -25,7 +25,7 @@ Feature: Confirm that we can open multiple browser tabs
And I open a tab named "CourseViewer4" on the "My courses" page
# Switch between all the tabs and confirm their different contents.
Then I should see "You're not enrolled in any course"
Then I should see "You're not enrolled in any courses."
And I switch to "CourseViewer2" tab
And "Course 3" "heading" should exist
And I switch to "CourseViewer1" tab

6
badges/tests/behat/add_badge.feature
View File

@ -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 matching badges available for users to earn"
Then I should see "There are no matching badges available for users to earn."
@javascript @_file_upload
Scenario: Add a site badge
@ -53,7 +53,7 @@ Feature: Add badges to the system
And I should see "Math"
And I should see "Physics"
And I navigate to "Badges > Manage badges" in site administration
And I should not see "There are no matching badges available for users to earn"
And I should not see "There are no matching badges available for users to earn."
@javascript @_file_upload
Scenario: Add a badge related
@ -164,7 +164,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 matching badges available for users to earn"
And I should not see "There are no matching 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"

4
badges/tests/behat/award_badge.feature
View File

@ -100,7 +100,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 matching badges available for users to earn"
Then I should see "There are no matching badges available for users to earn."
And I should not see "Add a new badge"
@javascript
@ -136,7 +136,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 matching badges available for users to earn"
And I should not see "There are no matching badges available for users to earn."
@javascript
Scenario: Award site badge

2
badges/tests/behat/delete_awarded_badge.feature
View File

@ -39,7 +39,7 @@ Feature: Delete course badge already awarded
And the following <shouldtable> exist in the "reportbuilder-table" table:
| Name | Badge status |
| Testing badge 1 | Archived |
And I <shouldmsg> see "There are no matching badges available for users to earn"
And I <shouldmsg> see "There are no matching badges available for users to earn."
# Confirm that badge is retained in the first case as awarded badge but not in the second.
And I am on the "Course 1" "enrolled users" page
And I click on "Student 1" "link"

2
badges/tests/behat/manage_badges.feature
View File

@ -47,7 +47,7 @@ Feature: Manage badges
And I navigate to "Badges > Manage badges" in site administration
And I press "Delete" action in the "Badge #1" report row
And I press "Delete and remove existing issued badges"
Then I should see "There are no matching badges available for users to earn"
Then I should see "There are no matching badges available for users to earn."
Scenario Outline: Filter managed badges
Given the following "core_badges > Badges" exist:

2
badges/tests/behat/nobadge_navigation.feature
View File

@ -4,7 +4,7 @@ Feature: Badges 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
Then I should see "There are no matching badges available for users to earn"
Then I should see "There are no matching badges available for users to earn."
Scenario: Check navigation at course level with no badges
Given the following "users" exist:

2
blocks/myoverview/lang/en/block_myoverview.php
View File

@ -88,7 +88,7 @@ $string['sortbylastaccessed'] = 'Sort by last accessed';
$string['sortbyshortname'] = 'Sort by short name';
$string['privacy:request:preference:set'] = 'The value of the setting \'{$a->name}\' was \'{$a->value}\'';
$string['viewquickstart'] = 'View Quickstart guide';
$string['zero_default_title'] = 'You\'re not enrolled in any course';
$string['zero_default_title'] = 'You\'re not enrolled in any courses.';
$string['zero_default_intro'] = 'Once you\'re enrolled in a course, it will appear here.';
$string['zero_nocourses_intro'] = 'Need help getting started? Check out the <a href="{$a->dochref}" title="{$a->doctitle}" target="{$a->doctarget}">Moodle documentation</a>.';
$string['zero_nocourses_title'] = 'Create your first course';

2
blocks/myoverview/tests/behat/block_myoverview_pagination.feature
View File

@ -35,7 +35,7 @@ Feature: My overview block pagination
Scenario: The pagination controls should be hidden if I am not enrolled in any courses
When I am on the "My courses" page logged in as "student1"
Then I should see "You're not enrolled in any course" in the "Course overview" "block"
Then I should see "You're not enrolled in any courses." in the "Course overview" "block"
And I should not see "Show" in the "Course overview" "block"
And ".block_myoverview .dropdown-menu.show" "css_element" should not be visible
And ".block_myoverview [data-control='next']" "css_element" should not be visible

2
blocks/myoverview/tests/behat/block_myoverview_search.feature
View File

@ -40,7 +40,7 @@ Feature: My overview block searching
Scenario: There is no search if I am not enrolled in any course
When I am on the "My courses" page logged in as "student2"
Then I should see "You're not enrolled in any course" in the "Course overview" "block"
Then I should see "You're not enrolled in any courses." in the "Course overview" "block"
And "Search courses" "field" should not exist in the "Course overview" "block"
And I log out

6
blocks/myoverview/tests/behat/block_myoverview_zerostate.feature
View File

@ -15,7 +15,7 @@ Feature: Zero state on my overview block
Scenario: Users with no permissions don't see any CTA
Given I am on the "My courses" page logged in as "user"
When I should see "You're not enrolled in any course"
When I should see "You're not enrolled in any courses."
Then I should see "Once you're enrolled in a course, it will appear here."
And I should not see "Create course"
And I should not see "Request a course"
@ -60,7 +60,7 @@ Feature: Zero state on my overview block
| fullname | Course 1 |
| shortname | C1 |
When I am on the "My courses" page logged in as "manager"
Then I should see "You're not enrolled in any course"
Then I should see "You're not enrolled in any courses."
Then I should see "Once you're enrolled in a course, it will appear here."
And "Manage courses" "button" should exist
And "Create course" "button" should exist
@ -78,7 +78,7 @@ Feature: Zero state on my overview block
| fullname | Course 1 |
| shortname | C1 |
When I am on the "My courses" page logged in as "manager"
Then I should see "You're not enrolled in any course"
Then I should see "You're not enrolled in any courses."
Then I should not see "To view all courses on this sie, go to Manage courses"
And "Manage courses" "button" should not exist
And "Create course" "button" should exist

6
customfield/field/number/lang/en/customfield_number.php
View File

@ -35,7 +35,7 @@ $string['display_help'] = 'How to display the value of the field. Use the follow
* **{value}** - display value in a general format (float with decimals configured in the field)
* **$ {value}** - price in dollars
* **{value} hrs** - duration in hours';
$string['displayvalueconfigerror'] = 'The placeholder is not invalid';
$string['displayvalueconfigerror'] = 'Invalid placeholder';
$string['displaywhenzero'] = 'Display when zero';
$string['displaywhenzero_help'] = 'How to display the field value when the value is "0". For example, in case of a price you can display the word "Free" but in case of the duration you may want to leave it empty since it means that the duration was not estimated.
@ -43,14 +43,14 @@ Leave empty if you do not want to display anything at all when the value is set
$string['fieldtype'] = 'Field type';
$string['genericfield'] = 'Generic field for any numeric data';
$string['headerdisplaysettings'] = 'Display format';
$string['invalidprovider'] = 'Invalid provider';
$string['invalidprovider'] = 'Incorrect provider';
$string['manualinput'] = 'Manual input';
$string['maximumvalue'] = 'Maximum value';
$string['maximumvalueerror'] = 'Value must be less than or equal to {$a}';
$string['minimumvalue'] = 'Minimum value';
$string['minimumvalueconfigerror'] = 'Minimum value must be less than maximum';
$string['minimumvalueerror'] = 'Value must be greater than or equal to {$a}';
$string['missingrequired'] = 'Missing instanceid or fieldid';
$string['missingrequired'] = 'Missing instance ID or field ID';
$string['nofactivities'] = 'Number of activities in the course';
$string['pluginname'] = 'Number';
$string['privacy:metadata'] = 'The number custom field plugin does not store any personal data';

2
customfield/field/number/tests/behat/field.feature
View File

@ -19,7 +19,7 @@ Feature: Managers can manage course custom fields number
| Short name | numberfield |
| Display template | test |
And I click on "Save changes" "button" in the "Adding a new Number" "dialogue"
Then I should see "The placeholder is not invalid"
Then I should see "Invalid placeholder"
And I set the following fields to these values:
| Name | Number field |
| Short name | numberfield |

4
enrol/database/lang/en/enrol_database.php
View File

@ -50,14 +50,14 @@ $string['localcoursefield'] = 'Local course field';
$string['localrolefield'] = 'Local role field';
$string['localuserfield'] = 'Local user field';
$string['newcourseenddate'] = 'New course end date field';
$string['newcourseenddate_desc'] = 'Optional. If not set, then the course end date will be set as configured default course duration. If set, then template value will be overridden.';
$string['newcourseenddate_desc'] = 'Optional. If not set, the course end date will be set according to the configured default course duration. If set, the template value will be overridden.';
$string['newcoursetable'] = 'Remote new courses table';
$string['newcoursetable_desc'] = 'Specify of the name of the table that contains list of courses that should be created automatically. Empty means no courses are created.';
$string['newcoursecategory'] = 'New course category field';
$string['newcoursefullname'] = 'New course full name field';
$string['newcourseidnumber'] = 'New course ID number field';
$string['newcoursestartdate'] = 'New course start date field';
$string['newcoursestartdate_desc'] = 'Optional. If not set then, the course start date will be set to the current date. If set, then template value will be overridden.';
$string['newcoursestartdate_desc'] = 'Optional. If not set, the course start date will be set to the current date. If set, the template value will be overridden.';
$string['newcourseshortname'] = 'New course short name field';
$string['pluginname'] = 'External database';
$string['pluginname_desc'] = 'You can use an external database (of nearly any kind) to control your enrolments. It is assumed your external database contains at least a field containing a course ID, and a field containing a user ID. These are compared against fields that you choose in the local course and user tables.';

12
enrol/manual/tests/behat/welcomemessage.feature
View File

@ -29,7 +29,7 @@ Feature: A course welcome message will be sent to the user when they are enrolle
Then I should see "Send course welcome message"
And the field "Send course welcome message" matches value "From the course contact"
And I should see "Custom welcome message"
And the field "Custom welcome message" matches value "Hi {$a->firstname}, you have successfully been enrolled to course {$a->coursename}"
And the field "Custom welcome message" matches value "Hi {$a->firstname}, you are enrolled in the course {$a->coursename}."
And I should see "Accepted formats: Plain text or Moodle-auto format. HTML tags and multi-lang tags are also accepted, as well as the following placeholders:"
And I set the field "Send course welcome message" to "No"
And I should not see "Custom welcome message"
@ -87,14 +87,14 @@ Feature: A course welcome message will be sent to the user when they are enrolle
And I open the notification popover
And I should see "Welcome to Course 1"
And I click on "View full notification" "link" in the ".popover-region-notifications" "css_element"
And I should see "Hi First, you have successfully been enrolled to course Course 1"
And I should see "Hi First, you are enrolled in the course Course 1."
# Login as second user and check the notification.
And I am on the "C1" "course" page logged in as user2
And I should see "1" in the "#nav-notification-popover-container [data-region='count-container']" "css_element"
And I open the notification popover
And I should see "Welcome to Course 2"
And I click on "View full notification" "link" in the ".popover-region-notifications" "css_element"
And I should see "Hi Second, you have successfully been enrolled to course Course 2"
And I should see "Hi Second, you are enrolled in the course Course 2."
@javascript
Scenario: Students should receive a welcome message if the setting is enabled - Custom message
@ -103,7 +103,7 @@ Feature: A course welcome message will be sent to the user when they are enrolle
And I click on "Edit" "link" in the "Manual enrolments" "table_row"
And I set the field "Custom welcome message" to multiline:
"""
Dear {$a->fullname}, you have successfully been enrolled to course {$a->coursename}.
Dear {$a->fullname}, you are enrolled in the course {$a->coursename}.
Your email address: {$a->email}
Your first name: {$a->firstname}
Your last name: {$a->lastname}
@ -121,7 +121,7 @@ Feature: A course welcome message will be sent to the user when they are enrolle
And I open the notification popover
And I should see "Welcome to Course 1"
And I click on "View full notification" "link" in the ".popover-region-notifications" "css_element"
And I should see "Dear First User, you have successfully been enrolled to course Course 1"
And I should see "Dear First User, you are enrolled in the course Course 1."
And I should see "Your email address: first@example.com"
And I should see "Your first name: First"
And I should see "Your last name: User"
@ -132,7 +132,7 @@ Feature: A course welcome message will be sent to the user when they are enrolle
And I open the notification popover
And I should see "Welcome to Course 1"
And I click on "View full notification" "link" in the ".popover-region-notifications" "css_element"
And I should see "Dear Second User, you have successfully been enrolled to course Course 1"
And I should see "Dear Second User, you are enrolled in the course Course 1."
And I should see "Your email address: second@example.com"
And I should see "Your first name: Second"
And I should see "Your last name: User"

12
enrol/self/tests/behat/welcomemessage.feature
View File

@ -34,7 +34,7 @@ Feature: A course welcome message will be sent to the user when they auto-enrol
Then I should see "Send course welcome message"
And the field "Send course welcome message" matches value "From the course contact"
And I should see "Custom welcome message"
And the field "Custom welcome message" matches value "Hi {$a->firstname}, you have successfully been enrolled to course {$a->coursename}"
And the field "Custom welcome message" matches value "Hi {$a->firstname}, you are enrolled in the course {$a->coursename}."
And I should see "Accepted formats: Plain text or Moodle-auto format. HTML tags and multi-lang tags are also accepted, as well as the following placeholders:"
And I set the field "Send course welcome message" to "No"
And I should not see "Custom welcome message"
@ -73,7 +73,7 @@ Feature: A course welcome message will be sent to the user when they auto-enrol
And I open the notification popover
And I should see "Welcome to Course 1"
And I click on "View full notification" "link" in the ".popover-region-notifications" "css_element"
And I should see "Hi First, you have successfully been enrolled to course Course 1"
And I should see "Hi First, you are enrolled in the course Course 1."
# Login as second user and check the notification.
And I log in as "user2"
And I am on "Course 2" course homepage
@ -82,7 +82,7 @@ Feature: A course welcome message will be sent to the user when they auto-enrol
And I open the notification popover
And I should see "Welcome to Course 2"
And I click on "View full notification" "link" in the ".popover-region-notifications" "css_element"
And I should see "Hi Second, you have successfully been enrolled to course Course 2"
And I should see "Hi Second, you are enrolled in the course Course 2."
@javascript
Scenario: Students should receive a welcome message if the setting is enabled - Custom message
@ -91,7 +91,7 @@ Feature: A course welcome message will be sent to the user when they auto-enrol
And I click on "Edit" "link" in the "Test student enrolment" "table_row"
And I set the field "Custom welcome message" to multiline:
"""
Dear {$a->fullname}, you have successfully been enrolled to course {$a->coursename}.
Dear {$a->fullname}, you are enrolled in the course {$a->coursename}.
Your email address: {$a->email}
Your first name: {$a->firstname}
Your last name: {$a->lastname}
@ -106,7 +106,7 @@ Feature: A course welcome message will be sent to the user when they auto-enrol
And I open the notification popover
And I should see "Welcome to Course 1"
And I click on "View full notification" "link" in the ".popover-region-notifications" "css_element"
And I should see "Dear First User, you have successfully been enrolled to course Course 1"
And I should see "Dear First User, you are enrolled in the course Course 1."
And I should see "Your email address: first@example.com"
And I should see "Your first name: First"
And I should see "Your last name: User"
@ -119,7 +119,7 @@ Feature: A course welcome message will be sent to the user when they auto-enrol
And I open the notification popover
And I should see "Welcome to Course 1"
And I click on "View full notification" "link" in the ".popover-region-notifications" "css_element"
And I should see "Dear Second User, you have successfully been enrolled to course Course 1"
And I should see "Dear Second User, you are enrolled in the course Course 1."
And I should see "Your email address: second@example.com"
And I should see "Your first name: Second"
And I should see "Your last name: User"

4
lang/en/badges.php
View File

@ -424,13 +424,13 @@ $string['newbadgedeprecated'] = 'You have been redirected from badges/newbadge.p
$string['newimage'] = 'New image';
$string['noalignment'] = 'This badge does not have any external skills or standards specified.';
$string['noawards'] = 'This badge has not been earned yet.';
$string['nomatchingawards'] = 'There are no matching recipients who have earned this badge yet';
$string['nomatchingawards'] = 'There are no matching recipients who have earned this badge yet.';
$string['nobackpack'] = 'There is no backpack service connected to this account.<br/>';
$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 currently no badges available for users to earn.';
$string['nomatchingbadges'] = 'There are no matching badges available for users to earn';
$string['nomatchingbadges'] = 'There are no matching 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.';

2
lang/en/blog.php
View File

@ -115,7 +115,7 @@ $string['incorrectblogfilter'] = 'Incorrect blog filter type specified';
$string['intro'] = 'This RSS feed was automatically generated from one or more blogs.';
$string['invalidgroupid'] = 'Invalid group ID';
$string['invalidurl'] = 'This URL is unreachable';
$string['linktooriginalentry'] = 'Link to original blog entry';
$string['linktooriginalentry'] = 'Original blog entry';
$string['maxexternalblogsperuser'] = 'Maximum number of external blogs per user';
$string['myprofileuserblogs'] = 'View all blog entries';
$string['name'] = 'Name';

2
lang/en/enrol.php
View File

@ -45,7 +45,7 @@ $string['customwelcomemessage_help'] = 'Accepted formats: Plain text or Moodle-a
<li>User last name {$a->lastname}</li>
<li>User course role {$a->courserole}</li>
</ul>';
$string['customwelcomemessageplaceholder'] = 'Hi {$a->firstname}, you have successfully been enrolled to course {$a->coursename}';
$string['customwelcomemessageplaceholder'] = 'Hi {$a->firstname}, you are enrolled in the course {$a->coursename}.';
$string['defaultenrol'] = 'Add instance to new courses';
$string['defaultenrol_desc'] = 'It is possible to add this plugin to all new courses by default.';
$string['deleteinstanceconfirm'] = 'You are about to delete the enrolment method "{$a->name}". All {$a->users} users currently enrolled using this method will be unenrolled and any course-related data such as users\' grades, group membership or forum subscriptions will be deleted.

2
lang/en/error.php
View File

@ -279,7 +279,7 @@ $string['filternotinstalled'] = 'Filter {$a} is not currently installed';
$string['forumblockingtoomanyposts'] = 'You have exceeded the posting threshold set for this forum';
$string['functionalityremoved'] = 'You are trying to access functionality that has been removed.';
$string['gdfeaturenotsupported'] = 'The GD extension was not compiled with methods for {$a}';
$string['gdmimetypenotsupported'] = 'MIME Type not supported';
$string['gdmimetypenotsupported'] = 'MIME type not supported.';
$string['generalexceptionmessage'] = 'Exception - {$a}';
$string['gradepubdisable'] = 'Grade publishing disabled';
$string['gradesneedregrading'] = 'The course grades need to be recalculated';

2
lang/en/grades.php
View File

@ -470,7 +470,7 @@ $string['letterreal'] = 'Letter (real)';
$string['letters'] = 'Letters';
$string['linkedactivity'] = 'Linked activity';
$string['linkedactivity_help'] = 'This setting specifies an activity to which this outcome item is linked. This may be used to measure student performance on criteria not assessed by the activity grade.';
$string['linktoactivity'] = 'Link to {$a->name} activity {$a->title}';
$string['linktoactivity'] = '{$a->name} activity {$a->title}';
$string['lock'] = 'Lock';
$string['locked'] = 'Locked';
$string['locked_help'] = 'If ticked, grades can no longer be automatically updated by the related activity.';

2
lang/en/hub.php
View File

@ -90,7 +90,7 @@ $string['nohubselected'] = 'No hub selected';
$string['none'] = 'None';
$string['operation'] = 'Actions';
$string['participantnumberaverage'] = 'Average number of participants ({$a})';
$string['pluginusagedata'] = 'Plugin usage data collected from the following pages: <a href="{$a->overview}">Plugin overview</a>, <a href="{$a->activities}">Activities</a>, and <a href="{$a->blocks}">Blocks</a>';
$string['pluginusagedata'] = 'Plugin usage data collected from: <a href="{$a->overview}">Plugins overview</a>, <a href="{$a->activities}">Manage activities</a>, and <a href="{$a->blocks}">Manage blocks</a>';
$string['policyagreed'] = 'Privacy notice and data processing agreement';
$string['policyagreeddesc'] = 'I agree to the <a href="{$a}" target="_blank">Privacy notice and data processing agreement</a>';
$string['postaladdress'] = 'Postal address';

17
lang/en/moodle.php
View File

@ -1504,22 +1504,17 @@ $string['newusernewpasswordtext'] = 'Hi {$a->firstname},
A new account has been created for you at \'{$a->sitename}\'
and you have been issued with a new temporary password.
Your current login information is now:
Your login information is:
username: {$a->username}
password: {$a->newpassword}
(you will have to change your password
when you login for the first time)
when you log in for the first time)
To start using \'{$a->sitename}\', login at
To start using \'{$a->sitename}\', log in at
{$a->link}
In most mail programs, this should appear as a blue link
which you can just click on. If that doesn\'t work,
then cut and paste the address into the address
line at the top of your web browser window.
Cheers from the \'{$a->sitename}\' administrator,
{$a->signoff}';
If you need help, you can contact the site administrator,
{$a->admin}';
$string['newusers'] = 'New users';
$string['newwindow'] = 'New window';
$string['next'] = 'Next';
@ -1692,7 +1687,7 @@ $string['pluginsetup'] = 'Setting up plugin tables';
$string['policyaccept'] = 'I understand and agree';
$string['policyagree'] = 'You must agree to this policy to continue using this site. Do you agree?';
$string['policyagreement'] = 'Site policy agreement';
$string['policyagreementclick'] = 'Link to site policy agreement';
$string['policyagreementclick'] = 'Site policy agreement';
$string['popup'] = 'popup';
$string['popupwindow'] = 'Open file in new window';
$string['popupwindowname'] = 'Popup window';

6
lang/en/role.php
View File

@ -155,8 +155,8 @@ $string['confirmunassigntitle'] = 'Confirm role change';
$string['confirmunassignyes'] = 'Remove';
$string['confirmunassignno'] = 'Cancel';
$string['contentbank:access'] = 'Access the content bank';
$string['contentbank:changelockedcustomfields'] = 'Change locked custom fields for content bank';
$string['contentbank:configurecustomfields'] = 'Configure custom fields for content bank';
$string['contentbank:changelockedcustomfields'] = 'Change content bank locked custom fields';
$string['contentbank:configurecustomfields'] = 'Configure content bank custom fields';
$string['contentbank:copyanycontent'] = 'Copy any content in the content bank';
$string['contentbank:copycontent'] = 'Copy content in the content bank';
$string['contentbank:deleteanycontent'] = 'Delete any content from the content bank';
@ -500,7 +500,7 @@ $string['user:viewalldetails'] = 'View user full information';
$string['user:viewdetails'] = 'View user profiles';
$string['user:viewhiddendetails'] = 'View hidden details of users';
$string['user:viewlastip'] = 'View user last ip address';
$string['user:viewprofilepictures'] = 'View user profile pictures (if force login enabled)';
$string['user:viewprofilepictures'] = 'View user pictures (if force log in enabled)';
$string['user:viewuseractivitiesreport'] = 'See user activity reports';
$string['user:viewusergrades'] = 'View user grades';
$string['roleresetdefaults'] = 'Defaults';

4
lib/editor/tiny/lang/en/editor_tiny.php
View File

@ -62,7 +62,7 @@ $string['tiny:black'] = 'Black';
$string['tiny:block'] = 'Block';
$string['tiny:block_0'] = 'Block {0}';
$string['tiny:blockquote'] = 'Blockquote';
$string['tiny:blocks'] = 'Blocks';
$string['tiny:blocks'] = 'Paragraph styles';
$string['tiny:blue'] = 'Blue';
$string['tiny:blue_component'] = 'Blue component';
$string['tiny:body'] = 'Body';
@ -347,7 +347,7 @@ $string['tiny:select_all'] = 'Select all';
$string['tiny:select...'] = 'Select...';
$string['tiny:selection'] = 'Selection';
$string['tiny:shortcut'] = 'Shortcut';
$string['tiny:show_blocks'] = 'Show blocks';
$string['tiny:show_blocks'] = 'Show paragraph styles';
$string['tiny:show_caption'] = 'Show caption';
$string['tiny:show_invisible_characters'] = 'Show invisible characters';
$string['tiny:size'] = 'Size';

12
mod/bigbluebuttonbn/lang/en/bigbluebuttonbn.php
View File

@ -207,18 +207,18 @@ $string['config_voicebridge_description'] = 'These settings enable or disable op
$string['config_voicebridge_editable'] = 'Conference voice bridge can be edited';
$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'] = 'Pre-upload presentation';
$string['config_preuploadpresentation'] = 'Presentation file';
$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_editable'] = 'Pre-uploading presentation editable';
$string['config_preuploadpresentation_editable_description'] = 'Preupload presentation feature is editable in the UI when the room or conference is added or updated.';
$string['config_preuploadpresentation_editable'] = 'Presentation file on activity page';
$string['config_preuploadpresentation_editable_description'] = 'Option in activity settings to upload presentation file to show on activity page.';
$string['config_presentation_default'] = 'Default presentation file';
$string['config_presentation_default_description'] = 'A file may be provided for use in all rooms.';
$string['config_showpresentation_default'] = 'Show presentation file on activity page';
$string['config_showpresentation_default_description'] = 'Allow students to access the preuploaded presentation file prior to the session on the activity page';
$string['config_showpresentation_editable'] = 'Show presentation file editable';
$string['config_showpresentation_editable_description'] = 'Show presentation file feature is editable in the UI when the room or conference is added or updated.';
$string['config_showpresentation_default_description'] = 'Should students have access to the presentation file before the session? This setting has no effect on users with the capability \'Always see presentation file on activity page\' .';
$string['config_showpresentation_editable'] = '\'Show presentation file on activity page\' option';
$string['config_showpresentation_editable_description'] = 'Option in activity settings for teachers to choose whether to show the presentation file to students.';
$string['config_participant'] = 'Participants';
$string['config_participant_description'] = 'These settings define the default role for participants.';

2
mod/feedback/lang/en/feedback.php
View File

@ -41,7 +41,7 @@ $string['bold'] = 'Bold';
$string['calendarend'] = '{$a} closes';
$string['calendarstart'] = '{$a} opens';
$string['cannotaccess'] = 'You can only access this feedback from a course';
$string['cannotcreatepagebreak'] = 'Page breaks cannot be added at the beginning of a feedback, and only one page break can be added at the end';
$string['cannotcreatepagebreak'] = 'A page break cannot be added at the beginning, and only one page break can be added at the end.';
$string['cannotsavetempl'] = 'Saving templates is not allowed';
$string['captcha'] = 'Captcha';
$string['captchanotset'] = 'Captcha hasn\'t been set.';

2
mod/quiz/lang/en/quiz.php
View File

@ -545,7 +545,7 @@ $string['matchanswerno'] = 'Matching answer {$a}';
$string['messageprovider:attempt_overdue'] = 'Warning when your quiz attempt becomes overdue';
$string['messageprovider:confirmation'] = 'Confirmation of your own quiz submissions';
$string['messageprovider:attempt_grading_complete'] = 'Notification that your attempt has been graded';
$string['messageprovider:quiz_open_soon'] = 'Quiz opens soon notification';
$string['messageprovider:quiz_open_soon'] = 'Quiz opens soon';
$string['messageprovider:submission'] = 'Notification of your students\' quiz submissions';
$string['max'] = 'Max';
$string['maxmark'] = 'Maximum mark';

5
question/bank/managecategories/lang/en/qbank_managecategories.php
View File

@ -30,9 +30,8 @@ $string['categorymoved'] = 'The category has been moved successfully.';
$string['confirmdelete'] = 'Delete category "{$a}"?. Any child categories will be moved to this category\'s parent.';
$string['descriptionnotdisplayed'] = 'Categories description not displayed';
$string['displaydescription'] = 'Categories description displayed';
$string['idnumberexists'] = 'ID number already in use, please change it to move or update category';
$string['lastcategoryinthiscontext'] = 'This category is the only present under context,
please add another category if this one is to be moved';
$string['idnumberexists'] = 'ID number already in use. Change it to move or update category.';
$string['lastcategoryinthiscontext'] = 'This category is the only one in this context. You need to add another category if this category is to be moved.';
$string['movecategory'] = 'Move {$a}';
$string['newchild'] = 'As new child of {$a}';
$string['pluginname'] = 'Manage categories';

2
question/bank/managecategories/tests/behat/move_question_categories.feature
View File

@ -98,4 +98,4 @@ Feature: A teacher can reorder question categories
And I open the action menu in "Course category 2" "list_item"
And I choose "Move" in the open action menu
And I click on "After Course category 1" "link" in the "Move Course category 2" "dialogue"
And I should see "ID number already in use, please change it to move or update category"
And I should see "ID number already in use. Change it to move or update category."