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

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

Browse source
This commit is contained in:
Eloy Lafuente (stronk7) 2020-02-26 17:13:12 +01:00
commit d2ac7726eb
15 changed files with 49 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mod/folder/lang/en/folder.php
View file

@ -59,9 +59,7 @@ $string['privacy:metadata'] = 'The Folder resource plugin does not store any per
$string['pluginadministration'] = 'Folder administration';
$string['pluginname'] = 'Folder';
$string['display'] = 'Display folder contents';
$string['display_help'] = 'If you choose to display the folder contents on a course page, there will be no link to a separate page.
The description will be displayed only if "Display description on course page" is checked.<br />
Also note that participants view actions can not be logged in this case.';
$string['display_help'] = 'If you choose to display the folder contents on a course page, there will be no link to a separate page. The description will be displayed only if \'Display description on course page\' is ticked. Note that participants view actions cannot be logged in this case.';
$string['displaypage'] = 'On a separate page';
$string['displayinline'] = 'Inline on a course page';
$string['noautocompletioninline'] = 'Automatic completion on viewing of activity can not be selected together with "Display inline" option';

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

@ -434,7 +434,7 @@ $string['more'] = 'more';
$string['movedmarker'] = '(Moved)';
$string['movethisdiscussionlabel'] = 'Move the current discussion to the specified forum';
$string['movethisdiscussionto'] = 'Move this discussion to ...';
$string['mustprovidediscussionorpost'] = 'You must provide either a discussion id or post id to export';
$string['mustprovidediscussionorpost'] = 'You must provide either a discussion ID or post ID to export.';
$string['myprofileownpost'] = 'My forum posts';
$string['myprofileowndis'] = 'My forum discussions';
$string['myprofileotherdis'] = 'Forum discussions';

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

@ -432,7 +432,7 @@ $string['importingquestions'] = 'Importing {$a} questions from file';
$string['importmaxerror'] = 'There is an error in the question. There are too many answers.';
$string['importmax10error'] = 'There is an error in the question. You may not have more than ten answers';
$string['importquestions'] = 'Import questions from file';
$string['inactiveoverridehelp'] = '* Student does not have the correct group or role to attempt the quiz';
$string['inactiveoverridehelp'] = '* User doesn\'t have the correct group or role to attempt the quiz, or the quiz is hidden.';
$string['incorrect'] = 'Incorrect';
$string['indicator:cognitivedepth'] = 'Quiz cognitive';
$string['indicator:cognitivedepth_help'] = 'This indicator is based on the cognitive depth reached by the student in a Quiz activity.';