Merge branch 'MDL-38352-en_fix' of git://github.com/mudrd8mz/moodle

admin/tool/uploaduser/lang/en/tool_uploaduser.php

@@ -69,7 +69,7 @@ $string['usersrenamed'] = 'Users renamed';
 $string['usersskipped'] = 'Users skipped';
 $string['usersupdated'] = 'Users updated';
 $string['usersweakpassword'] = 'Users having a weak password';
-$string['uubulk'] = 'Select for bulk operations';
+$string['uubulk'] = 'Select for bulk user actions';
 $string['uubulkall'] = 'All users';
 $string['uubulknew'] = 'New users';
 $string['uubulkupdated'] = 'Updated users';

blocks/admin_bookmarks/lang/en/block_admin_bookmarks.php

@@ -24,5 +24,5 @@
  */
 
 $string['admin_bookmarks:addinstance'] = 'Add a new admin bookmarks block';
-$string['admin_bookmarks:myaddinstance'] = 'Add a new admin bookmarks block to the My Moodle page';
+$string['admin_bookmarks:myaddinstance'] = 'Add a new admin bookmarks block to My home';
 $string['pluginname'] = 'Admin bookmarks';

blocks/calendar_month/lang/en/block_calendar_month.php

@@ -24,5 +24,5 @@
  */
 
 $string['calendar_month:addinstance'] = 'Add a new calendar block';
-$string['calendar_month:myaddinstance'] = 'Add a new calendar block to the My Moodle page';
+$string['calendar_month:myaddinstance'] = 'Add a new calendar block to My home';
 $string['pluginname'] = 'Calendar';

blocks/calendar_upcoming/lang/en/block_calendar_upcoming.php

@@ -24,5 +24,5 @@
  */
 
 $string['calendar_upcoming:addinstance'] = 'Add a new upcoming events block';
-$string['calendar_upcoming:myaddinstance'] = 'Add a new upcoming events block to the My Moodle page';
+$string['calendar_upcoming:myaddinstance'] = 'Add a new upcoming events block to My home';
 $string['pluginname'] = 'Upcoming events';

blocks/comments/lang/en/block_comments.php

@@ -23,6 +23,6 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['comments:myaddinstance'] = 'Add a new comments block to the My Moodle page';
+$string['comments:myaddinstance'] = 'Add a new comments block to My home';
 $string['comments:addinstance'] = 'Add a new comments block';
 $string['pluginname'] = 'Comments';

blocks/community/lang/en/block_community.php

@@ -38,7 +38,7 @@ $string['blocks'] = 'Blocks';
 $string['cannotselecttopsubject'] = 'Cannot select a top subject level';
 $string['comments'] = 'Comments ({$a})';
 $string['community:addinstance'] = 'Add a new community finder block';
-$string['community:myaddinstance'] = 'Add a new community finder block to the My Moodle page';
+$string['community:myaddinstance'] = 'Add a new community finder block to My home';
 $string['contentinfo'] = 'Subject: {$a->subject} - Audience: {$a->audience} - Educational level: {$a->educationallevel}';
 $string['continue'] = 'Continue';
 $string['contributors'] = ' - Contributors: {$a}';

blocks/course_list/lang/en/block_course_list.php

@@ -28,7 +28,7 @@ $string['allcourses'] = 'Admin user sees all courses';
 $string['configadminview'] = 'What should the admin see in the course list block?';
 $string['confighideallcourseslink'] = 'Hide "All courses" link at the bottom of the block. Link hiding does not affects Admin\'s view';
 $string['course_list:addinstance'] = 'Add a new courses block';
-$string['course_list:myaddinstance'] = 'Add a new courses block to the My Moodle page';
+$string['course_list:myaddinstance'] = 'Add a new courses block to My home';
 $string['hideallcourseslink'] = 'Hide All courses link';
 $string['owncourses'] = 'Admin user sees own courses';
 $string['pluginname'] = 'Courses';

blocks/course_overview/lang/en/block_course_overview.php

@@ -27,7 +27,7 @@ $string['alwaysshowall'] = 'Always Show All';
 $string['collapseall'] = 'Collapse All Course Lists';
 $string['configotherexpanded'] = 'If enabled, Other Courses will be expanded by default unless overriden by user preferences.';
 $string['configpreservestates'] = 'If enabled, the collapsed/expanded states set by the user are stored and used on each load.';
-$string['course_overview:myaddinstance'] = 'Add a new course overview block to the My Moodle page';
+$string['course_overview:myaddinstance'] = 'Add a new course overview block to My home';
 $string['defaultmaxcourses'] = 'Default maximum courses';
 $string['defaultmaxcoursesdesc'] = 'Maximum courses which should be displayed on course overview block, 0 will show all courses';
 $string['expandall'] = 'Expand All Course Lists';

blocks/course_summary/lang/en/block_course_summary.php

@@ -24,5 +24,5 @@
  */
 
 $string['coursesummary'] = 'Course summary';
-$string['course_summary:addinstance'] = 'Add a new course/site description block';
-$string['pluginname'] = 'Course/Site description';
+$string['course_summary:addinstance'] = 'Add a new course/site summary block';
+$string['pluginname'] = 'Course/site summary';

blocks/glossary_random/lang/en/block_glossary_random.php

@@ -23,7 +23,7 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['addentry'] = 'Add your own favorite quotes!';
+$string['addentry'] = 'Add a new entry';
 $string['askaddentry'] = 'When users can add entries to the glossary, show a link with this text';
 $string['askinvisible'] = 'When users cannot edit or view the glossary, show this text (without link)';
 $string['askviewglossary'] = 'When users can view the glossary but not add entries, show a link with this text';
@@ -44,5 +44,5 @@ $string['select_glossary'] = 'Take entries from this glossary';
 $string['showconcept'] = 'Show concept (heading) for each entry';
 $string['title'] = 'Title';
 $string['type'] = 'How a new entry is chosen';
-$string['viewglossary'] = 'More quotes...';
+$string['viewglossary'] = 'View all entries';
 $string['whichfooter'] = 'You can display links to actions of the glossary this block is associated with. The block will only display links to actions which are enabled for that glossary.';

blocks/html/lang/en/block_html.php

@@ -30,7 +30,7 @@ $string['configclasses_help'] = 'The purpose of this configuration is to aid wit
 $string['configcontent'] = 'Content';
 $string['configtitle'] = 'Block title';
 $string['html:addinstance'] = 'Add a new HTML block';
-$string['html:myaddinstance'] = 'Add a new HTML block to the My Moodle page';
+$string['html:myaddinstance'] = 'Add a new HTML block to My home';
 $string['leaveblanktohide'] = 'leave blank to hide the title';
 $string['newhtmlblock'] = '(new HTML block)';
 $string['pluginname'] = 'HTML';

blocks/messages/lang/en/block_messages.php

@@ -24,5 +24,5 @@
  */
 
 $string['messages:addinstance'] = 'Add a new messages block';
-$string['messages:myaddinstance'] = 'Add a new messages block to the My Moodle page';
+$string['messages:myaddinstance'] = 'Add a new messages block to My home';
 $string['pluginname'] = 'Messages';

blocks/mnet_hosts/lang/en/block_mnet_hosts.php

@@ -27,6 +27,6 @@ $string['error_authmnetneeded'] = 'MNet authentication plugin must be enabled to
 $string['error_localusersonly'] = 'Remote users can not jump to other MNet network servers from this host';
 $string['error_roamcapabilityneeded'] = 'Users need the capability \'Roam to a remote application via MNet\' to see the list of MNet network servers';
 $string['mnet_hosts:addinstance'] = 'Add a new network servers block';
-$string['mnet_hosts:myaddinstance'] = 'Add a new network servers block to the My Moodle page';
+$string['mnet_hosts:myaddinstance'] = 'Add a new network servers block to My home';
 $string['pluginname'] = 'Network servers';
 $string['server'] = 'Server';

blocks/myprofile/lang/en/block_myprofile.php

@@ -44,6 +44,6 @@ $string['display_lastaccess'] = 'Display last access';
 $string['display_currentlogin'] = 'Display current login';
 $string['display_lastip'] = 'Display last IP';
 $string['myprofile:addinstance'] = 'Add a new logged in user block';
-$string['myprofile:myaddinstance'] = 'Add a new logged in user block to the My Moodle page';
+$string['myprofile:myaddinstance'] = 'Add a new logged in user block to My home';
 $string['myprofile_settings'] = 'Visible user information';
 $string['pluginname'] = 'Logged in user';

blocks/navigation/lang/en/block_navigation.php

@@ -32,7 +32,7 @@ $string['enabledockdesc'] = 'Allow the user to dock this block';
 $string['expansionlimit'] = 'Generate navigation for the following';
 $string['linkcategoriesdesc'] = 'Display categories as links';
 $string['navigation:addinstance'] = 'Add a new navigation block';
-$string['navigation:myaddinstance'] = 'Add a new navigation block to the My Moodle page';
+$string['navigation:myaddinstance'] = 'Add a new navigation block to My home';
 $string['pluginname'] = 'Navigation';
 $string['trimmode'] = 'Trim mode';
 $string['trimmoderight'] = 'Trim characters from the right';

blocks/private_files/lang/en/block_private_files.php

@@ -27,5 +27,5 @@ $string['managemyfiles'] = 'Manage my files';
 $string['pluginname'] = 'My private files';
 $string['privatefiles'] = 'Private files';
 $string['private_files:addinstance'] = 'Add a new private files block';
-$string['private_files:myaddinstance'] = 'Add a new private files block to the My Moodle page';
+$string['private_files:myaddinstance'] = 'Add a new my private files block to My home';
 

blocks/rss_client/lang/en/block_rss_client.php

@@ -67,7 +67,7 @@ $string['rss_client:createprivatefeeds'] = 'Create private RSS feeds';
 $string['rss_client:createsharedfeeds'] = 'Create shared RSS feeds';
 $string['rss_client:manageanyfeeds'] = 'Manage any RSS feeds';
 $string['rss_client:manageownfeeds'] = 'Manage own RSS feeds';
-$string['rss_client:myaddinstance'] = 'Add a new remote RSS feeds block to the My Moodle page';
+$string['rss_client:myaddinstance'] = 'Add a new RSS feeds block to My home';
 $string['seeallfeeds'] = 'See all feeds';
 $string['sharedfeed'] = 'Shared feed';
 $string['shownumentrieslabel'] = 'Max number entries to show per block.';

blocks/settings/lang/en/block_settings.php

@@ -27,4 +27,4 @@
 $string['enabledock'] = 'Allow the user to dock this block';
 $string['pluginname'] = 'Administration';
 $string['settings:addinstance'] = 'Add a new administration block';
-$string['settings:myaddinstance'] = 'Add a new administration block to the My Moodle page';
+$string['settings:myaddinstance'] = 'Add a new settings block to My home';

blocks/tags/lang/en/block_tags.php

@@ -72,6 +72,6 @@ $string['showcoursetagsdef'] = 'Display the course tagging features in the tags
 $string['suggestedtagthisunit'] = 'Suggested tag to this course:';
 $string['tags'] = 'tags';
 $string['tags:addinstance'] = 'Add a new tags block';
-$string['tags:myaddinstance'] = 'Add a new tags block to the My Moodle page';
+$string['tags:myaddinstance'] = 'Add a new tags block to My home';
 $string['tagthisunit'] = 'Tag this course:';
 $string['tagunits'] = 'to tag your favourite courses';

lang/en/admin.php

@@ -49,7 +49,7 @@ $string['allowediplist'] = 'Allowed IP list';
 $string['allowemailaddresses'] = 'Allowed email domains';
 $string['allowframembedding'] = 'Allow frame embedding';
 $string['allowframembedding_help'] = 'Allow embedding of this site in frames on external sites. Enabling of this feature is not recommended for security reasons.';
-$string['allowguestmymoodle'] = 'Allow guest access to My Moodle';
+$string['allowguestmymoodle'] = 'Allow guest access to My home';
 $string['allowobjectembed'] = 'Allow EMBED and OBJECT tags';
 $string['allowthemechangeonurl'] = 'Allow theme changes in the URL';
 $string['allowuserblockhiding'] = 'Allow users to hide blocks';
@@ -127,7 +127,7 @@ $string['configallowblockstodock'] = 'If enabled and supported by the selected t
 $string['configallowcategorythemes'] = 'If you enable this, then themes can be set at the category level. This will affect all child categories and courses unless they have specifically set their own theme. WARNING: Enabling category themes may affect performance.';
 $string['configallowcoursethemes'] = 'If you enable this, then courses will be allowed to set their own themes.  Course themes override all other theme choices (site, user, or session themes)';
 $string['configallowemailaddresses'] = 'If you want to restrict all new email addresses to particular domains, then list them here separated by spaces.  All other domains will be rejected.  To allow subdomains add the domain with a preceding \'.\'. eg <strong>ourcollege.edu.au .gov.au</strong>';
-$string['configallowguestmymoodle'] = 'If enabled guests can access My Moodle, otherwise guests are redirected to the site front page.';
+$string['configallowguestmymoodle'] = 'If enabled guests can access My home, otherwise guests are redirected to the site front page.';
 $string['configallowobjectembed'] = 'As a default security measure, normal users are not allowed to embed multimedia (like Flash) within texts using explicit EMBED and OBJECT tags in their HTML (although it can still be done safely using the mediaplugins filter).  If you wish to allow these tags then enable this option.';
 $string['configallowoverride'] = 'You can allow people with the roles on the left side to override some of the column roles';
 $string['configallowoverride2'] = 'Select which role(s) can be overridden by each role in the left column.<br />Note that these settings only apply to users who have either the capability moodle/role:override or the capability moodle/role:safeoverride allowed.';
@@ -202,7 +202,7 @@ $string['configenablecomments'] = 'Enable comments';
 $string['configenablecourserequests'] = 'This will allow any user to request a course be created.';
 $string['configenablegroupmembersonly'] = 'If enabled, access to activities can be restricted to group members only. This may result in an increased server load. In addition, gradebook categories must be set up in a certain way to ensure that activities are hidden from non-group members.';
 $string['configenablemobilewebservice'] = 'Enable mobile service for the official Moodle app or other app requesting it. For more information, read the {$a}';
-$string['configenablerssfeeds'] = 'This switch will enable RSS feeds from across the site.  To actually see any change you will need to enable RSS feeds in the individual modules too - go to the Modules settings under Admin Configuration.';
+$string['configenablerssfeeds'] = 'If enabled, RSS feeds are generated by various features across the site, such as blogs, forums, database activities and glossaries. Note that RSS feeds also need to be enabled for the particular activity modules.';
 $string['configenablerssfeedsdisabled'] = 'It is not available because RSS feeds are disabled in all the Site. To enable them, go to the Variables settings under Admin Configuration.';
 $string['configenablerssfeedsdisabled2'] = 'RSS feeds are disabled at the server level. You need to enable them first in Server/RSS.';
 $string['configenablesafebrowserintegration'] = 'This adds the choice \'Require Safe Exam Browser\' to the \'Browser security\' field on the quiz settings form. See http://www.safeexambrowser.org/ for more information.';
@@ -264,7 +264,7 @@ $string['configmycoursesperpage'] = 'Maximum number of courses to display in any
 $string['configmymoodleredirect'] = 'This setting forces redirects to /my on login for non-admins and replaces the top level site navigation with /my';
 $string['configmypagelocked'] = 'This setting prevents the default page from being edited by any non-admins';
 $string['confignavcourselimit'] = 'Limits the number of courses shown to the user when they are either not logged in or are not enrolled in any courses.';
-$string['confignavshowallcourses'] = 'If enabled users will see courses they are enrolled in both within the My Courses branch and the course structure. When disabled users with enrolments will only see the My Courses branch of the navigaiton. The number of course shown would still be limited by "Course limit(navcourselimit)" setting when user is either not logged in or not enrolled in any course.';
+$string['confignavshowallcourses'] = 'This setting determines whether users who are enrolled in courses can see Courses (listing all courses) in the navigation, in addition to My Courses (listing courses in which they are enrolled).';
 $string['confignavshowcategories'] = 'Show course categories in the navigation bar and navigation blocks. This does not occur with courses the user is currently enrolled in, they will still be listed under mycourses without categories.';
 $string['confignotifyloginfailures'] = 'If login failures have been recorded, email notifications can be sent out.  Who should see these notifications?';
 $string['confignotifyloginthreshold'] = 'If notifications about failed logins are active, how many failed login attempts by one user or one IP address is it worth notifying about?';
@@ -311,7 +311,7 @@ $string['configsessioncookie'] = 'This setting customises the name of the cookie
 $string['configsessioncookiedomain'] = 'This allows you to change the domain that the Moodle cookies are available from. This is useful for Moodle customisations (e.g. authentication or enrolment plugins) that need to share Moodle session information with a web application on another subdomain. <strong>WARNING: it is strongly recommended to leave this setting at the default (empty) - an incorrect value will prevent all logins to the site.</strong>';
 $string['configsessioncookiepath'] = 'If you need to change where browsers send the Moodle cookies, you can change this setting to specify a subdirectory of your web site.  Otherwise the default \'/\' should be fine.';
 $string['configsessiontimeout'] = 'If people logged in to this site are idle for a long time (without loading pages) then they are automatically logged out (their session is ended).  This variable specifies how long this time should be.';
-$string['configshowicalsource'] = 'Show source information for ical events.';
+$string['configshowicalsource'] = 'Show source information for iCal events';
 $string['configshowcommentscount'] = 'Show comments count, it will cost one more query when display comments link';
 $string['configshowsiteparticipantslist'] = 'All of these site students and site teachers will be listed on the site participants list. Who shall be allowed to see this site participants list?';
 $string['configsitedefaultlicense'] = 'Default site licence';
@@ -324,9 +324,9 @@ $string['configstartwday'] = 'Start of week';
 $string['configstatsfirstrun'] = 'This specifies how far back the logs should be processed <b>the first time</b> the cronjob wants to process statistics. If you have a lot of traffic and are on shared hosting, it\'s probably not a good idea to go too far back, as it could take a long time to run and be quite resource intensive. (Note that for this setting, 1 month = 28 days. In the graphs and reports generated, 1 month = 1 calendar month.)';
 $string['configstatsmaxruntime'] = 'Stats processing can be quite intensive, so use a combination of this field and the next one to specify when it will run and how long for.';
 $string['configstatsmaxruntime2'] = 'Stats processing can be quite intensive, specify maximum time allowed for gathering of one day of statistics. Maximum number of days processed in one cron execution is 31.';
-$string['configstatsmaxruntime3'] = 'Specify the maximum time allowed to calculate the statistics for one day, bearing in mind that stats processing can put a big load on the server. The maximum number of days processed in one cron can be specified below.';
-$string['configstatsruntimedays'] = 'Specify the maximum number of days processed in each stats execution. When stats are up-to-date, only one day will be processed, so adjust this value depending of your server load, reducing it if shorter cron executions are needed.';
-$string['configstatsruntimestart'] = 'What time should the cronjob that does the stats processing <b>start</b>? Please specify different times if there are multiple Moodles on one physical server.';
+$string['configstatsmaxruntime3'] = 'This specifies the maximum time allowed to calculate the statistics for one day, bearing in mind that statistics processing can put a big load on the server. The maximum number of days processed in one cron can be specified below.';
+$string['configstatsruntimedays'] = 'This specifies the maximum number of days processed in each statistics execution. Once the statistics are up-to-date, only one day will be processed, so adjust this value depending of your server load, reducing it if shorter cron executions are needed.';
+$string['configstatsruntimestart'] = 'What time should the cronjob that does the statistics processing start? Specifying different times is recommended if there are multiple Moodle sites on one server.';
 $string['configstatsuserthreshold'] = 'This setting specifies the minimum number of enrolled users for a course to be included in statistics calculations.';
 $string['configstrictformsrequired'] = 'If enabled, users are prevented from entering a space or line break only in required fields in forms.';
 $string['configstripalltitletags'] = 'Uncheck this setting to allow HTML tags in activity and resource names.';
@@ -445,7 +445,7 @@ $string['download'] = 'Download';
 $string['edithelpdocs'] = 'Edit help documents';
 $string['editingnoncorelangfile'] = 'You are trying to modify translation of an add-on module/plugin. You can save translation of 3rd party modules in your _local folder only. You may want to move the file with translation into the module\'s lang directory and/or send it to the maintainer of the add-on module.';
 $string['editlang'] = '<b>Edit</b>';
-$string['editorbackgroundcolor'] = 'Background color';
+$string['editorbackgroundcolor'] = 'Background colour';
 $string['editordictionary'] = 'Editor dictionary';
 $string['editorfontfamily'] = 'Font family';
 $string['editorfontlist'] = 'Font list';
@@ -570,7 +570,7 @@ $string['helpcalendarcustomexport'] = 'Enable custom date range export option in
 $string['helpexportlookahead'] = 'How many days in the future does the calendar look for events during export for the custom export option?';
 $string['helpexportlookback'] = 'How many days in the past does the calendar look for events during export for the custom export option?';
 $string['helpforcetimezone'] = 'You can allow users to individually select their timezone, or force a timezone for everyone.';
-$string['helpshowicalsource'] = 'Enable this setting if you want to show the ical subscription name and link for ical imported events.';
+$string['helpshowicalsource'] = 'If enabled, the subscription name and link will be shown for iCal-imported events.';
 $string['helpsitemaintenance'] = 'For upgrades and other work';
 $string['helpstartofweek'] = 'Which day starts the week in the calendar?';
 $string['helpupcominglookahead'] = 'How many days in the future does the calendar look for upcoming events by default?';
@@ -725,12 +725,12 @@ $string['modeditdefaults'] = 'Default values for activity settings';
 $string['modsettings'] = 'Manage activities';
 $string['modulesecurity'] = 'Module security';
 $string['multilangforceold'] = 'Force old multilang syntax: &lt;span&gt; without the class="multilang" and &lt;lang&gt;';
-$string['mustenablestats'] = 'Stats have not yet been enabled on this site.';
+$string['mustenablestats'] = 'Statistics have not yet been enabled on this site.';
 $string['mycoursesperpage'] = 'Number of courses';
 $string['mydashboard'] = 'System default dashboard';
-$string['mymoodle'] = 'My Moodle';
+$string['mymoodle'] = 'My home';
 $string['mymoodleredirect'] = 'Force users to use My Moodle';
-$string['mypage'] = 'Default My Moodle page';
+$string['mypage'] = 'Default My home page';
 $string['myprofile'] = 'Default profile page';
 $string['mypagelocked'] = 'Lock default page';
 $string['mysql416bypassed'] = 'However, if your site is using iso-8859-1 (latin) languages ONLY, you may continue using your currently installed MySQL 4.1.12 (or higher).';
@@ -897,7 +897,7 @@ $string['registermoodleorgli2'] = 'Statistics about your site will be added to t
 $string['registermoodleorgli3'] = 'Your site is also registered with the Moodle.org Open Community Hub ({$a}), allowing users with the publish courses capability (by default only managers) the option of publishing courses to MOOCH.';
 $string['registerwithmoodleorg'] = 'Register with Moodle.org';
 $string['registration'] = 'Registration';
-$string['registration_help'] = 'It is recommended to register on Moodle.org to receive security email alerts, to contribute to the Moodle growth and statistics, or to be able to share courses on MOOCH.';
+$string['registration_help'] = 'Registering your site with Moodle.org is recommended in order to receive security alert notifications, to contribute <a href="http://moodle.org/stats">Moodle usage statistics</a> and to be able to share courses on <a href="http://hub.moodle.org/">MOOCH</a>.';
 $string['registrationwarning'] = 'Your site is not yet registered.';
 $string['releasenoteslink'] = 'For information about this version of Moodle, please see the online <a target="_blank" href="{$a}">Release Notes</a>';
 $string['rememberusername'] = 'Remember username';
@@ -1123,6 +1123,6 @@ $string['cachesettings'] = 'Cache settings';
 $string['cacherequest'] = 'Request cache';
 $string['cacherequesthelp'] = 'User specific cache that expires when the request is complete. Designed to replace areas where we are using the static stores.';
 $string['cachesession'] = 'Session cache';
-$string['cachesessionhelp'] = 'User specific cache that expires when the users session ends. Designed to aleviate session bloat/strain.';
+$string['cachesessionhelp'] = 'User specific cache that expires when the user\'s session ends. Designed to alleviate session bloat/strain.';
 $string['cacheapplication'] = 'Application cache';
 $string['cacheapplicationhelp'] = ' Cached items are shared amoung all users and expire by a determined ttl.';

lang/en/cache.php

@@ -100,7 +100,7 @@ $string['result'] = 'Result';
 $string['set'] = 'Set';
 $string['storeconfiguration'] = 'Store configuration';
 $string['storename'] = 'Store name';
-$string['storename_help'] = 'This sets the store name. It is used to identify the store within the system and can only consist of a-z A-Z 0-9 -_ and spaces. It also must be unique. If you attempt to use a name that has already been used you will recieve an error.';
+$string['storename_help'] = 'This sets the store name. It is used to identify the store within the system and can only consist of a-z A-Z 0-9 -_ and spaces. It also must be unique. If you attempt to use a name that has already been used you will receive an error.';
 $string['storenamealreadyused'] = 'You must choose a unique name for this store.';
 $string['storenameinvalid'] = 'Invalid store name. You can only use a-z A-Z 0-9 -_ and spaces.';
 $string['storeperformance'] = 'Cache store performance reporting - {$a} unique requests per operation.';

lang/en/calendar.php

@@ -35,7 +35,7 @@ $string['clickhide'] = 'click to hide';
 $string['clickshow'] = 'click to show';
 $string['colcalendar'] = 'Calendar';
 $string['collastupdated'] = 'Last updated';
-$string['colpoll'] = 'Poll';
+$string['colpoll'] = 'Update';
 $string['colactions'] = 'Actions';
 $string['commontasks'] = 'Options';
 $string['confirmeventdelete'] = 'Are you sure you want to delete this event?';
@@ -134,7 +134,7 @@ $string['notitle'] = 'no title';
 $string['noupcomingevents'] = 'There are no upcoming events';
 $string['nocalendarsubscriptions'] = 'You have no calendar subscriptions.';
 $string['oneevent'] = '1 event';
-$string['pollinterval'] = 'Poll interval';
+$string['pollinterval'] = 'Update interval';
 $string['pollinterval_help'] = 'How often you would like the calendar to update with new events.';
 $string['preferences'] = 'Preferences';
 $string['preferences_available'] = 'Your personal preferences';

lang/en/completion.php

@@ -53,9 +53,9 @@ $string['completionexpected_help']='This setting specifies the date when the act
 $string['completionicons'] = 'Completion tick boxes';
 $string['completionicons_help'] = 'A tick next an activity name may be used to indicate when the activity is complete.
 
-If a dotted tick is shown, you can click it to tick the box when you think you have completed the activity. (Clicking it again removes the tick if you change your mind.) The tick is optional and is simply a way of tracking your progress through the course.
+If a box with a dotted border is shown, a tick will appear automatically when you have completed the activity according to conditions set by the teacher.
 
-If a blank tick box is shown, a tick will appear automatically when you have completed the activity according to conditions set by the teacher.';
+If a box with a solid border is shown, you can click it to tick the box when you think you have completed the activity. (Clicking it again removes the tick if you change your mind.) The tick is optional and is simply a way of tracking your progress through the course.';
 $string['completion_manual'] = 'Students can manually mark the activity as completed';
 $string['completion_none'] = 'Do not indicate activity completion';
 $string['completion-title-manual-n'] = 'Mark as complete: {$a}';

lang/en/countries.php

@@ -158,7 +158,7 @@ $string['LS'] = 'Lesotho';
 $string['LT'] = 'Lithuania';
 $string['LU'] = 'Luxembourg';
 $string['LV'] = 'Latvia';
-$string['LY'] = 'Libya';
+$string['LY'] = 'State of Libya';
 $string['MA'] = 'Morocco';
 $string['MC'] = 'Monaco';
 $string['MD'] = 'Moldova, Republic Of';

lang/en/error.php

@@ -466,7 +466,7 @@ $string['socksnotsupported'] = 'SOCKS5 proxy is not supported in PHP4';
 $string['spellcheckernotconf'] = 'Spellchecker not configured';
 $string['sslonlyaccess'] = 'For security reasons only https connections are allowed, sorry.';
 $string['statscatchupmode'] = 'Statistics is currently in catchup mode. So far {$a->daysdone} day(s) have been processed and {$a->dayspending} are pending. Check back soon!';
-$string['statsdisable'] = 'Stats is not enabled';
+$string['statsdisable'] = 'Statistics are not enabled.';
 $string['statsnodata'] = 'There is no available data for that combination of course and time period';
 $string['storedfilecannotcreatefiledirs'] = 'Can not create local file pool directories, please verify permissions in dataroot.';
 $string['storedfilecannotread'] = 'Can not read file, either file does not exist or there are permission problems';

lang/en/moodle.php

@@ -317,7 +317,7 @@ $string['coursehelpformat'] = 'The course main page will be displayed in this fo
 $string['coursehelphiddensections'] = 'How the hidden sections in the course are displayed to students.';
 $string['coursehelpmaximumupload'] = 'Define the largest size of file that can be uploaded in this course, limited by the site-wide setting.';
 $string['coursehelpnewsitemsnumber'] = 'Number of recent items appearing on the course home page, in a news box down the right-hand side (0 means the news box won\'t appear).';
-$string['coursehelpnumberweeks'] = 'Number of weeks/topics displayed on the course main page.';
+$string['coursehelpnumberweeks'] = 'Number of sections in the course (applies to certain course formats only).';
 $string['coursehelpshowgrades'] = 'Enable the display of the gradebook. It does not prevent grades from being displayed within the individual activities.';
 $string['coursehidden'] = 'This course is currently unavailable to students';
 $string['courseinfo'] = 'Course info';
@@ -715,8 +715,8 @@ $string['from'] = 'From';
 $string['frontpagecategorycombo'] = 'Combo list';
 $string['frontpagecategorynames'] = 'List of categories';
 $string['frontpagecourselist'] = 'List of courses';
-$string['frontpagedescription'] = 'Front page description';
-$string['frontpagedescriptionhelp'] = 'This description of the site will be displayed on the front page.';
+$string['frontpagedescription'] = 'Front page summary';
+$string['frontpagedescriptionhelp'] = 'This summary can be displayed on the front page using the course/site summary block or by including a topic section on the front page.';
 $string['frontpageformat'] = 'Front page format';
 $string['frontpageformatloggedin'] = 'Front page format when logged in';
 $string['frontpagenews'] = 'News items';
@@ -997,8 +997,8 @@ $string['maximumgradex'] = 'Maximum grade: {$a}';
 $string['maximumshort'] = 'Max';
 $string['maximumupload'] = 'Maximum upload size';
 $string['maximumupload_help'] = 'This setting determines the largest size of file that can be uploaded to the course, limited by the site-wide setting set by an administrator. Activity modules also include a maximum upload size setting for further restricting the file size.';
-$string['maxnumberweeks'] = 'Maximum for number of weeks/topics';
-$string['maxnumberweeks_desc'] = 'This controls the maximum options that appears in the "Number of weeks/topics" setting for courses.';
+$string['maxnumberweeks'] = 'Maximum number of sections';
+$string['maxnumberweeks_desc'] = 'The maximum value in the number of sections dropdown menu (applies to certain course formats only).';
 $string['maxnumcoursesincombo'] = 'Browse <a href="{$a->link}">{$a->numberofcourses} courses</a>.';
 $string['maxsize'] = 'Max size: {$a}';
 $string['maxsizeandareasize'] = 'Maximum size for new files: {$a->size}, overall limit: {$a->areasize}';
@@ -1226,7 +1226,7 @@ $string['novalidcourses'] = 'No valid courses to be shown';
 $string['now'] = 'now';
 $string['numattempts'] = '{$a} failed login attempt(s)';
 $string['numberofcourses'] = 'Number of courses';
-$string['numberweeks'] = 'Number of weeks/topics';
+$string['numberweeks'] = 'Number of sections';
 $string['numdays'] = '{$a} days';
 $string['numhours'] = '{$a} hours';
 $string['numletters'] = '{$a} letters';
@@ -1498,7 +1498,9 @@ $string['selectdefault'] = 'Select default';
 $string['selectedfile'] = 'Selected file';
 $string['selectednowmove'] = '{$a} files selected for moving. Now go into the destination folder and press \'Move files to here\'';
 $string['selectfiles'] = 'Select files';
-$string['selectmoduletoviewhelp'] = 'Select a module to view its help.';
+$string['selectmoduletoviewhelp'] = 'Select an activity or resource to view its help.
+
+Double-click on an activity or resource name to quickly add it.';
 $string['selectnos'] = 'Select all \'no\'';
 $string['selectperiod'] = 'Select period';
 $string['senddetails'] = 'Send my details via email';
@@ -1526,7 +1528,7 @@ $string['showblockcourse'] = 'Show list of courses containing block';
 $string['showcomments'] = 'Show/hide comments';
 $string['showcommentsnonjs'] = 'Show comments';
 $string['showdescription'] = 'Display description on course page';
-$string['showdescription_help'] = 'If enabled, the introduction / description above will be displayed on the course page just below the link to the activity / resource.';
+$string['showdescription_help'] = 'If enabled, the description above will be displayed on the course page just below the link to the activity or resource.';
 $string['showgrades'] = 'Show gradebook to students';
 $string['showgrades_help'] = 'Many activities in the course allow grades to be set. This setting determines whether a student can view a list of all their grades for the course via a grades link in the course administration block.';
 $string['showlistofcourses'] = 'Show list of courses';
@@ -1751,7 +1753,7 @@ $string['userpic'] = 'User picture';
 $string['users'] = 'Users';
 $string['userselectorautoselectunique'] = 'If only one user matches the search, select them automatically';
 $string['userselectorpreserveselected'] = 'Keep selected users, even if they no longer match the search';
-$string['userselectorsearchanywhere'] = 'Match the search text anywhere in the user\'s name';
+$string['userselectorsearchanywhere'] = 'Match the search text anywhere in the displayed fields';
 $string['usersnew'] = 'New users';
 $string['usersnoaccesssince'] = 'Inactive for more than';
 $string['userswithfiles'] = 'Users with files';

lang/en/my.php

@@ -2,9 +2,9 @@
       // my.php - created with Moodle 1.7 beta + (2006101003)
 
 
-$string['mymoodle'] = 'My Moodle';
+$string['mymoodle'] = 'My home';
 $string['nocourses'] = 'No course information to show.';
-$string['noguest'] = 'The \'My Moodle\' page is not available to guest users';
+$string['noguest'] = 'The My home page is not available to guest users';
 $string['pinblocks'] = 'Configure pinned blocks for my moodle';
 $string['pinblocksexplan'] = 'Any block settings you configure here will be visible (and non-editable) for any user of moodle on their \'My Moodle\' overview page.';
 $string['defaultpage'] = 'Default My Moodle page';

lang/en/plugin.php

@@ -48,9 +48,9 @@ $string['notdownloadable'] = 'Can not download the package';
 $string['notdownloadable_help'] = 'ZIP package with the update can not be downloaded automatically. Please refer to the documentation page for more help.';
 $string['notdownloadable_link'] = 'admin/mdeploy/notdownloadable';
 $string['notwritable'] = 'Plugin files not writable';
-$string['notwritable_help'] = 'You have enabled automatic updates deployment and there is available update for this plugin. However, the plugin files are not writable by the web server so the update can not be installed at the moment.
+$string['notwritable_help'] = 'You have enabled automatic updates deployment and there is an available update for this plugin. However, the plugin files are not writable by the web server so the update cannot be installed automatically.
 
-Make the plugin folder and all its contents writable to be able to install the available update automatically.';
+You need to make the plugin folder and all its contents writable to be able to install the available update automatically.';
 $string['notwritable_link'] = 'admin/mdeploy/notwritable';
 $string['numtotal'] = 'Installed: {$a}';
 $string['numdisabled'] = 'Disabled: {$a}';
@@ -59,8 +59,7 @@ $string['numupdatable'] = 'Updates available: {$a}';
 $string['otherplugin'] = '{$a->component}';
 $string['otherpluginversion'] = '{$a->component} ({$a->version})';
 $string['showall'] = 'Reload and show all plugins';
-$string['pluginchecknotice'] = 'This page displays plugins that may require your attention during the upgrade. Highlighted items include new plugins that are about to be installed, updated plugins that are about to be upgraded and any missing plugins. Contributed plugins are also highlighted.
-It is recommended that you check whether there are more recent versions of contributed plugins available and update their source code before continuing with this Moodle upgrade.';
+$string['pluginchecknotice'] = 'This page displays plugins that may require your attention during the upgrade. Highlighted items include new plugins that are about to be installed, updated plugins that are about to be upgraded and any missing plugins. Add-ons are also highlighted. It is recommended that you check whether there are more recent versions of add-ons available and update their source code before continuing with this Moodle upgrade.';
 $string['plugindisable'] = 'Disable';
 $string['plugindisabled'] = 'Disabled';
 $string['pluginenable'] = 'Enable';
@@ -73,7 +72,7 @@ $string['somehighlighted'] = 'Number of plugins requiring your attention: {$a}';
 $string['somehighlightedinfo'] = 'Display the full list of installed plugins';
 $string['somehighlightedonly'] = 'Display only plugins requiring your attention';
 $string['source'] = 'Source';
-$string['sourceext'] = 'Contributed';
+$string['sourceext'] = 'Add-on';
 $string['sourcestd'] = 'Standard';
 $string['status'] = 'Status';
 $string['status_delete'] = 'To be deleted';

lang/en/repository.php

@@ -102,7 +102,7 @@ $string['enternewname'] = 'Please enter the new file name';
 $string['error'] = 'An unknown error occurred!';
 $string['errornotyourfile'] = 'You cannot pick file which is not added by your';
 $string['erroruniquename'] = 'Repository instance name should be unique';
-$string['errorpostmaxsize'] = 'The uploaded file may exceed max_post_size directive in php.ini.';
+$string['errorpostmaxsize'] = 'The uploaded file may exceed the post_max_size directive in php.ini.';
 $string['errorwhilecommunicatingwith'] = 'Error while communicating with the repository \'{$a}\'.';
 $string['errorwhiledownload'] = 'An error occured while downloading the file: {$a}';
 $string['existingrepository'] = 'This repository already exists';

lang/en/role.php

@@ -228,8 +228,8 @@ $string['manageroles'] = 'Manage roles';
 $string['maybeassignedin'] = 'Context types where this role may be assigned';
 $string['morethan'] = 'More than {$a}';
 $string['multipleroles'] = 'Multiple roles';
-$string['my:manageblocks'] = 'Manage My Moodle page blocks';
-$string['my:configsyspages'] = 'Configure system templates for My Moodle pages';
+$string['my:manageblocks'] = 'Manage My home page blocks';
+$string['my:configsyspages'] = 'Configure system templates for My home pages';
 $string['neededroles'] = 'Roles with permission';
 $string['nocapabilitiesincontext'] = 'No capabilities available in this context';
 $string['noneinthisx'] = 'None in this {$a}';

mod/assign/lang/en/assign.php

@@ -88,7 +88,7 @@ $string['couldnotfindassignmenttoupgrade'] = 'Could not find old assignment inst
 $string['currentgrade'] = 'Current grade in gradebook';
 $string['cutoffdate'] = 'Cut-off date';
 $string['cutoffdate_help'] = 'If set, the assignment will not accept submissions after this date without an extension.';
-$string['cutoffdatevalidation'] = 'Cut-off date must be after the due date.';
+$string['cutoffdatevalidation'] = 'The cut-off date cannot be earlier than the due date.';
 $string['cutoffdatefromdatevalidation'] = 'Cut-off date must be after the allow submissions from date.';
 $string['defaultplugins'] = 'Default assignment settings';
 $string['defaultplugins_help'] = 'These settings define the defaults for all new assignments.';
@@ -183,7 +183,7 @@ $string['messageprovider:assign_notification'] = 'Assignment notifications';
 $string['modulename'] = 'Assignment';
 $string['modulename_help'] = 'The assignment activity module enables a teacher to communicate tasks, collect work and provide grades and feedback.
 
-Students can submit any digital content (files), such as word-processed documents, spreadsheets, images, or audio and video clips. Alternatively, or in addition, the assignment may require students to type text directly into the text editor. An assignment can also be used to remind students of \'real-world\' assignments they need to complete offline, such as art work, and thus not require any digital content.
+Students can submit any digital content (files), such as word-processed documents, spreadsheets, images, or audio and video clips. Alternatively, or in addition, the assignment may require students to type text directly into the text editor. An assignment can also be used to remind students of \'real-world\' assignments they need to complete offline, such as art work, and thus not require any digital content. Students can submit work individually or as a member of a group.
 
 When reviewing assignments, teachers can leave feedback comments and upload files, such as marked-up student submissions, documents with comments or spoken audio feedback. Assignments can be graded using a numerical or custom scale or an advanced grading method such as a rubric. Final grades are recorded in the gradebook.';
 $string['modulename_link'] = 'mod/assignment/view';

mod/chat/lang/en/chat.php

@@ -26,7 +26,7 @@
 $string['activityoverview'] = 'You have upcoming chat';
 $string['ajax'] = 'Version using Ajax';
 $string['autoscroll'] = 'Auto scroll';
-$string['beep'] = 'beep';
+$string['beep'] = 'Beep';
 $string['cantlogin'] = 'Could not log in to chat room!!';
 $string['composemessage'] = 'Compose a message';
 $string['configmethod'] = 'The ajax chat method provide an ajax based chat interface, it contacts server regularly for update. The normal chat method involves the clients regularly contacting the server for updates. It requires no configuration and works everywhere, but it can create a large load on the server with many chatters.  Using a server daemon requires shell access to Unix, but it results in a fast scalable chat environment.';
@@ -54,7 +54,7 @@ $string['chat:deletelog'] = 'Delete chat logs';
 $string['chat:exportparticipatedsession'] = 'Export chat session which you took part in';
 $string['chat:exportsession'] = 'Export any chat session';
 $string['chat:chat'] = 'Access a chat room';
-$string['chatintro'] = 'Introduction text';
+$string['chatintro'] = 'Description';
 $string['chatname'] = 'Name of this chat room';
 $string['chat:readlog'] = 'Read chat logs';
 $string['chatreport'] = 'Chat sessions';
@@ -126,7 +126,7 @@ $string['serverip'] = 'Server ip';
 $string['servermax'] = 'Max users';
 $string['serverport'] = 'Server port';
 $string['sessions'] = 'Chat sessions';
-$string['sessionstart'] = 'Chat session will be start in: {$a}';
+$string['sessionstart'] = 'The next chat session will start in {$a}';
 $string['strftimemessage'] = '%H:%M';
 $string['studentseereports'] = 'Everyone can view past sessions';
 $string['studentseereports_help'] = 'If set to No, only users have mod/chat:readlog capability are able to see the chat logs';

mod/data/lang/en/data.php

@@ -182,7 +182,7 @@ $string['includeapproval'] = 'Include approval status';
 $string['includetime'] = 'Include time added/modified';
 $string['includeuserdetails'] = 'Include user details';
 $string['insufficiententries'] = 'more entries needed to view this database';
-$string['intro'] = 'Introduction';
+$string['intro'] = 'Description';
 $string['invalidaccess'] = 'This page was not accessed correctly';
 $string['invalidfieldid'] = 'Field ID is incorrect';
 $string['invalidfieldname'] = 'Please choose another name for this field';

mod/forum/lang/en/forum.php

@@ -169,7 +169,7 @@ $string['forum:editanypost'] = 'Edit any post';
 $string['forum:exportdiscussion'] = 'Export whole discussion';
 $string['forum:exportownpost'] = 'Export own post';
 $string['forum:exportpost'] = 'Export post';
-$string['forumintro'] = 'Forum introduction';
+$string['forumintro'] = 'Description';
 $string['forum:managesubscriptions'] = 'Manage subscriptions';
 $string['forum:movediscussions'] = 'Move discussions';
 $string['forum:postwithoutthrottling'] = 'Exempt from post threshold';
@@ -187,7 +187,7 @@ $string['forumtrackednot'] = 'Unread posts are not being tracked';
 $string['forumtype'] = 'Forum type';
 $string['forumtype_help'] = 'There are 5 forum types:
 
-* A single simple discussion - A single discussion topic which everyone can reply to
+* A single simple discussion - A single discussion topic which everyone can reply to (cannot be used with separate groups)
 * Each person posts one discussion - Each student can post exactly one new discussion topic, which everyone can then reply to
 * Q and A forum - Students must first post their perspectives before viewing other students\' posts
 * Standard forum displayed in a blog-like format - An open forum where anyone can start a new discussion at any time, and in which discussion topics are displayed on one page with "Discuss this topic" links

mod/lesson/lang/en/lesson.php

@@ -117,7 +117,7 @@ $string['credit'] = 'Credit';
 $string['customscoring'] = 'Custom scoring';
 $string['customscoring_help'] = 'If enabled, then each answer may be given a numerical point value (positive or negative).';
 $string['deadline'] = 'Deadline';
-$string['defaultessayresponse'] = 'Your essay will be graded by the course instructor.';
+$string['defaultessayresponse'] = 'Your essay will be graded by your teacher.';
 $string['deleteallattempts'] = 'Delete all lesson attempts';
 $string['deletedefaults'] = 'Deleted {$a} x lesson default';
 $string['deletedpage'] = 'Deleted page';

mod/page/lang/en/page.php

@@ -53,9 +53,9 @@ $string['page:addinstance'] = 'Add a new page resource';
 $string['page:view'] = 'View page content';
 $string['pluginadministration'] = 'Page module administration';
 $string['pluginname'] = 'Page';
-$string['popupheight'] = 'Popup height (in pixels)';
+$string['popupheight'] = 'Pop-up height (in pixels)';
 $string['popupheightexplain'] = 'Specifies default height of popup windows.';
-$string['popupwidth'] = 'Popup width (in pixels)';
+$string['popupwidth'] = 'Pop-up width (in pixels)';
 $string['popupwidthexplain'] = 'Specifies default width of popup windows.';
 $string['printheading'] = 'Display page name';
 $string['printheadingexplain'] = 'Display page name above content?';

mod/quiz/lang/en/quiz.php

@@ -212,7 +212,7 @@ $string['datasetnumber'] = 'Number';
 $string['daysavailable'] = 'Days available';
 $string['decimaldigits'] = 'Decimal digits in grades';
 $string['decimalplaces'] = 'Decimal places in grades';
-$string['decimalplaces_help'] = 'This setting specifies the number of digits shown after the decimal point when displaying grades or grades. It only effects the display of grades, not the grades stored in the database, nor the internal calculations, which are carried out to full accuracy.';
+$string['decimalplaces_help'] = 'This setting specifies the number of digits shown after the decimal point when displaying grades. It only affects the display of grades, not the grades stored in the database, nor the internal calculations, which are carried out to full accuracy.';
 $string['decimalplacesquestion'] = 'Decimal places in question grades';
 $string['decimalplacesquestion_help'] = 'This setting specifies the number of digits shown after the decimal point when displaying the grades for individual questions.';
 $string['decimalpoints'] = 'Decimal points';
@@ -388,7 +388,7 @@ $string['indivresp'] = 'Responses of individuals to each item';
 $string['info'] = 'Info';
 $string['infoshort'] = 'i';
 $string['inprogress'] = 'In progress';
-$string['introduction'] = 'Introduction';
+$string['introduction'] = 'Description';
 $string['invalidattemptid'] = 'No such attempt ID exists';
 $string['invalidcategory'] = 'Category ID is invalid';
 $string['invalidnumericanswer'] = 'One of the answers you entered was not a valid number.';

mod/resource/lang/en/resource.php

@@ -82,11 +82,11 @@ $string['optionsheader'] = 'Options';
 $string['page-mod-resource-x'] = 'Any file module page';
 $string['pluginadministration'] = 'File module administration';
 $string['pluginname'] = 'File';
-$string['popupheight'] = 'Popup height (in pixels)';
+$string['popupheight'] = 'Pop-up height (in pixels)';
 $string['popupheightexplain'] = 'Specifies default height of popup windows.';
 $string['popupresource'] = 'This resource should appear in a popup window.';
 $string['popupresourcelink'] = 'If it didn\'t, click here: {$a}';
-$string['popupwidth'] = 'Popup width (in pixels)';
+$string['popupwidth'] = 'Pop-up width (in pixels)';
 $string['popupwidthexplain'] = 'Specifies default width of popup windows.';
 $string['printheading'] = 'Display resource name';
 $string['printheadingexplain'] = 'Display resource name above content? Some display types may not display resource name even if enabled.';

mod/survey/lang/en/survey.php

@@ -187,7 +187,7 @@ $string['colles8'] = 'I think critically about ideas in the readings.';
 $string['colles8short'] = 'I\'m critical of readings';
 $string['colles9'] = 'I explain my ideas to other students.';
 $string['colles9short'] = 'I explain my ideas';
-$string['customintro'] = 'Custom intro';
+$string['customintro'] = 'Description';
 $string['deleteallanswers'] = 'Delete all survey responses';
 $string['deleteanalysis'] = 'Delete response analysis';
 $string['done'] = 'Done';

mod/url/lang/en/url.php

@@ -64,9 +64,9 @@ $string['parametersheader'] = 'Parameters';
 $string['parametersheader_help'] = 'Some internal Moodle variables may be automatically appended to the URL. Type your name for the parameter into each text box(es) and then select the required matching variable.';
 $string['pluginadministration'] = 'URL module administration';
 $string['pluginname'] = 'URL';
-$string['popupheight'] = 'Popup height (in pixels)';
+$string['popupheight'] = 'Pop-up height (in pixels)';
 $string['popupheightexplain'] = 'Specifies default height of popup windows.';
-$string['popupwidth'] = 'Popup width (in pixels)';
+$string['popupwidth'] = 'Pop-up width (in pixels)';
 $string['popupwidthexplain'] = 'Specifies default width of popup windows.';
 $string['printheading'] = 'Display URL name';
 $string['printheadingexplain'] = 'Display URL name above content? Some display types may not display URL name even if enabled.';

mod/wiki/lang/en/wiki.php

@@ -231,7 +231,7 @@ $string['wikiheader'] = 'Level {$a} Header';
 $string['wikihr'] = 'Horizontal rule';
 $string['wikiimage'] = 'Image';
 $string['wikiinternalurl'] = 'Internal link';
-$string['wikiintro'] = 'Wiki description';
+$string['wikiintro'] = 'Description';
 $string['wikiitalictext'] = 'Italic text';
 $string['wikilockingsettings'] = 'Locking and reparsing timeouts';
 $string['wikimode'] = 'Wiki mode';

mod/workshop/lang/en/workshop.php

@@ -79,7 +79,7 @@ $string['clearassessments_help'] = 'The calculated grades for submission and gra
 $string['clearassessmentsconfirm'] = 'Are you sure you want to clear all assessment grades? You will not be able to get the information back on your own, reviewers will have to re-assess the allocated submissions.';
 $string['clearaggregatedgradesconfirm'] = 'Are you sure you want to clear the calculated grades for submissions and grades for assessment?';
 $string['conclusion'] = 'Conclusion';
-$string['conclusion_help'] = 'Conclusion is a text displayed to participants at the end of the activity. You may want to provide an overall feedback, summary or suggestions on what should be done next (e.g. writing a blog post reflecting the new experience).';
+$string['conclusion_help'] = 'Conclusion text is displayed to participants at the end of the activity.';
 $string['configexamplesmode'] = 'Default mode of examples assessment in workshops';
 $string['configgrade'] = 'Default maximum grade for submission in workshops';
 $string['configgradedecimals'] = 'Default number of digits that should be shown after the decimal point when displaying grades.';
@@ -154,7 +154,7 @@ $string['iamsure'] = 'Yes, I am sure';
 $string['info'] = 'Info';
 $string['instructauthors'] = 'Instructions for submission';
 $string['instructreviewers'] = 'Instructions for assessment';
-$string['introduction'] = 'Introduction';
+$string['introduction'] = 'Description';
 $string['latesubmissions'] = 'Late submissions';
 $string['latesubmissions_desc'] = 'Allow submissions after the deadline';
 $string['latesubmissions_help'] = 'If enabled, an author may submit their work after the submissions deadline or during the assessment phase. Late submissions cannot be edited though.';
@@ -263,7 +263,7 @@ $string['taskassessself'] = 'Assess yourself';
 $string['taskconclusion'] = 'Provide a conclusion of the activity';
 $string['taskinstructauthors'] = 'Provide instructions for submission';
 $string['taskinstructreviewers'] = 'Provide instructions for assessment';
-$string['taskintro'] = 'Set the workshop introduction';
+$string['taskintro'] = 'Set the workshop description';
 $string['tasksubmit'] = 'Submit your work';
 $string['toolbox'] = 'Workshop toolbox';
 $string['undersetup'] = 'The workshop is currently being set up. Please wait until it is switched to the next phase.';

theme/arialist/lang/en/theme_arialist.php

@@ -62,8 +62,8 @@ $string['choosereadme'] = '
 	</div>
 </div>';
 
-$string['linkcolor'] = 'Link color';
-$string['linkcolordesc'] = 'This sets the link color for the theme.';
+$string['linkcolor'] = 'Link colour';
+$string['linkcolordesc'] = 'This sets the link colour for the theme.';
 $string['configtitle'] = 'Arialist settings';
 $string['customcss'] = 'Custom CSS';
 $string['customcssdesc'] = 'Any CSS you enter here will be added to every page allowing your to easily customise this theme.';

theme/brick/lang/en/theme_brick.php

@@ -26,42 +26,7 @@
 $string['pluginname'] = 'Brick';
 $string['region-side-post'] = 'Right';
 $string['region-side-pre'] = 'Left';
-$string['choosereadme'] = '<div class="clearfix">
-
-<div class="theme_screenshot">
-
-	<h2 style="padding-top:0.5em;">Brick</h2>
-	<img src="brick/pix/screenshot.png" />
-
-	<h3>Theme Discussion Forum:</h3>
-	<p><a href="http://moodle.org/mod/forum/view.php?id=46">http://moodle.org/mod/forum/view.php?id=46</a></p>
-
-	<h3>Theme Documentation:</h3>
-	<p><a href="http://docs.moodle.org/en/Themes">http://docs.moodle.org/en/Themes</a></p>
-
-	<h3>Theme Credits</h3>
-	<p><a href="http://docs.moodle.org/en/Theme_credits">http://docs.moodle.org/en/Theme_credits</a></p>
-
-	<h3>Report a bug:</h3>
-	<p><a href="http://tracker.moodle.org">http://tracker.moodle.org</a></p>
-
-</div>
-<div class="theme_description">
-
-	<h2>About</h2>
-	<p>Brick is a two-column, fluid-width theme for Moodle 2.0. You can change the theme color scheme via the theme settings page.</p>
-
-	<h2>Tweaks</h2>
-	<p>This theme is built upon both Base and Canvas, two parent themes included in the Moodle core. If you wish to modify aspects of this theme beyond the settings offered, we advise creating a new theme that uses this theme, Base, and Canvas all as parents. This will ensure updates to any of those themes in the core will find their way into your new theme.</p>
-
-	<h2>Credits</h2>
-	<p>This theme was coded and is maintained by John Stabinger of NewSchool Learning. He can be contacted by email at contact@newschoollearning.com. </p>
-
-	<h2>License</h2>
-	<p>This, and all other themes included in the Moodle core, are licensed under the <a href="http://www.gnu.org/licenses/gpl.html">GNU General Public License</a>.</p>
-
-</div>
-</div>';
+$string['choosereadme'] = '<div class="clearfix"> <div class="theme_screenshot"> <h2 style="padding-top:0.5em;">Brick</h2> <img src="brick/pix/screenshot.png" /> <h3>Theme Discussion Forum:</h3> <p><a href="http://moodle.org/mod/forum/view.php?id=46">http://moodle.org/mod/forum/view.php?id=46</a></p> <h3>Theme Documentation:</h3> <p><a href="http://docs.moodle.org/en/Themes">http://docs.moodle.org/en/Themes</a></p> <h3>Theme Credits</h3> <p><a href="http://docs.moodle.org/en/Theme_credits">http://docs.moodle.org/en/Theme_credits</a></p> <h3>Report a bug:</h3> <p><a href="http://tracker.moodle.org">http://tracker.moodle.org</a></p> </div> <div class="theme_description"> <h2>About</h2> <p>Brick is a two-column, fluid-width theme for Moodle 2.0. You can change the theme colour scheme via the theme settings page.</p> <h2>Tweaks</h2> <p>This theme is built upon both Base and Canvas, two parent themes included in the Moodle core. If you wish to modify aspects of this theme beyond the settings offered, we advise creating a new theme that uses this theme, Base, and Canvas all as parents. This will ensure updates to any of those themes in the core will find their way into your new theme.</p> <h2>Credits</h2> <p>This theme was coded and is maintained by John Stabinger of NewSchool Learning. He can be contacted by email at contact@newschoollearning.com. </p> <h2>License</h2> <p>This, and all other themes included in the Moodle core, are licensed under the <a href="http://www.gnu.org/licenses/gpl.html">GNU General Public License</a>.</p> </div> </div>';
 
 $string['configtitle'] = 'Brick settings';
 
@@ -69,16 +34,16 @@ $string['logo'] = 'logo';
 $string['logodesc'] = 'Change the logo of this theme by entering the URL to a new one (i.e., http://www.somesite/animage.png). As a reference, the default logo is 265px wide by 60px high. A transparent PNG will work best.';
 
 $string['linkcolor'] = 'link';
-$string['linkcolordesc'] = 'Set the color of links in the theme, use html hex code.';
+$string['linkcolordesc'] = 'Set the colour of links in the theme. Use html hex code.';
 
 $string['linkhover'] = 'linkhover';
-$string['linkhoverdesc'] = 'Set the color of links (on hover) in the theme, use html hex code.';
+$string['linkhoverdesc'] = 'Set the colour of links (on hover) in the theme. Use html hex code.';
 
-$string['maincolor'] = 'maincolor';
-$string['maincolordesc'] = 'Set the color hex code of the header, dock bar and other areas. Looks best as a dark or saturated color.';
+$string['maincolor'] = 'Main colour';
+$string['maincolordesc'] = 'Set the colour hex code of the header, dock bar and other areas. Looks best as a dark or saturated colour.';
 
-$string['maincolorlink'] = 'maincolorlink';
-$string['maincolorlinkdesc'] = 'Link color for menu bar and block titles.';
+$string['maincolorlink'] = 'Main colour link';
+$string['maincolorlinkdesc'] = 'Link colour for menu bar and block titles.';
 
-$string['headingcolor'] = 'headingcolor';
-$string['headingcolordesc'] = 'This is the heading color for large headings (site news, my courses) and other headings.';
+$string['headingcolor'] = 'Heading colour';
+$string['headingcolordesc'] = 'This is the heading colour for large headings (site news, my courses) and other headings.';

theme/formal_white/lang/en/theme_formal_white.php

@@ -88,6 +88,6 @@ $string['noframe'] = 'Formal white 1.9 look';
 $string['noframedesc'] = 'Select this option to require your moodle page to look like moodle 1.*, alias, without the surrounding frame.';
 $string['pluginname'] = 'Formal white';
 $string['rblockcolumnbgc'] = 'Right column background colour';
-$string['rblockcolumnbgcdesc'] = 'This sets the right column background colour for the theme. If you leave this empty the left column background color will be used.';
+$string['rblockcolumnbgcdesc'] = 'This sets the right column background colour for the theme. If you leave this empty the left column background colour will be used.';
 $string['region-side-post'] = 'Right';
 $string['region-side-pre'] = 'Left';

theme/fusion/lang/en/theme_fusion.php

@@ -58,8 +58,8 @@ $string['choosereadme'] = '
 	</div>
 </div>';
 
-$string['linkcolor'] = 'Link color';
-$string['linkcolordesc'] = 'This sets the link color for the theme.';
+$string['linkcolor'] = 'Link colour';
+$string['linkcolordesc'] = 'This sets the link colour for the theme.';
 $string['configtitle'] = 'Fusion settings';
 $string['customcss'] = 'Custom CSS';
 $string['customcssdesc'] = 'Any CSS you enter here will be added to every page allowing your to easily customise this theme.';

theme/magazine/lang/en/theme_magazine.php

@@ -12,23 +12,23 @@ $string['background'] = 'background';
 $string['backgrounddesc'] = 'Change the background image by entering the URL to a new image. (i.e., http://www.somesite/mybackground.jpg).';
 
 $string['linkcolor'] = 'link';
-$string['linkcolordesc'] = 'Set the color of links in the theme, use html hex code.';
+$string['linkcolordesc'] = 'Set the colour of links in the theme. Use html hex code.';
 
 $string['linkhover'] = 'linkhover';
-$string['linkhoverdesc'] = 'Set the color of links (on hover) in the theme, use html hex code.';
+$string['linkhoverdesc'] = 'Set the colour of links (on hover) in the theme. Use html hex code.';
 
-$string['maincolor'] = 'maincolor';
-$string['maincolordesc'] = 'Set the color hex code of the header, dock bar and other areas. Looks best as a dark or saturated color.';
+$string['maincolor'] = 'Main colour';
+$string['maincolordesc'] = 'Set the colour hex code of the header, dock bar and other areas. Looks best as a dark or saturated colour.';
 
-$string['maincoloraccent'] = 'maincoloraccent';
-$string['maincoloraccentdesc'] = 'Dark accent color for the dock bar and header borders. Should be slightly darker than the main color.';
+$string['maincoloraccent'] = 'Main colour accent';
+$string['maincoloraccentdesc'] = 'Dark accent colour for the dock bar and header borders. Should be slightly darker than the main colour.';
 
-$string['headingcolor'] = 'headingcolor';
-$string['headingcolordesc'] = 'This is the heading color for large headings (site news, my courses) and other headings.';
+$string['headingcolor'] = 'Heading colour';
+$string['headingcolordesc'] = 'This is the heading colour for large headings (site news, my courses) and other headings.';
 
-$string['blockcolor'] = 'blockcolor';
-$string['blockcolordesc'] = 'This is for the block header font color.';
+$string['blockcolor'] = 'Block colour';
+$string['blockcolordesc'] = 'This is for the block header font colour.';
 
 
 $string['forumback'] = 'forumback';
-$string['forumbackdesc'] = 'Set the background color of forum post subject.';
+$string['forumbackdesc'] = 'Set the background colour of forum post subject.';

theme/mymobile/lang/en/theme_mymobile.php

@@ -24,8 +24,8 @@
  */
 
 $string['choosereadme'] = '<div class="clearfix"><div class="theme_screenshot"><h2>MyMobile</h2><img src="mymobile/pix/screenshot.png" /><h2>About</h2><p>MyMobile is a mobile theme for Moodle 2.x. More information on modifying themes can be found in the <a href="http://docs.moodle.org/en/Theme">MoodleDocs</a>.</p></div></div>';
-$string['colourswatch'] = 'Mobile theme color swatch';
-$string['colourswatch_desc'] = 'Toggle the color swatch of the theme between grey and light/blue.';
+$string['colourswatch'] = 'Mobile theme colour swatch';
+$string['colourswatch_desc'] = 'Toggle the colour swatch of the theme between grey and light/blue.';
 $string['grey'] = 'Grey';
 $string['light'] = 'Light/Blue';
 $string['mtoggle'] = 'Toggle 2nd Column';

theme/nimble/lang/en/theme_nimble.php

@@ -65,11 +65,11 @@ $string['footerline'] = 'Footerline';
 $string['footerlinedesc'] = 'Add some text (copyright info, etc.) to the footer.';
 
 $string['backgroundcolor'] = 'Header background';
-$string['backgroundcolordesc'] = 'Change the background color of the header.';
+$string['backgroundcolordesc'] = 'Change the background colour of the header.';
 
-$string['linkcolor'] = 'Link color';
-$string['linkcolordesc'] = 'Set the color of links in the theme, use html hex code.';
+$string['linkcolor'] = 'Link colour';
+$string['linkcolordesc'] = 'Set the colour of links in the theme. Use html hex code.';
 
-$string['linkhover'] = 'Menu hover color';
-$string['linkhoverdesc'] = 'Set the color of the menu on hover in the theme, use html hex code.';
+$string['linkhover'] = 'Menu hover colour';
+$string['linkhoverdesc'] = 'Set the colour of the menu on hover in the theme. Use html hex code.';
 

theme/overlay/lang/en/theme_overlay.php

@@ -30,12 +30,12 @@ $string['choosereadme'] = '<div class="clearfix"><div class="theme_screenshot"><
 
 // Config
 
-$string['linkcolor'] = 'Link color';
-$string['linkcolordesc'] = 'This sets the link color for the theme.';
+$string['linkcolor'] = 'Link colour';
+$string['linkcolordesc'] = 'This sets the link colour for the theme.';
 $string['configtitle'] = 'Overlay settings';
 $string['customcss'] = 'Custom CSS';
 $string['customcssdesc'] = 'Any CSS you enter here will be added to every page allowing your to easily customise this theme.';
-$string['headercolor'] = 'Headercolor';
-$string['headercolordesc'] = 'Header background color.';
+$string['headercolor'] = 'Header colour';
+$string['headercolordesc'] = 'Header background colour.';
 $string['footertext'] = 'Footertext';
 $string['footertextdesc'] = 'Set a footnote or footer text.';