moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-71860-master' of git://github.com/lameze/moodle

Browse source
This commit is contained in:
Jake Dallimore 2021-09-16 11:02:18 +08:00
commit d221e3ba7e
3 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lang/en/competency.php
View file

@ -103,7 +103,6 @@ $string['evidence_manualoverrideincourse'] = 'The competency rating was manually
$string['evidence_manualoverrideinplan'] = 'The competency rating was manually set in the learning plan \'{$a}\'.'; $string['evidence_manualoverrideinplan'] = 'The competency rating was manually set in the learning plan \'{$a}\'.';
$string['invalidevidencedesc'] = 'Invalid evidence description'; $string['invalidevidencedesc'] = 'Invalid evidence description';
$string['invalidgrade'] = 'Invalid rating'; $string['invalidgrade'] = 'Invalid rating';
$string['invalidpersistenterror'] = 'Error: {$a}';
$string['invalidplan'] = 'Invalid learning plan'; $string['invalidplan'] = 'Invalid learning plan';
$string['invalidtaxonomy'] = 'Invalid taxonomy: {$a}'; $string['invalidtaxonomy'] = 'Invalid taxonomy: {$a}';
$string['invalidurl'] = 'The URL is not valid. Make sure it starts with \'http://\' or \'https://\'.'; $string['invalidurl'] = 'The URL is not valid. Make sure it starts with \'http://\' or \'https://\'.';
@ -201,3 +200,6 @@ $string['usercompetencystatus_idle'] = 'Idle';
$string['usercompetencystatus_inreview'] = 'In review'; $string['usercompetencystatus_inreview'] = 'In review';
$string['usercompetencystatus_waitingforreview'] = 'Waiting for review'; $string['usercompetencystatus_waitingforreview'] = 'Waiting for review';
$string['userplans'] = 'Learning plans'; $string['userplans'] = 'Learning plans';
// Deprecated since Moodle 4.0.
$string['invalidpersistenterror'] = 'Error: {$a}';

1
lang/en/deprecated.txt
View file

@ -158,3 +158,4 @@ yourprogress,core_completion
importfrominstructions,core_calendar importfrominstructions,core_calendar
proceedtocourse,core_enrol proceedtocourse,core_enrol
coursepage,core_admin coursepage,core_admin
invalidpersistenterror,core_competency

1
lang/en/error.php
View file

@ -361,6 +361,7 @@ $string['invalidoutcome'] = 'Incorrect outcome ID';
$string['invalidpagesize'] = 'Invalid page size'; $string['invalidpagesize'] = 'Invalid page size';
$string['invalidpasswordpolicy'] = 'Invalid password policy'; $string['invalidpasswordpolicy'] = 'Invalid password policy';
$string['invalidpaymentmethod'] = 'Invalid payment method: {$a}'; $string['invalidpaymentmethod'] = 'Invalid payment method: {$a}';
$string['invalidpersistenterror'] = 'Error: {$a}';
$string['invalidqueryparam'] = 'ERROR: Incorrect number of query parameters. Expected {$a->expected}, got {$a->actual}.'; $string['invalidqueryparam'] = 'ERROR: Incorrect number of query parameters. Expected {$a->expected}, got {$a->actual}.';
$string['invalidratingarea'] = 'Invalid rating area'; $string['invalidratingarea'] = 'Invalid rating area';
$string['invalidrecord'] = 'Can\'t find data record in database table {$a}.'; $string['invalidrecord'] = 'Can\'t find data record in database table {$a}.';