mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-13 04:22:07 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-53980-master-enfix' of git://github.com/mudrd8mz/moodle

Browse Source
This commit is contained in:
David Monllao 2016-05-02 10:46:50 +08:00
commit f74e3ace69
18 changed files with 69 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
admin/tool/lp/lang/en/tool_lp.php
View File

@ -40,13 +40,13 @@ $string['addnewuserevidence'] = 'Add new evidence';
$string['addtemplatecompetencies'] = 'Add competencies to learning plan template';
$string['aisrequired'] = '\'{$a}\' is required';
$string['aplanswerecreated'] = '{$a} learning plans were created.';
$string['aplanswerecreatedmoremayrequiresync'] = '{$a} learning plans were created, more will be created during the next synchronization.';
$string['aplanswerecreatedmoremayrequiresync'] = '{$a} learning plans were created; more will be created during the next synchronisation.';
$string['assigncohorts'] = 'Assign cohorts';
$string['averageproficiencyrate'] = 'The average proficiency rate for completed learning plans based on this template is {$a} %';
$string['cancelreviewrequest'] = 'Cancel review request';
$string['cannotaddrules'] = 'This competency cannot be configured.';
$string['cannotcreateuserplanswhentemplateduedateispassed'] = 'New learning plans can not be created: this template\'s due date has, or is about to, expire.';
$string['cannotcreateuserplanswhentemplatehidden'] = 'New learning plans can not be created while this template is hidden.';
$string['cannotcreateuserplanswhentemplateduedateispassed'] = 'New learning plans cannot be created. The template due date has expired, or is about to expire.';
$string['cannotcreateuserplanswhentemplatehidden'] = 'New learning plans cannot be created while this template is hidden.';
$string['category'] = 'Category';
$string['chooserating'] = 'Choose a rating...';
$string['cohortssyncedtotemplate'] = 'Cohorts synced to this learning plan template';
@ -59,7 +59,7 @@ $string['competencycrossreferencedcompetencies'] = '{$a} cross-referenced compet
$string['competencyframework'] = 'Competency framework';
$string['competencyframeworkcreated'] = 'Competency framework created.';
$string['competencyframeworkname'] = 'Name';
$string['competencyframeworkroot'] = 'No parent (Top level competency)';
$string['competencyframeworkroot'] = 'No parent (top-level competency)';
$string['competencyframeworks'] = 'Competency frameworks';
$string['competencyframeworkupdated'] = 'Competency framework updated.';
$string['competencyoutcome_complete'] = 'Mark as complete';
@ -70,7 +70,7 @@ $string['competencypicker'] = 'Competency picker';
$string['competencyrule'] = 'Competency rule';
$string['competencyupdated'] = 'Competency updated';
$string['completeplan'] = 'Complete this learning plan';
$string['completeplanconfirm'] = 'Set the learning plan \'{$a}\' to completed? The current status of all the users competencies in this plan will be recorded, and the plan will become read only.';
$string['completeplanconfirm'] = 'Set the learning plan \'{$a}\' to completed? If so, the current status of all users\' competencies will be recorded, and the plan will become read only.';
$string['configurecoursecompetencysettings'] = 'Configure course competencies';
$string['configurescale'] = 'Configure scales';
$string['coursecompetencies'] = 'Course competencies';
@ -85,7 +85,7 @@ $string['crossreferencedcompetencies'] = 'Cross-referenced competencies';
$string['default'] = 'Default';
$string['deletecompetency'] = 'Delete competency \'{$a}\'?';
$string['deletecompetencyframework'] = 'Delete competency framework \'{$a}\'?';
$string['deletecompetencyparenthasrule'] = 'Delete competency \'{$a}\'? This will also remove the rule set on its parent.';
$string['deletecompetencyparenthasrule'] = 'Delete competency \'{$a}\'? This will also remove the rule set for its parent.';
$string['deleteplan'] = 'Delete learning plan \'{$a}\'?';
$string['deleteplans'] = 'Delete the learning plans';
$string['deletetemplate'] = 'Delete learning plan template \'{$a}\'?';
@ -106,10 +106,10 @@ $string['editthisuserevidence'] = 'Edit this evidence';
$string['edituserevidence'] = 'Edit evidence';
$string['evidence'] = 'Evidence';
$string['findcourses'] = 'Find courses';
$string['frameworkcannotbedeleted'] = 'The competency framework \'{$a}\' can not be deleted';
$string['frameworkcannotbedeleted'] = 'The competency framework \'{$a}\' cannot be deleted';
$string['hidden'] = 'Hidden';
$string['hiddenhint'] = '(hidden)';
$string['idnumber'] = 'Id number';
$string['idnumber'] = 'ID number';
$string['inheritfromframework'] = 'Inherit from competency framework (default)';
$string['itemstoadd'] = 'Items to add';
$string['jumptocompetency'] = 'Jump to competency';
@ -135,8 +135,8 @@ $string['move'] = 'Move';
$string['movecompetency'] = 'Move competency';
$string['movecompetencyafter'] = 'Move competency after \'{$a}\'';
$string['movecompetencyframework'] = 'Move competency framework';
$string['movecompetencytochildofselfwillresetrules'] = 'Moving the competency will remove its own rule, and the rules set on its parent and destination. Do you want to continune?';
$string['movecompetencywillresetrules'] = 'Moving the competency will remove the rules set on its parent and destination. Do you want to continune?';
$string['movecompetencytochildofselfwillresetrules'] = 'Moving the competency will remove its own rule, and the rules set for its parent and destination. Do you want to continue?';
$string['movecompetencywillresetrules'] = 'Moving the competency will remove the rules set for its parent and destination. Do you want to continue?';
$string['moveframeworkafter'] = 'Move competency framework after \'{$a}\'';
$string['movetonewparent'] = 'Relocate';
$string['myplans'] = 'My learning plans';
@ -155,14 +155,14 @@ $string['noparticipants'] = 'No participants found.';
$string['noplanswerecreated'] = 'No learning plans were created.';
$string['notemplates'] = 'No learning plan templates have been created yet.';
$string['nourl'] = 'No URL';
$string['nouserevidence'] = 'No evidence of prior learning have been added yet.';
$string['nouserevidence'] = 'No evidence of prior learning has been added yet.';
$string['nouserplans'] = 'No learning plans have been created yet.';
$string['oneplanwascreated'] = 'A learning plan was created';
$string['outcome'] = 'Outcome';
$string['path'] = 'Path:';
$string['parentcompetency'] = 'Parent';
$string['parentcompetency_edit'] = 'Edit parent';
$string['parentcompetency_help'] = 'Define the parent under which the competency will be added. It can either be another competency within the same framework, or the root of the competency framework for a top level competency.';
$string['parentcompetency_help'] = 'Define the parent under which the competency will be added. It can either be another competency within the same framework, or the root of the competency framework for a top-level competency.';
$string['planapprove'] = 'Make active';
$string['plancompleted'] = 'Learning plan completed';
$string['plancreated'] = 'Learning plan created';
@ -183,13 +183,16 @@ $string['rating'] = 'Rating';
$string['ratingaffectsonlycourse'] = 'Rating a competency only updates the competency in this course';
$string['ratingaffectsuserplans'] = 'Rating a competency also updates the competency in all of the learning plans';
$string['reopenplan'] = 'Reopen this learning plan';
$string['reopenplanconfirm'] = 'Reopen the learning plan \'{$a}\'? The status of the users competencies that was recorded at the time the plan was previously completed will be deleted, and the plan will become active again.';
$string['reopenplanconfirm'] = 'Reopen the learning plan \'{$a}\'? If so, the status of the users\' competencies that was recorded at the time the plan was previously completed will be deleted, and the plan will become active again.';
$string['requestreview'] = 'Request review';
$string['reviewer'] = 'Reviewer';
$string['reviewstatus'] = 'Review status';
$string['savechanges'] = 'Save changes';
$string['scale'] = 'Scale';
$string['scale_help'] = 'A scale determines how proficiency is measured in a competency. After selecting a scale, you must configure it. The item selected for Default is the rating that will be assigned when a competency is set to be automatically completed. The items selected for Proficient indicate which values will mark the competencies as proficient when they are rated.';
$string['scale_help'] = 'A scale determines how proficiency is measured in a competency. After selecting a scale, it needs to be configured.
* The item selected as \'Default\' is the rating given when a competency is automatically completed.
* The item(s) selected as \'Proficient\' indicate(s) which value(s) will mark the competencies as proficient when they are rated.';
$string['scalevalue'] = 'Scale value';
$string['search'] = 'Search...';
$string['selectcohortstosync'] = 'Select cohorts to sync';
@ -252,8 +255,8 @@ $string['taxonomy_selected_skill'] = 'Selected skill';
$string['taxonomy_selected_value'] = 'Selected value';
$string['template'] = 'Learning plan template';
$string['templatebased'] = 'Template based';
$string['templatecohortnotsyncedwhileduedateispassed'] = 'Cohorts will not be synchronized while the template\'s due date is passed.';
$string['templatecohortnotsyncedwhilehidden'] = 'Cohorts will not be synchronized while this template is hidden.';
$string['templatecohortnotsyncedwhileduedateispassed'] = 'Cohorts will not be synchronised if the template\'s due date has passed.';
$string['templatecohortnotsyncedwhilehidden'] = 'Cohorts will not be synchronised while this template is hidden.';
$string['templatecompetencies'] = 'Learning plan template competencies';
$string['templatecreated'] = 'Learning plan template created';
$string['templatename'] = 'Name';
@ -280,7 +283,7 @@ $string['userevidenceurl'] = 'URL';
$string['userevidenceurl_help'] = 'The URL must start with \'http://\' or \'https://\'.';
$string['viewdetails'] = 'View details';
$string['visible'] = 'Visible';
$string['visible_help'] = 'A competency framework can be hidden from teachers. This could be useful if a framework is still in the process of being developed.';
$string['visible_help'] = 'A competency framework can be hidden whilst it is being set up or updated to a new version.';
$string['when'] = 'When';
$string['xcompetencieslinkedoutofy'] = '{$a->x} out of {$a->y} competencies linked to courses';
$string['xcompetenciesproficientoutofy'] = '{$a->x} out of {$a->y} competencies are proficient';

4
admin/tool/lp/tests/behat/framework_crud.feature
View File

@ -18,9 +18,9 @@ Feature: Manage competency frameworks
And I should see "General"
And I should see "Taxonomies"
And I set the field "Name" to "Science Year-1"
And I set the field "Id number" to "Comp-frm-1"
And I set the field "ID number" to "Comp-frm-1"
And I press "Save changes"
And I should see "You must configure the scale by selecting default and proficient values"
And I should see "The scale needs to be configured by selecting default and proficient items."
And "Configure scales" "button" should be visible
And I press "Configure scales"
And I click on "//input[@data-field='tool_lp_scale_default_1']" "xpath_element"

28
admin/tool/lpmigrate/lang/en/tool_lpmigrate.php
View File

@ -25,34 +25,38 @@
defined('MOODLE_INTERNAL') || die();
$string['allowedcourses'] = 'Courses allowed';
$string['allowedcourses_help'] = 'When at least one course is specified, the migration will only occur on the courses listed here.';
$string['allowedcourses_help'] = 'Select courses to be migrated to the new framework. If no course is specified, then all courses will be migrated.';
$string['continuetoframeworks'] = 'Continue to frameworks';
$string['coursecompetencymigrations'] = 'Course competency migrations';
$string['coursemodulecompetencymigrations'] = 'Course module competency migrations';
$string['coursemodulecompetencymigrations'] = 'Course activity and resource competency migrations';
$string['coursesfound'] = 'Courses found';
$string['coursemodulesfound'] = 'Course modules found';
$string['coursemodulesfound'] = 'Course activities or resources found';
$string['coursestartdate'] = 'Courses start date';
$string['coursestartdate_help'] = 'When enabled, courses with a start date prior to the one specified here will not be migrated.';
$string['coursestartdate_help'] = 'If enabled, courses with a start date prior to the date specified will not be migrated.';
$string['disallowedcourses'] = 'Disallowed courses';
$string['disallowedcourses_help'] = 'Any course specified here will not be migrated.';
$string['disallowedcourses_help'] = 'Select any courses which should NOT be migrated to the new framework.';
$string['errorcannotmigratetosameframework'] = 'Cannot migrate from and to the same framework.';
$string['errorcouldnotmapcompetenciesinframework'] = 'Could not map to any competency in this framework.';
$string['errors'] = 'Errors';
$string['errorwhilemigratingcoursecompetencywithexception'] = 'Error while migrating the course competency: {$a}';
$string['errorwhilemigratingmodulecompetencywithexception'] = 'Error while migrating the course module competency: {$a}';
$string['errorwhilemigratingmodulecompetencywithexception'] = 'Error while migrating the activity or resource competency: {$a}';
$string['excludethese'] = 'Exclude these';
$string['explanation'] = 'When updating a competency framework to a newer version, this tool can be used to search for competencies in courses and course modules using the older framework, and update the links to point to the new framework. This works by finding competencies with matching ID numbers in the two frameworks, and then mapping all of the competency links in the specified list of courses to point to the new version of the competency in the new framework. It is not recommended to edit the old set of competencies directly as this would change all of the competencies that have already been awarded in users learning plans. Typically you would import the new version of a framework, hide the old framework, and use this tool to migrate new courses to the new framework.';
$string['explanation'] = 'This tool can be used to update a competency framework to a newer version. It searches for competencies in courses and activities using the older framework, and updates the links to point to the new framework.
It is not recommended to edit the old set of competencies directly, as this would change all of the competencies that have already been awarded in users\' learning plans.
Typically you would import the new version of a framework, hide the old framework, then use this tool to migrate new courses to the new framework.';
$string['findingcoursecompetencies'] = 'Finding course competencies';
$string['findingmodulecompetencies'] = 'Finding module competencies';
$string['findingmodulecompetencies'] = 'Finding activity and resource competencies';
$string['frameworks'] = 'Frameworks';
$string['limittothese'] = 'Limit to these';
$string['lpmigrate:frameworksmigrate'] = 'Migrate frameworks';
$string['migrateframeworks'] = 'Migrate frameworks';
$string['migratefrom'] = 'Migrate from';
$string['migratefrom_help'] = 'Select the framework to migrate from.';
$string['migratefrom_help'] = 'Select the older framework currently in use.';
$string['migratemore'] = 'Migrate more';
$string['migrateto'] = 'Migrate to';
$string['migrateto_help'] = 'Select the framework to migrate to. Note that it must be not be hidden.';
$string['migrateto_help'] = 'Select the newer version of the framework. It is only possible to select a framework which is not hidden.';
$string['migratingcourses'] = 'Migrating courses';
$string['missingmappings'] = 'Missing mappings';
$string['performmigration'] = 'Perform migration';
@ -61,7 +65,7 @@ $string['results'] = 'Results';
$string['startdatefrom'] = 'Start date from';
$string['unmappedin'] = 'Unmapped in {$a}';
$string['warningcouldnotremovecoursecompetency'] = 'The course competency could not be removed.';
$string['warningcouldnotremovemodulecompetency'] = 'The course module competency could not be removed.';
$string['warningcouldnotremovemodulecompetency'] = 'The activity or resource competency could not be removed.';
$string['warningdestinationcoursecompetencyalreadyexists'] = 'The destination course competency already exists.';
$string['warningdestinationmodulecompetencyalreadyexists'] = 'The destination course module competency already exists.';
$string['warningdestinationmodulecompetencyalreadyexists'] = 'The destination activity or resource competency already exists.';
$string['warnings'] = 'Warnings';

2
auth/db/lang/en/auth_db.php
View File

@ -45,7 +45,7 @@ $string['auth_dbname'] = 'Name of the database itself. Leave empty if using an O
$string['auth_dbname_key'] = 'DB name';
$string['auth_dbpass'] = 'Password matching the above username';
$string['auth_dbpass_key'] = 'Password';
$string['auth_dbpasstype'] = '<p>Specify the format that the password field is using. MD5 hashing is useful for connecting to other common web applications like PostNuke.</p> <p>Use \'internal\' if you want to the external DB to manage usernames &amp; email addresses, but Moodle to manage passwords. If you use \'internal\', you <i>must</i> provide a populated email address field in the external DB, and you must execute both admin/cron.php and auth/db/cli/sync_users.php regularly. Moodle will send an email to new users with a temporary password.</p>';
$string['auth_dbpasstype'] = '<p>Specify the format that the password field is using. MD5 hashing is useful for connecting to other common web applications like PostNuke.</p> <p>Use \'internal\' if you want the external database to manage usernames and email addresses, but Moodle to manage passwords. If you use \'internal\', you <i>must</i> provide a populated email address field in the external database, and you must execute both admin/cron.php and auth/db/cli/sync_users.php regularly. Moodle will send an email to new users with a temporary password.</p>';
$string['auth_dbpasstype_key'] = 'Password format';
$string['auth_dbreviveduser'] = 'Revived user {$a->name} id {$a->id}';
$string['auth_dbrevivedusererror'] = 'Error reviving user {$a}';

2
auth/ldap/lang/en/auth_ldap.php
View File

@ -56,7 +56,7 @@ $string['auth_ldap_gracelogins_desc'] = 'Enable LDAP gracelogin support. After p
$string['auth_ldap_gracelogins_key'] = 'Grace logins';
$string['auth_ldap_groupecreators'] = 'List of groups or contexts whose members are allowed to create groups. Separate multiple groups with \';\'. Usually something like \'cn=teachers,ou=staff,o=myorg\'';
$string['auth_ldap_groupecreators_key'] = 'Group creators';
$string['auth_ldap_host_url'] = 'Specify LDAP host in URL-form like \'ldap://ldap.myorg.com/\' or \'ldaps://ldap.myorg.com/\' Separate multipleservers with \';\' to get failover support.';
$string['auth_ldap_host_url'] = 'Specify LDAP host in URL-form like \'ldap://ldap.myorg.com/\' or \'ldaps://ldap.myorg.com/\'. Separate multiple servers with \';\' to get failover support.';
$string['auth_ldap_host_url_key'] = 'Host URL';
$string['auth_ldap_changepasswordurl_key'] = 'Password-change URL';
$string['auth_ldap_ldap_encoding'] = 'Specify encoding used by LDAP server. Most probably utf-8, MS AD v2 uses default platform encoding such as cp1252, cp1250, etc.';

6
blocks/lp/lang/en/block_lp.php
View File

@ -25,9 +25,9 @@
defined('MOODLE_INTERNAL') || die();
$string['competenciestoreview'] = 'Competencies to review';
$string['lp:addinstance'] = 'Adding a new block';
$string['lp:myaddinstance'] = 'Adding the block on the dashboard';
$string['lp:view'] = 'Viewing the block';
$string['lp:addinstance'] = 'Add a new learning plans block';
$string['lp:myaddinstance'] = 'Add a new learning plans block to Dashboard';
$string['lp:view'] = 'View learning plans block';
$string['planstoreview'] = 'Plans to review';
$string['pluginname'] = 'Learning plans';
$string['viewmore'] = 'View more...';

2
lang/en/auth.php
View File

@ -97,7 +97,7 @@ $string['getanimagecaptcha'] = 'Get an image CAPTCHA';
$string['getanothercaptcha'] = 'Get another CAPTCHA';
$string['guestloginbutton'] = 'Guest login button';
$string['changepassword'] = 'Change password URL';
$string['changepasswordhelp'] = 'Here you can specify a location at which your users can recover or change their username/password if they\'ve forgotten it. This will be provided to users as a button on the login page and their user page. If you leave this blank the button will not be printed.';
$string['changepasswordhelp'] = 'URL of lost password recovery page, which will be sent to users in an email. Note that this setting will have no effect if a forgotten password URL is set in the authentication common settings.';
$string['chooseauthmethod'] = 'Choose an authentication method';
$string['chooseauthmethod_help'] = 'This setting determines the authentication method used when the user logs in. Only enabled authentication plugins should be chosen, otherwise the user will no longer be able to log in. To block the user from logging in, select "No login".';
$string['incorrectpleasetryagain'] = 'Incorrect. Please try again.';

2
lang/en/cohort.php
View File

@ -64,7 +64,7 @@ $string['name'] = 'Name';
$string['namecolumnmissing'] = 'There is something wrong with the format of the CSV file. Please check that it includes column names.';
$string['namefieldempty'] = 'Field name can not be empty';
$string['newnamefor'] = 'New name for cohort {$a}';
$string['newidnumberfor'] = 'New idnumber for cohort {$a}';
$string['newidnumberfor'] = 'New ID number for cohort {$a}';
$string['nocomponent'] = 'Created manually';
$string['potusers'] = 'Potential users';
$string['potusersmatching'] = 'Potential matching users';

14
lang/en/competency.php
View File

@ -26,22 +26,22 @@ defined('MOODLE_INTERNAL') || die();
$string['allchildrenarecomplete'] = 'All children are complete';
$string['competencies'] = 'Competencies';
$string['competenciesarenotenabled'] = 'The competencies module is not enabled.';
$string['competenciesarenotenabled'] = 'Competencies are not enabled.';
$string['competenciessettings'] = 'Competencies settings';
$string['completeplanstask'] = 'Complete learning plans which are due';
$string['coursecompetencyoutcome_complete'] = 'Complete the competency';
$string['coursecompetencyoutcome_evidence'] = 'Attach an evidence';
$string['coursecompetencyoutcome_evidence'] = 'Attach evidence';
$string['coursecompetencyoutcome_none'] = 'Do nothing';
$string['coursecompetencyoutcome_recommend'] = 'Send for review';
$string['coursemodulecompetencyoutcome_complete'] = 'Complete the competency';
$string['coursemodulecompetencyoutcome_evidence'] = 'Attach an evidence';
$string['coursemodulecompetencyoutcome_evidence'] = 'Attach evidence';
$string['coursemodulecompetencyoutcome_none'] = 'Do nothing';
$string['coursemodulecompetencyoutcome_recommend'] = 'Send for review';
$string['deletecompetencyratings'] = 'Delete competency ratings';
$string['duplicateditemname'] = '{$a} (copy)';
$string['enablecompetencies'] = 'Enable competencies';
$string['enablecompetencies_desc'] = 'When unticked the competencies module will be disabled.';
$string['errorcannotchangeapastduedate'] = 'The due date has passed, it cannot be changed.';
$string['enablecompetencies_desc'] = 'Competencies allow users to be assessed according to learning plans.';
$string['errorcannotchangeapastduedate'] = 'The due date has passed; it cannot be changed.';
$string['errorcannotsetduedateinthepast'] = 'The due date cannot be set in the past.';
$string['errorcannotsetduedatetoosoon'] = 'The due date is too soon.';
$string['errorcompetencyrule'] = 'Course competency rule \'{$a}\' unknown';
@ -49,8 +49,8 @@ $string['errorcoursecompetencyrule'] = 'Course competency rule \'{$a}\' unknown'
$string['errorinvalidcourse'] = 'Invalid course.';
$string['errornocompetency'] = '{$a} competency can not be found';
$string['errorplanstatus'] = 'Learning plans \'{$a}\' status unknown';
$string['errorscalealreadyused'] = 'The scale cannot be changed, it is already being used.';
$string['errorscaleconfiguration'] = 'You must configure the scale by selecting default and proficient values.';
$string['errorscalealreadyused'] = 'The scale cannot be changed, as it is already in use.';
$string['errorscaleconfiguration'] = 'The scale needs to be configured by selecting default and proficient items.';
$string['errorusercomptencystatus'] = 'User competency status \'{$a}\' unknown';
$string['eventcompetencycreated'] = 'Competency created.';
$string['eventcompetencydeleted'] = 'Competency deleted.';

4
lang/en/grades.php
View File

@ -176,7 +176,7 @@ $string['editverbose'] = 'Edit {$a->category} {$a->itemmodule} {$a->itemname}';
$string['enableajax'] = 'Enable AJAX';
$string['enableajax_help'] = 'Adds a layer of AJAX functionality to the grader report, simplifying and speeding up common operations. Depends on Javascript being switched on at the user\'s browser level.';
$string['enableoutcomes'] = 'Enable outcomes';
$string['enableoutcomes_help'] = 'Support for Outcomes (also known as Competencies, Goals, Standards or Criteria) means that we can grade things using one or more scales that are tied to outcome statements. Enabling outcomes makes such special grading possible throughout the site.';
$string['enableoutcomes_help'] = 'If enabled, grade items may be graded using one or more scales tied to outcome statements.';
$string['encoding'] = 'Encoding';
$string['encoding_help'] = 'Select the character encoding used for the data. (The standard encoding is UTF-8.) If the wrong encoding is selected by mistake, it will be noticeable when previewing the data for import.';
$string['errorcalculationnoequal'] = 'Formula must start with equal sign (=1+2)';
@ -765,7 +765,7 @@ $string['uncategorised'] = 'Uncategorised';
$string['unenrolledusersinimport'] = 'This import included the following grades for users not currently enrolled in this course: {$a}';
$string['unchangedgrade'] = 'Grade unchanged';
$string['unlimitedgrades'] = 'Unlimited grades';
$string['unlimitedgrades_help'] = 'By default grades are limited by the maximum and minimum values of the grade item. Enabling this setting removes this limit, and allows grades of over 100% to be entered directly in the gradebook. It is recommended that this setting is enabled at an off-peak time, as all grades will be recalculated, which may result in a high server load.';
$string['unlimitedgrades_help'] = 'By default, grades are limited by the maximum and minimum values of the grade item. Enabling this setting removes this limit, and allows grades of over 100% to be entered directly in the gradebook.';
$string['unlock'] = 'Unlock';
$string['unlockverbose'] = 'Unlock {$a->category} {$a->itemmodule} {$a->itemname}';
$string['unused'] = 'Unused';

2
lang/en/group.php
View File

@ -140,7 +140,7 @@ $string['importgroups_help'] = 'Groups may be imported via text file. The format
* Optional fieldnames are description, enrolmentkey, picture, hidepicture';
$string['importgroups_link'] = 'group/import';
$string['includeonlyactiveenrol'] = 'Include only active enrolments';
$string['includeonlyactiveenrol_help'] = 'This setting determines if only active enrolled users will be included in the groups. If enabled, suspended users will not be included in groups.';
$string['includeonlyactiveenrol_help'] = 'If enabled, suspended users will not be included in groups.';
$string['javascriptrequired'] = 'This page requires JavaScript to be enabled.';
$string['members'] = 'Members per group';
$string['membersofselectedgroup'] = 'Members of:';

19
lang/en/moodle.php
View File

@ -1053,24 +1053,7 @@ $string['loginaspasswordexplain'] = '<p>You must enter the special "loginas pass
$string['login_failure_logs'] = 'Login failure logs';
$string['loginguest'] = 'Log in as a guest';
$string['loginsite'] = 'Log in to the site';
$string['loginsteps'] = 'Hi! For full access to courses you\'ll need to take
a minute to create a new account for yourself on this web site.
Each of the individual courses may also have a one-time
"enrolment key", which you won\'t need until later. Here are
the steps:
<ol>
<li>Fill out the <a href="{$a}">New Account</a> form with your details.</li>
<li>An email will be immediately sent to your email address.</li>
<li>Read your email, and click on the web link it contains.</li>
<li>Your account will be confirmed and you will be logged in.</li>
<li>Now, select the course you want to participate in.</li>
<li>If you are prompted for an "enrolment key" - use the one
that your teacher has given you. This will "enrol" you in the
course.</li>
<li>You can now access the full course. From now on you will only need
to enter your personal username and password (in the form on this page)
to log in and access any course you have enrolled in.</li>
</ol>';
$string['loginsteps'] = 'For full access to this site, you first need to create an account.';
$string['loginstepsnone'] = '<p>Hi!</p>
<p>For full access to courses you\'ll need to create yourself an account.</p>
<p>All you need to do is make up a username and password and use it in the form on this page!</p>

8
lang/en/role.php
View File

@ -120,8 +120,8 @@ $string['competency:planmanage'] = 'Manage learning plans';
$string['competency:planmanagedraft'] = 'Manage draft learning plans';
$string['competency:planmanageown'] = 'Manage own learning plans';
$string['competency:planmanageowndraft'] = 'Manage own draft learning plans';
$string['competency:planrequestreview'] = 'Request the review of a learning plan';
$string['competency:planrequestreviewown'] = 'Request the review of own learning plan';
$string['competency:planrequestreview'] = 'Request review of a learning plan';
$string['competency:planrequestreviewown'] = 'Request review of own learning plan';
$string['competency:planreview'] = 'Review a learning plan';
$string['competency:planview'] = 'View all learning plans';
$string['competency:planviewdraft'] = 'View draft learning plans';
@ -131,8 +131,8 @@ $string['competency:templatemanage'] = 'Manage learning plan templates';
$string['competency:templateview'] = 'View learning plan templates';
$string['competency:usercompetencycomment'] = 'Comment on a user competency';
$string['competency:usercompetencycommentown'] = 'Comment on own user competency';
$string['competency:usercompetencyrequestreview'] = 'Request the review of a user competency';
$string['competency:usercompetencyrequestreviewown'] = 'Request the review of own user competency';
$string['competency:usercompetencyrequestreview'] = 'Request review of a user competency';
$string['competency:usercompetencyrequestreviewown'] = 'Request review of own user competency';
$string['competency:usercompetencyreview'] = 'Review a user competency';
$string['competency:usercompetencyview'] = 'View a user competency';
$string['competency:userevidencemanage'] = 'Manage evidence of prior learning';

6
lang/en/tag.php
View File

@ -83,7 +83,7 @@ $string['managetagcolls'] = 'Manage tag collections';
$string['moretags'] = 'more...';
$string['name'] = 'Tag name';
$string['namesalreadybeeingused'] = 'Tag names already being used';
$string['nameuseddocombine'] = 'This tag name is already used, do you want to combine these tags?';
$string['nameuseddocombine'] = 'The tag name is already in use. Do you want to combine these tags?';
$string['newcollnamefor'] = 'New name for tag collection {$a}';
$string['newnamefor'] = 'New name for tag {$a}';
$string['nextpage'] = 'More';
@ -106,7 +106,7 @@ $string['showstandard'] = 'Standard tags usage';
$string['showstandard_help'] = 'When entering tags, standard tags may be suggested, or forced, meaning that new tags cannot be entered. Alternatively, new tags may be entered with no standard tag being suggested.';
$string['search'] = 'Search';
$string['searchable'] = 'Searchable';
$string['searchable_help'] = 'Tags in this tag collection can be searched for on "Search tags" page. If unchecked, tags can still be accessed by clicking on them or via different search interfaces.';
$string['searchable_help'] = 'If ticked, tags in this search collection can be found via the "Search tags" page. If unticked, tags can still be found via other search pages.';
$string['searchresultsfor'] = 'Search results for "{$a}"';
$string['searchtags'] = 'Search tags';
$string['seeallblogs'] = 'See all blog entries tagged with "{$a}"';
@ -128,7 +128,7 @@ $string['tagarea_blog_external'] = 'External blog posts';
$string['tagarea_post'] = 'Blog posts';
$string['tagarea_user'] = 'User interests';
$string['tagarea_course'] = 'Courses';
$string['tagarea_course_modules'] = 'Course modules';
$string['tagarea_course_modules'] = 'Activities and resources';
$string['tagareaenabled'] = 'Enabled';
$string['tagareaname'] = 'Name';
$string['tagareas'] = 'Tag areas';

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

@ -281,7 +281,7 @@ $string['invalidpostid'] = 'Invalid post ID - {$a}';
$string['lastpost'] = 'Last post';
$string['learningforums'] = 'Learning forums';
$string['longpost'] = 'Long post';
$string['mailnow'] = 'Mail now';
$string['mailnow'] = 'Send forum post notifications with no editing-time delay';
$string['manydiscussions'] = 'Discussions per page';
$string['markalldread'] = 'Mark all posts in this discussion read.';
$string['markallread'] = 'Mark all posts in this forum read.';

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

@ -214,7 +214,7 @@ $string['save'] = 'Save';
$string['saving'] = 'Saving wiki page';
$string['savingerror'] = 'Saving error';
$string['search:activity'] = 'Wiki activities';
$string['search:collaborative_page'] = 'Wiki Pages - Collaborative';
$string['search:collaborative_page'] = 'Wiki pages - collaborative';
$string['searchcontent'] = 'Search in page content';
$string['searchresult'] = 'Search results:';
$string['searchterms'] = 'Search terms';

8
mod/workshop/lang/en/workshop.php
View File

@ -31,14 +31,10 @@ $string['allocationdone'] = 'Allocation done';
$string['allocationerror'] = 'Allocation error';
$string['allocationconfigured'] = 'Allocation configured';
$string['allowedfiletypesforoverallfeedback'] = 'Feedback attachment allowed file types';
$string['allowedfiletypesforoverallfeedback_help'] = 'Feedback attachment allowed file types can be restricted by entering a comma-separated list of file extensions, for example \'png, jpg, jpeg, gif\'. If the field is left empty, then all file types are allowed.
Additional supported file extensions can be configured in the server administration';
$string['allowedfiletypesforoverallfeedback_help'] = 'Feedback attachment allowed file types can be restricted by entering a comma-separated list of file extensions, for example \'mp4, mp3, png, jpg\'. If the field is left empty, then all file types are allowed.';
$string['allowedfiletypesforoverallfeedback_link'] = 'admin/tool/filetypes/index';
$string['allowedfiletypesforsubmission'] = 'Submission attachment allowed file types';
$string['allowedfiletypesforsubmission_help'] = 'Submission attachment allowed file types can be restricted by entering a comma-separated list of file extensions, for example `png, jpg, jpeg, gif`. If the field is left empty, then all file types are allowed.
Additional supported file extensions can be configured in the server administration';
$string['allowedfiletypesforsubmission_help'] = 'Submission attachment allowed file types can be restricted by entering a comma-separated list of file extensions, for example \'mp4, mp3, png, jpg\'. If the field is left empty, then all file types are allowed.';
$string['allowedfiletypesforsubmission_link'] = 'admin/tool/filetypes/index';
$string['allsubmissions'] = 'All submissions ({$a})';
$string['alreadygraded'] = 'Already graded';

4
tag/tests/behat/edit_tag.feature
View File

@ -162,7 +162,7 @@ Feature: Users can edit tags to add description or rename
And I click on "Edit tag name" "link" in the "Turtle" "table_row"
And I set the field "New name for tag Turtle" to "DOG"
And I press key "13" in the field "New name for tag Turtle"
And I should see "This tag name is already used, do you want to combine these tags?"
And I should see "The tag name is already in use. Do you want to combine these tags?"
And I press "Cancel"
And "New name for tag" "field" should not exist
And I should see "Turtle"
@ -192,7 +192,7 @@ Feature: Users can edit tags to add description or rename
And I click on "Edit tag name" "link" in the "Turtle" "table_row"
And I set the field "New name for tag Turtle" to "DOG"
And I press key "13" in the field "New name for tag Turtle"
And I should see "This tag name is already used, do you want to combine these tags?"
And I should see "The tag name is already in use. Do you want to combine these tags?"
And I press "Yes"
Then I should not see "Turtle"
And I should not see "DOG"