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

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

Browse source
This commit is contained in:
Dan Poltawski 2016-01-04 15:31:51 +00:00
commit 46cf618806
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -446,7 +446,7 @@ $string['updategrade'] = 'Update grade';
$string['updatetable'] = 'Save and update table';
$string['upgradenotimplemented'] = 'Upgrade not implemented in plugin ({$a->type} {$a->subtype})';
$string['userextensiondate'] = 'Extension granted until: {$a}';
$string['useridlistnotcached'] = 'Aborting save. Moodle could not determine which user to save the grade against.';
$string['useridlistnotcached'] = 'The grade changes were NOT saved, as it was not possible to determine which submission they were for.';
$string['userswhoneedtosubmit'] = 'Users who need to submit: {$a}';
$string['usergrade'] = 'User grade';
$string['validmarkingworkflowstates'] = 'Valid marking workflow states';

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

@ -393,7 +393,7 @@ $string['postincontext'] = 'See this post in context';
$string['postmailinfo'] = 'This is a copy of a message posted on the {$a} website.
To reply click on this link:';
$string['postmailinfolink'] = 'This is a copy of a message posted on the {$a->coursename} website.
$string['postmailinfolink'] = 'This is a copy of a message posted in {$a->coursename}.
To reply click on this link: {$a->replylink}';
$string['postmailnow'] = '<p>This post will be mailed out immediately to all forum subscribers.</p>';