Bug 1822504: Small language string changes

The majority of the strings did not need a new
string ID or in a couple of cases couldn't have
their string ID changed as it required a specific
one.

behatnotneeded

Change-Id: I76b960e40e9ed2d8be8c3f484b497fd5d9dd1c92

htdocs/admin/groups/uploadcsv.php

@@ -239,7 +239,7 @@ function uploadcsv_validate(Pieform $form, $values) {
         }
         if ($category) {
             if (!get_config('allowgroupcategories')) {
-                $csverrors->add($i, get_string('uploadgroupcsverrordoesnotallowgroupcategory', 'admin', $i));
+                $csverrors->add($i, get_string('uploadgroupcsverrordoesnotallowgroupcategory1', 'admin', $i));
             }
             $categorytitle = $line[$formatkeylookup['category']];
             // Check if this is a valid category name

htdocs/auth/internal/lang/en.utf8/auth.internal.php

@@ -26,7 +26,7 @@ $string['registeredemailsubject'] = 'You have registered at %s';
 $string['registeredemailmessagetext'] = 'Hi %s,
 
 Thank you for registering an account on %s. Please follow this link to
-complete the signup process:
+complete the sign-up process:
 
 %sregister.php?key=%s
 
@@ -37,7 +37,7 @@ Regards,
 The %s Team';
 $string['registeredemailmessagehtml'] = '<p>Hi %s,</p>
 <p>Thank you for registering an account on %s. Please follow this link
-to complete the signup process:</p>
+to complete the sign-up process:</p>
 <p><a href="%sregister.php?key=%s">%sregister.php?key=%s</a></p>
 <p>The link will expire in 24 hours.</p>
 

htdocs/auth/saml/lang/en.utf8/auth.saml.php

@@ -23,7 +23,7 @@ $string['newpublickey'] = 'New public key';
 $string['ssphpnotconfigured'] = 'SimpleSAMLPHP is not configured.';
 $string['manage_certificate2'] = 'This is the certificate generated as part of the SAML Service Provider.';
 $string['manage_new_certificate'] = 'This is the new certificate generated as part of the SAML Service Provider.<br>
-Both the new and old certificates will be valid. Once you have notified all Identity Providers of your new certificate you can remove older certificate via the "Delete old certificate" button.';
+Both the new and old certificates will be valid. Once you have notified all Identity Providers of your new certificate, you can remove older certificates via the "Delete old certificate" button.';
 $string['nullprivatecert'] = "Could not generate or save the private key";
 $string['nullpubliccert'] = "Could not generate or save the public certificate";
 $string['defaultinstitution'] = 'Default institution';

htdocs/auth/webservice/lang/en.utf8/auth.webservice.php

@@ -26,7 +26,7 @@ $string['registeredemailsubject'] = 'You have registered at %s';
 $string['registeredemailmessagetext'] = 'Hello %s,
 
 Thank you for registering an account on %s. Please follow this link to
-complete the signup process:
+complete the sign-up process:
 
 %sregister.php?key=%s
 
@@ -42,7 +42,7 @@ Thank you for registering an account on %s.
 %s
 
 Please follow this link to
-complete the signup process:
+complete the sign-up process:
 
 %sregister.php?key=%s
 
@@ -59,7 +59,7 @@ $string['registeredemailmessagehtmlmessage'] = '<p>Hello %s,</p>
 <p>%s</p>
 
 <p>Please follow this link
-to complete the signup process:</p>
+to complete the sign-up process:</p>
 <p><a href="%sregister.php?key=%s">%sregister.php?key=%s</a></p>
 <p>The link will expire in 24 hours.</p>
 
@@ -70,7 +70,7 @@ The %s Team</pre>';
 $string['registeredemailmessagehtml'] = '<p>Hello %s,</p>
 
 <p>Thank you for registering an account on %s. Please follow this link
-to complete the signup process:</p>
+to complete the sign-up process:</p>
 <p><a href="%sregister.php?key=%s">%sregister.php?key=%s</a></p>
 <p>The link will expire in 24 hours.</p>
 

htdocs/blocktype/navigation/lang/en.utf8/blocktype.navigation.php

@@ -14,7 +14,7 @@ defined('INTERNAL') || die();
 $string['defaulttitledescription'] = 'If no title is provided here, the title of the collection will be used.';
 $string['collection'] = 'Collection';
 $string['title'] = 'Navigation';
-$string['description'] = 'Navigation for a collection of pages (see Portfolio -> Collections, or the Collections tab when inside a group)';
+$string['description'] = 'Navigation for a collection of pages';
 $string['nocollections1'] = 'No collections. <a href="%s">Create one</a>.';
 $string['copytoall'] = 'Add to all pages';
-$string['copytoalldesc'] = 'Add the navigation block to all the current pages in the collection this page belongs to that do not already have it.';
+$string['copytoalldesc'] = 'Add the navigation block to all current pages in the collection to which this page belongs and that do not already have it.';

htdocs/blocktype/openbadgedisplayer/badgegroupnames.json.php

@@ -33,7 +33,7 @@ $badgegroupnames = isset($uid) ? PluginBlocktypeOpenbadgedisplayer::get_badgegro
 $nobadgegroup = get_string('nobadgegroupsin1', 'blocktype.openbadgedisplayer', $hosttitle, $email);
 $nobackpack = get_string('nobackpackidin1', 'blocktype.openbadgedisplayer', $email, $hosttitle);
 if ($host == 'badgr' && is_null($uid)) {
-    $nobackpack = get_string('nobadgruid', 'blocktype.openbadgedisplayer');
+    $nobackpack = get_string('nobadgruid1', 'blocktype.openbadgedisplayer');
 }
 
 json_reply(false, array(

htdocs/blocktype/openbadgedisplayer/badgrtoken.php

@@ -31,7 +31,7 @@ if (!is_plugin_active('openbadgedisplayer','blocktype')) {
 
 $sources = PluginBlocktypeOpenbadgedisplayer::get_backpack_source();
 if (empty($sources['badgr'])) {
-    throw new AccessDeniedException(get_string('badgrsourcemissing', 'blocktype.openbadgedisplayer'));
+    throw new AccessDeniedException(get_string('badgrsourcemissing1', 'blocktype.openbadgedisplayer'));
 }
 $token = get_field('usr_account_preference', 'value', 'field', 'badgr_token', 'usr', $USER->get('id'));
 

htdocs/blocktype/openbadgedisplayer/lang/en.utf8/blocktype.openbadgedisplayer.php

@@ -72,19 +72,19 @@ $string['title_badgr'] = 'Badgr Backpack';
 
 $string['fetchingbadges'] = 'Fetching entries. This may take a while.';
 
-$string['missingbadgesources'] = 'Missing sources setting. Please add to your config.php file, e.g.<br><br>$cfg->openbadgedisplayer_source = \'{"backpack":"https://backpack.openbadges.org/"}\'';
+$string['missingbadgesources'] = 'Missing sources setting. Please add it to your config.php file, e.g.<br><br>$cfg->openbadgedisplayer_source = \'{"backpack":"https://backpack.openbadges.org/"}\'';
 
 $string['selectall'] = 'Select all';
 $string['selectnone'] = 'Select none';
 
 // Badgr token page
 $string['featuredisabled'] = 'The openbadgedisplayer blocktype is not active';
-$string['badgrsourcemissing'] = 'Badgr is not in the sources configuration';
-$string['badgrusername'] = "Badgr Username";
-$string['badgrpassword'] = "Badgr Password";
+$string['badgrsourcemissing1'] = 'Badgr is not in the sources configuration in your config.php file.';
+$string['badgrusername'] = "Badgr username";
+$string['badgrpassword'] = "Badgr password";
 $string['badgrtokentitle'] = "Badgr";
 $string['badgrtoken'] = "Badgr token: %s";
 $string['badgrtokenadded'] = "Badgr token added to account";
 $string['badgrtokendeleted'] = "Badgr token deleted";
 $string['badgrtokennotfound'] = "Badgr token not found with supplied credentials";
-$string['nobadgruid'] = 'Badgr requires a token for use. Please go to "Settings →  Badgr token access" to fetch your token';
+$string['nobadgruid1'] = 'Before you can use Badgr, you need to set a token. Please go to "User menu → Settings → Apps → Badgr" to set it.';

htdocs/interaction/forum/lang/en.utf8/help/forms/edit_interaction.allowunsubscribe.html

 <!-- @license http://www.gnu.org/copyleft/gpl.html GNU GPL version 3 or later -->
 <!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
 <h3>Allow users to unsubscribe</h3>
-<p>When enabled users can unsubscribe from the forum.</p>
-<p>When disabled users cannot unsubscribe from the forum. Also any users within the group the forum belongs to that are not currently subscribed will be automatically subscribed.</p>
+<p>When enabled, group members can unsubscribe from this forum.</p>
+<p>When disabled, group members cannot unsubscribe from this forum. In addition, any group members that are not subscribed at the moment will be subscribed automatically.</p>

htdocs/interaction/forum/lang/en.utf8/help/forms/edit_interaction.autosubscribe.html

 <!-- @license http://www.gnu.org/copyleft/gpl.html GNU GPL version 3 or later -->
 <!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
 <h3>Automatically subscribing users</h3>
-<p>If you want users to automatically be subscribed to posts in this forum when they join, tick this option.</p>
-<p>When subscribed, users will receive notifications when new posts and replies are made in the forum.</p>
-<p>If "Allow users to unsubscribe" option is enabled, users will have the option to unsubscribe if they do not want to be notified.</p>
+<p>If you want users to be subscribed automatically to posts in this forum when they join, select this option.</p>
+<p>When subscribed, group members will receive notifications when new posts and replies are made in this forum.</p>
+<p>If the "Allow users to unsubscribe" option is enabled for this forum, group members will have the option to unsubscribe if they do not want to be notified of future posts.</p>

htdocs/interaction/forum/lang/en.utf8/interaction.forum.php

@@ -24,7 +24,7 @@ $string['Body'] = 'Message';
 $string['cantaddposttoforum'] = 'You are not allowed to post in this forum';
 $string['cantaddposttotopic'] = 'You are not allowed to post in this topic';
 $string['cantaddtopic'] = 'You are not allowed to add topics to this forum';
-$string['cantapproveposts'] = 'You are not allowed approve posts on this forum';
+$string['cantapproveposts'] = 'You are not allowed to approve posts on this forum';
 $string['cantdeletepost'] = 'You are not allowed to delete posts in this forum';
 $string['cantdeletethispost'] = 'You are not allowed to delete this post';
 $string['cantdeletetopic'] = 'You are not allowed to delete topics in this forum';
@@ -36,7 +36,7 @@ $string['cantfindtopic'] = 'Could not find topic with id %s';
 $string['cantmakenonobjectionable'] = 'You are not allowed to mark this post as not objectionable.';
 $string['cantviewforums'] = 'You are not allowed to view forums in this group';
 $string['cantviewtopic'] = 'You are not allowed to view topics in this forum';
-$string['cantunsubscribe'] = 'You are not allowed to unsubscribe from the forum';
+$string['cantunsubscribe'] = 'You are not allowed to unsubscribe from this forum';
 $string['chooseanaction'] = 'Choose an action';
 $string['clicksetsubject'] = 'Click to set a subject';
 $string['Closed'] = 'Closed';
@@ -293,11 +293,11 @@ To see the reporter\'s profile, follow this link:
 
 $string['postsandreplies'] = 'Posts and replies';
 $string['postneedapprovalsubject'] = 'New post needs moderation in forum "%s"';
-$string['postneedapprovalbody'] = '%s has posted in forum "%s" and is awaiting for moderation.
+$string['postneedapprovalbody'] = '%s has posted in forum "%s" and is awaiting moderation.
 
 The post content is:
 %s';
-$string['postneedapprovalhtml'] = '<div style="padding: 0.5em 0; border-bottom: 1px solid #999;">A new post by "%s" in forum "%s" needs moderation
+$string['postneedapprovalhtml'] = '<div style="padding: 0.5em 0; border-bottom: 1px solid #999;">A new post by "%s" in forum "%s" needs moderation.
 
 <div style="padding: 0.5em 0; border-bottom: 1px solid #999;">The post content is:
 <br>%s</div>
@@ -307,7 +307,7 @@ $string['postneedapprovalhtml'] = '<div style="padding: 0.5em 0; border-bottom:
 <div style="font-size: smaller; border-top: 1px solid #999;">
 <p>Posted by: <a href="%s">%s</a></p>
 </div>';
-$string['postneedapprovaltext'] = 'A new post by "%s" in forum "%s" needs moderation
+$string['postneedapprovaltext'] = 'A new post by "%s" in forum "%s" needs moderation.
 %s
 ------------------------------------------------------------------------
 

htdocs/lang/en.utf8/admin.php

@@ -519,7 +519,7 @@ $string['mathjax'] = 'Enable MathJax';
 $string['mathjaxdescription'] = 'MathJax renders LaTeX markup into properly formatted math and science equations on portfolio pages.';
 $string['mathjaxconfig'] = 'MathJax configuration';
 $string['timezone'] = 'Time zone';
-$string['sitetimezonedescription'] = 'The default time zone for the site. If not selected one will be chosen based on country, but this can be innaccurate if the counrty has multiple time zones.';
+$string['sitetimezonedescription'] = 'The default time zone for the site. If none is selected, one will be chosen based on the selected country. This can be innaccurate if the country has multiple time zones.';
 $string['notimezoneselected'] = 'No time zone selected';
 // Site content
 $string['about']               = 'About';
@@ -706,8 +706,8 @@ $string['uploadgroupcsverrorshortnamealreadytaken1'] = 'Error on line %s of your
 $string['uploadgroupcsverrorusernamesnotlastfield'] = 'The "usernames" field must be the last field in the header.';
 $string['uploadgroupcsverroropencontrolled'] = 'Line %s: Groups cannot have both open and controlled membership.';
 $string['uploadgroupcsverroropenrequest'] = 'Line %s: Groups with open membership cannot allow membership requests.';
-$string['uploadgroupcsverrorviewnotifyrequest'] = 'Line %s: The value for viewnotify must be numerical in range %s-%s.';
-$string['uploadgroupcsverrordoesnotallowgroupcategory'] = 'Line %s: This site does not allow for group categories. Please review the Group settings in Configure site -> Site options.';
+$string['uploadgroupcsverrorviewnotifyrequest'] = 'Line %s: The value for viewnotify must be numerical in the range of %s-%s.';
+$string['uploadgroupcsverrordoesnotallowgroupcategory1'] = 'Line %s: This site does not allow for group categories. If you want to use them, a site administrator can turn them on in the administration area → Groups → Group categories.';
 $string['uploadgroupcsverrorcategorydoesnotexist'] = 'Line %s: The category "%s" does not exist.';
 $string['uploadgroupcsvpagedescription2'] = '<p>You may use this facility to upload new groups via a <acronym title="Comma Separated Values">CSV</acronym> file.</p>
 
@@ -1122,10 +1122,10 @@ $string['denyregistrationmessage'] = 'This will deny the registration for the us
 $string['nopendingregistrations'] = 'No pending registrations were found for this institution.';
 $string['pendingregistration'] = 'Pending registration';
 $string['pendingregistrations'] = 'Pending registrations';
-$string['pendingregistrationspagedescription1'] = '<p>On this page you can see users who have self-registered and requested membership of your institution and approve or deny their registration.<p>
-<p>On approving their registration, they are notified with further instructions about activating their account. When they follow the activation link supplied they are added as a member of the institution. The activation link expires after 24 hours and their details are removed. If they still want to register they will need to begin the process again.</p>
-<p>On denying their registration, they will be notified that their application was denied by an automated response email.</p>';
-$string['pendingregistrationdesc'] = 'Approve or deny membership of your institution to self-registering users';
+$string['pendingregistrationspagedescription2'] = '<p>On this page you can see users who have self-registered and requested membership in your institution. You can approve or deny their registration request.<p>
+<p>On approving their registration, they are notified with further instructions about activating their account. When they follow the activation link supplied, they are added as a member of the institution. The activation link expires after 24 hours and their details are removed. If they still want to register, they will need to begin the process again.</p>
+<p>On denying their registration, they will be notified of that automatically.</p>';
+$string['pendingregistrationdesc'] = 'Approve or deny membership in your institution to self-registering users';
 $string['pendingdeletiondesc'] = 'Approve or deny the deletion of users who wish to remove their accounts';
 $string['pendingusercompletion'] = 'Approval sent, waiting on user completion';
 $string['nosuchinstitution'] = 'No such institution.';

htdocs/lang/en.utf8/error.php

@@ -19,7 +19,7 @@ $string['mysqldbextensionnotloaded'] = 'Your server configuration does not inclu
 $string['mysqlmodulenolongersupported1'] = 'Your server configuration does not include the mysqli extension. Please make sure that it is loaded in php.ini or install it if it is not installed. Mahara stopped supporting the mysql extension in version 16.10';
 $string['unknowndbtype'] = 'Your server configuration references an unknown database type. Valid values are "postgres" and "mysql". Please change the database type setting in config.php.';
 $string['domextensionnotloaded'] = 'Your server configuration does not include the dom extension. Mahara requires this in order to parse XML data from a variety of sources.';
-$string['mbstringextensionnotloaded'] = 'Your server configuration does not include the mbstring extension. Mahara requires this in order to parse multi-byte strings for varying languages.';
+$string['mbstringextensionnotloaded'] = 'Your server configuration does not include the mbstring extension. Mahara requires this to parse multi-byte strings for varying languages.';
 $string['xmlextensionnotloaded'] = 'Your server configuration does not include the %s extension. Mahara requires this in order to parse XML data from a variety of sources. Please make sure that it is loaded in php.ini or install it if it is not installed.';
 $string['gdextensionnotloaded'] = 'Your server configuration does not include the gd extension. Mahara requires this in order to perform resizes and other operations on uploaded images. Please make sure that it is loaded in php.ini or install it if it is not installed.';
 $string['gdfreetypenotloaded'] = 'Your server configuration of the gd extension does not include Freetype support. Please make sure that gd is configured with it.';
@@ -105,7 +105,7 @@ $string['viewnotfoundbyname'] = 'Page %s by %s not found.';
 $string['youcannotviewthisusersprofile'] = 'You cannot view this user\'s profile.';
 $string['notinthesamegroup'] = 'You cannot view this user\'s profile because you are not members of the same group.';
 $string['notinthesameinstitution'] = 'You cannot view this user\'s profile because you are not members of the same institution.';
-$string['notinstitutionmember'] = 'You cannot view this page because you are not a member of the institution to which the page belongs.';
+$string['notinstitutionmember'] = 'You cannot view this page because you are not a member of the institution to which this page belongs.';
 $string['invalidlayoutselection'] = 'You tried to select a layout that doesn\'t exist.';
 $string['invalidnumrows'] = 'You have tried to create a layout with more than the allowed maximum number of rows. (This should not be possible; please notify your site\'s administrator.)';
 $string['previewimagegenerationfailed'] = 'Sorry, there was a problem generating the preview image.';
@@ -131,7 +131,7 @@ $string['missingparamid'] = 'Missing id';
 
 $string['themenameinvalid'] = "The name of the theme '%s' contains invalid characters.";
 
-$string['timezoneidentifierunusable'] = 'PHP on your website host does not return a useful value for the time zone identifier (%%z) - certain date formatting, such as the Leap2A export, will be broken. %%z is a PHP date formatting code. This problem is usually due to a limitation in running PHP on Windows.';
+$string['timezoneidentifierunusable'] = 'PHP on your website host does not return a useful value for the time zone identifier (%%z). Certain date formatting, such as the Leap2A export, will be broken. %%z is a PHP date formatting code. This problem is usually due to a limitation in running PHP on Windows.';
 $string['postmaxlessthanuploadmax'] = 'Your PHP post_max_size setting (%s) is smaller than your upload_max_filesize setting (%s). Uploads larger than %s will fail without displaying an error. Usually, post_max_size should be much larger than upload_max_filesize.';
 $string['smallpostmaxsize'] = 'Your PHP post_max_size setting (%s) is very small. Uploads larger than %s will fail without displaying an error.';
 $string['notenoughsessionentropy'] = 'Your PHP session.entropy_length setting is too small. Set it to at least 16 in your php.ini to ensure that generated session IDs are random and unpredictable enough.';
@@ -161,4 +161,4 @@ $string['updatesitetimezone'] = 'The time zone for the site now needs to be set
 $string['pluginnotactive1'] = 'The plugin "%s" is not enabled. Please got to "Administration" →  "Extensions" →  "Plugin administration" to enable it.';
 
 $string['fileuploadtoobig'] = 'The file upload is too big as it is bigger than "%s"';
-$string['sideblockmenuclash'] = 'Sideblock name "%s" is already in use. Please rename one of them';
+$string['sideblockmenuclash'] = 'The sideblock name "%s" is already in use. Please choose a different one.';

htdocs/lang/en.utf8/help/forms/editgroup.category.html

@@ -3,12 +3,14 @@
 <h3>Category</h3>
 <p>Add the group to a category</p>
 <p>
-    The site must allow for group categories.  This setting can be enabled via <i>Administration menu -> Groups -> Group categories -> Enable group categories</i> or in <i>Site options -> Group settings -> Allow group categories</i>.
+    The site must allow group categories. A site administrator can enable them via <i>Administration menu → Groups → Group categories → Enable group categories</i>.
 </p>
 <p>
     The value in this field must correspond to an already existing category.
 </p>
 <p>
     Entering an unknown category name here will <strong>not</strong> create a new category.
-    To add a new category, please go to <i>Administration menu -> Groups -> Group categories -> Add categories</i>.
+</p>
+<p>
+    To add a new category, please go to <i>Administration menu → Groups → Group categories → Add categories</i>.
 </p>

htdocs/lang/en.utf8/help/forms/editgroup.hidemembers.html

 <!-- @license http://www.gnu.org/copyleft/gpl.html GNU GPL version 3 or later -->
 <!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
 <h3>Hide membership</h3>
-<p>Hide the group's membership listing from non-members.</p>
-<ul>Options are:
+<p>Hide the group's membership listing from non-members. Enter the numerical value into your CSV file that corresponds to the option you want to select.</p>
+<ul>The options are:
     <li><em>0</em> = No</li>
     <li><em>1</em> = Hide members</li>
     <li><em>2</em> = Hide tutors</li>

htdocs/lang/en.utf8/help/forms/editgroup.viewnotify.html

@@ -3,7 +3,8 @@
 <h3>Shared page notifications</h3>
 <p>Select which group members should receive a notification when a new group page is created and when a group member shares one of their pages with the group.</p>
 <p>The group member sharing the page will not receive this notification. For very large groups it would be best to limit this to non ordinary members as it can produce a lot of notifications.</p>
-<ul>Options are:
+<p>Enter the numerical value into your CSV file that corresponds to the option you want to select.</p>
+<ul>The options are:
     <li><em>0</em> = None</li>
     <li><em>1</em> = All group members</li>
     <li><em>2</em> = Everyone except ordinary members</li>

htdocs/lang/en.utf8/help/forms/edituser_upload.expiry.html

@@ -8,4 +8,4 @@
 <li>25 Mar 2019</li>
 <li>+3 months</li>
 </ul>
-<p>This date will override any account expiry date previously set in site account settings.</p>
+<p>This date will override any account expiry date previously set in the site account settings.</p>

htdocs/lang/en.utf8/help/forms/siteoptions.createpublicgroups.html

@@ -4,5 +4,4 @@
 <p>If you wish to allow all users to create groups that may be viewed by people who are not members of your site, set this option to 'Everyone'.</p>
 <p>In a public group, anyone who finds your site (including search engines) will be able to see the group's &quot;About&quot; page, and all discussions in the forums. However, people will still have to become a member of the site before they can perform other actions such as posting to the forums or viewing user profiles.
 <p>Viewing the list of group members for group members and non-members can be restricted by the group administrator.</p>
-<p>If isolated institutions are turned on in the config.php file than only site administrators will be able to create public groups.</p>
-
+<p>If isolated institutions are turned on in the config.php file, only site administrators will be able to create public groups.</p>

htdocs/lang/en.utf8/help/forms/siteoptions.loggedinprofileviewaccess.html

@@ -8,6 +8,5 @@ by all logged-in users, but the owner is allowed to restrict access to
 a smaller group if they wish.</p>
 <p>Profiles of institution members will always be visible to other
 members of the same institution.</p>
-<p>If isolated institutions are turned on in the config.php file
-than all users will be able to see only the profile pages of the
-members of the same institution.</p>
+<p>If isolated institutions are turned on in the config.php file,
+users will only be able to see the profile pages of people who are also members in their institution and the site administrators.</p>

htdocs/lang/en.utf8/help/forms/siteoptions.requireregistrationconfirm.html

@@ -20,7 +20,6 @@
   that are open to the public for registration. Institutions though should always
   consider using the registration confirmation to only give access to their members.</p>
 
-<p>If isolated institutions are turned on in the config.php file than the "Confirm
+<p>If isolated institutions are turned on in the config.php file, the "Confirm
   registration" on the site level is turned on per default so that institutions
-  cannot change that setting and every account needs to be approved. It is then
-  disabled so that the site administrator cannot change it.</p>
\ No newline at end of file
+  cannot change that setting. Site administrators cannot change the setting either. Every account needs to be approved.</p>

htdocs/lang/en.utf8/help/forms/siteoptions.usersallowedmultipleinstitutions.html

@@ -2,5 +2,4 @@
 <!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
 <h3>Users allowed multiple institutions</h3>
 <p>If enabled, users can belong to more than one institution at once. Users will be able to apply to join an institution at any time, although the institution will have to approve their request first. Likewise, institutions will be able to invite users, but users must approve this request.</p>
-<p>If isolated institutions are turned on in the config.php file than users can only be in one institution at one point in time. Being a member of multiple institutions is not allowed.</p>
-
+<p>If isolated institutions are turned on in the config.php file, users can only be in one institution. Being a member of multiple institutions is not allowed.</p>

htdocs/lang/en.utf8/mahara.php

@@ -889,8 +889,8 @@ $string['addemail'] = 'Add email address';
 $string['myapps'] = 'Apps';
 $string['myapplications'] = 'My applications';
 $string['acccountappsdescription'] = 'Here you can administer any applications that require token access.';
-$string['acccountaddappsdescription'] = 'Currently there are no plugins active that allow token administration.';
-$string['acccountchooseappsdescription'] = 'To administer your application tokens please select the application from the "My applications" bar.';
+$string['acccountaddappsdescription'] = 'Currently, there are no plugins active that allow token administration.';
+$string['acccountchooseappsdescription'] = 'To administer your application tokens, please select the application from the "My applications" bar.';
 
 // Search
 $string['search'] = 'Search';

htdocs/module/mobileapi/lang/en.utf8/module.mobileapi.php

@@ -28,8 +28,8 @@ $string['servicenotallowed'] = 'The credentials you have provided are not author
 $string['webserviceproviderenabled'] = 'Incoming web service requests allowed';
 
 // User management of webservice access tokens
-$string['mytokensmenutitle1'] = 'Mahara mobile';
-$string['mytokenspagetitle1'] = 'Mahara mobile tokens';
+$string['mytokensmenutitle1'] = 'Mahara Mobile';
+$string['mytokenspagetitle1'] = 'Mahara Mobile tokens';
 $string['mytokenspagedesc'] = 'These applications can access your account.';
 $string['nopersonaltokens'] = 'You have not granted access to any applications.';
 $string['clientinfo'] = 'App';

htdocs/theme/raw/templates/admin/users/pendingregistrations.tpl

 {include file="header.tpl"}
-<div class="lead">{str tag="pendingregistrationspagedescription1" section="admin"}</div>
+<div class="lead">{str tag="pendingregistrationspagedescription2" section="admin"}</div>
 <div class="card">
     <div id="pendingonlineistcontainer">
         {$data|safe}

test/behat/features/settings/better_human_readable_tooltip_app_token.feature

@@ -12,7 +12,7 @@ Scenario: Admin set up preconditions for test and confirm that the title text is
     And I enable the switch "Manual token generation"
     And I press "Save"
     When I choose "Apps" in "Settings" from user menu
-    And I follow "Mahara mobile" in the ".arrow-bar" "css_element"
+    And I follow "Mahara Mobile" in the ".arrow-bar" "css_element"
     And I click on "Generate"
     # confirm that there is an element with title=Delete "Manually created"
     # This is done by pressing a button with that title as there is no definition for see element with that title attribute

test/behat/features/site_features/moderate_forum_posts.feature

@@ -70,7 +70,7 @@ Scenario: Group moderator approved a forum post
     And I scroll to the top
     When I follow "Forums"
     And I click on "Unsubscribe" in "Group A's forum" row
-    Then I should see "You are not allowed to unsubscribe from the forum"
+    Then I should see "You are not allowed to unsubscribe from this forum"
     And I log out
     # Group Forum moderator should see buttons to moderate new topics and new forums
     When I log in as "UserC" with password "Kupuh1pa!"