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-60449-master-enfix' of git://github.com/mudrd8mz/moodle

Browse source
This commit is contained in:
Eloy Lafuente (stronk7) 2017-10-19 22:20:01 +02:00
commit ecb4a05cc2
16 changed files with 47 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -505,9 +505,7 @@ $string['subscriptionmode_help'] = 'When a participant is subscribed to a forum
* Optional subscription - Participants can choose whether to be subscribed
* Forced subscription - Everyone is subscribed and cannot unsubscribe
* Auto subscription - Everyone is subscribed initially but can choose to unsubscribe at any time
* Subscription disabled - Subscriptions are not allowed
Note: Any subscription mode changes will only affect users who enrol in the course in the future, and not existing users.';
* Subscription disabled - Subscriptions are not allowed';
$string['subscriptionoptional'] = 'Optional subscription';
$string['subscriptionforced'] = 'Forced subscription';
$string['subscriptionauto'] = 'Auto subscription';

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

@ -31,7 +31,7 @@ $string['keepoldexplain'] = 'How many packages should be archived?';
$string['indicator:cognitivedepth'] = 'IMS pkg cognitive';
$string['indicator:cognitivedepth_help'] = 'This indicator is based on the cognitive depth reached by the student in an IMS content package resource.';
$string['indicator:socialbreadth'] = 'IMS pkg social';
$string['indicator:socialbreadth_help'] = 'This indicator is based on the social depth reached by the student in an IMS content package resource.';
$string['indicator:socialbreadth_help'] = 'This indicator is based on the social breadth reached by the student in an IMS content package resource.';
$string['imscp:addinstance'] = 'Add a new IMS content package';
$string['imscp:view'] = 'View IMS content';
$string['modulename'] = 'IMS content package';