MDL-52645 lang: Merge English strings from the en_fix language pack

moodle · Jan 4, 2016 · 8bd563e · 8bd563e
1 parent ef343c3
commit 8bd563e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/mod/assign/lang/en/assign.php b/mod/assign/lang/en/assign.php
@@ -446,7 +446,7 @@
 $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';

diff --git a/mod/forum/lang/en/forum.php b/mod/forum/lang/en/forum.php
@@ -393,7 +393,7 @@
 $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>';

diff --git a/theme/clean/lang/en/theme_clean.php b/theme/clean/lang/en/theme_clean.php
@@ -66,6 +66,6 @@
 
 $string['sitelogo'] = 'Site logo';
 $string['sitename'] = 'Display site name along with small logo';
-$string['sitenamedesc'] = 'This setting is only applied if a "Small logo" is set. If no small logo is set the site name is always displayed in the navigation bar, but if it is you can use this setting to display it or not.';
+$string['sitenamedesc'] = 'If there is no small logo, the site name is always displayed in the navigation bar. If a small logo is set, it may be displayed with or without the site name.';
 $string['smalllogo'] = 'Small logo';
-$string['smalllogodesc'] = 'This logo is displayed in the navbar next to the site name, if a "Logo" is set, then it is only displayed on the pages where the logo is not displayed.';
+$string['smalllogodesc'] = 'The small logo is displayed in the navigation bar. If there is a header logo for the front page and login page, the small logo is not displayed on these pages.';
diff --git a/theme/more/lang/en/theme_more.php b/theme/more/lang/en/theme_more.php
@@ -74,9 +74,9 @@
 $string['secondarybackground_desc'] = 'The background colour of any secondary content, such as blocks.';
 $string['sitelogo'] = 'Site logo';
 $string['sitename'] = 'Display site name along with small logo';
-$string['sitenamedesc'] = 'This setting is only applied if a "Small logo" is set. If no small logo is set the site name is always displayed in the navigation bar, but if it is you can use this setting to display it or not.';
+$string['sitenamedesc'] = 'If there is no small logo, the site name is always displayed in the navigation bar. If a small logo is set, it may be displayed with or without the site name.';
 $string['smalllogo'] = 'Small logo';
-$string['smalllogodesc'] = 'This logo is displayed in the navbar next to the site name, if a "Logo" is set, then it is only displayed on the pages where the logo is not displayed.';
+$string['smalllogodesc'] = 'The small logo is displayed in the navigation bar. If there is a header logo for the front page and login page, the small logo is not displayed on these pages.';
 $string['textcolor'] = 'Text colour';
 $string['textcolor_desc'] = 'The colour of the text.';