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

Merge branch 'MDL-68612-master-integration' of git://github.com/mickhawkins/moodle

Browse source
This commit is contained in:
Jun Pataleta 2020-06-03 15:39:36 +08:00
commit 7fcdd9d983
44 changed files with 1629 additions and 797 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lang/en/deprecated.txt
View file

@ -144,3 +144,4 @@ pacific/yap,core_timezones
editsettings,core_badges
availablelicenses,core_admin
managelicenses,core_admin
userfilterplaceholder,core

2
lang/en/moodle.php
View file

@ -2166,7 +2166,6 @@ $string['userdescription'] = 'Description';
$string['userdescription_help'] = 'This box enables you to enter some text about yourself which will then be displayed on your profile page for others to view.';
$string['userdetails'] = 'User details';
$string['userfiles'] = 'User files';
$string['userfilterplaceholder'] = 'Search keyword or select filter';
$string['userlist'] = 'User list';
$string['usermenu'] = 'User menu';
$string['username'] = 'Username';
@ -2292,3 +2291,4 @@ $string['sitemessage'] = 'Message users';
// Deprecated since Moodle 3.9.
$string['participantscount'] = 'Number of participants: {$a}';
$string['userfilterplaceholder'] = 'Search keyword or select filter';

2
lang/en/user.php
View file

@ -29,7 +29,9 @@ $string['adverbfor_or'] = 'or';
$string['applyfilters'] = 'Apply filters';
$string['clearfilterrow'] = 'Remove filter row';
$string['clearfilters'] = 'Clear filters';
$string['clearfilterselection'] = 'Remove "{$a}" from filter';
$string['countparticipantsfound'] = '{$a} participants found';
$string['filterrowlegend'] = 'Filter {$a}';
$string['filtersetmatchdescription'] = 'How multiple filters should be combined';
$string['match'] = 'Match';
$string['matchofthefollowing'] = 'of the following:';