Help sections: Change lang strings (Bug 1432523)

Change-Id: I6bbb1855aef67b3678a801e2460637a1bedcd18e
Signed-off-by: Kristina D.C. Hoeppner <kristina@catalyst.net.nz>

htdocs/artefact/annotation/lang/en.utf8/artefact.annotation.php

@@ -17,7 +17,7 @@ $string['Annotations'] = 'Annotations';
 $string['annotation'] = 'annotation';
 $string['annotations'] = 'annotations';
 $string['Annotationfeedback'] = 'Feedback';
-$string['typeannotationfeedback'] = 'Feedback';
+$string['typeannotationfeedback'] = 'Feedback on annotations';
 $string['allowannotationfeedback'] = 'Allow feedback';
 $string['approvalrequired'] = 'Feedback is moderated. If you choose to make this feedback public, it will not be visible to others until it is approved by the owner.';
 

htdocs/lang/en.utf8/help/sections/activitytypeselect.html

@@ -3,11 +3,17 @@
 <h3>Activity type</h3>
 <p>Select from this drop-down menu the notification type you wish to view. You may not be able to see all notification types depending on your permissions in the system.</p>
 <p><strong>Administration messages:</strong> Notifications to site and institution administrators.</p>
+<p><strong>Contact us</strong>: Messages to site administrators that are sent via the "Contact us" form.</p>
 <p><strong>Feedback:</strong> Notification of any feedback or comments received on any pages, artefacts or journals within your ePortfolio.</p>
+<p><strong>Feedback on annotations:</strong> Notification of any annotation feedback received on any pages or artefacts within your ePortfolio.</p>
 <p><strong>Group message:</strong> Notification sent to group owners when new pages are submitted to a group.</p>
 <p><strong>Institution message:</strong> Automatically generated by the system if you are a member of an institution or are about to be.</p>
 <p><strong>Message from other users:</strong> Sent to you directly from other users of the site.</p>
 <p><strong>New forum post:</strong> Notification of a new post to a forum topic you are subscribed to.</p>
 <p><strong>New page access:</strong> Notification that you or one of your groups have been given access to a new or existing page or collection.</p>
+<p><strong>Objectionable content:</strong> Messages to administrators that contain complaints by users about objectionable content.</p>
+<p><strong>Objectionable content in forum:</strong> Messages to site administrators and the group administrators and forum moderators in that group that contain complaints by users about objectionable forum content. Forum topics and posts can be flagged as containing objectionable content.</p>
+<p><strong>Repeat virus upload:</strong> Messages to administrators about users who repeatedly upload virus-infected files. Virus checking must be turned on.</p>
 <p><strong>System message:</strong> Automatically generated by the system or sent to you by one of the site administrators.</p>
+<p><strong>Virus flag release:</strong> Messages to administrators about files that were released by the virus scanner.</p>
 <p><strong>Watchlist:</strong> Notification of activity on any artefact or page that you are monitoring.</p>

htdocs/lang/en.utf8/help/sections/loginbox.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>Login</h3>
-<p>Your login details will either be the username and password you entered during registration or others assigned to you by an administrator.</p>
+<p>Your login details will either be the username and password you entered during registration or that were assigned to you by an administrator.</p>
 <p>In some cases, you may not be able to use this login box, but will have a different way of logging in, e.g. via Moodle or single sign-on. Your administrator will have told you where to log in if that is the case.</p>
-<p>Click "<a href="forgotpass.php">Lost username / password</a>" to request a password reset at any time.</p>
-<p>For your security, you will be logged out of the system automatically after a period of inactivity. You will be prompted to log in again.</p>
+<p>Click the "<a href="forgotpass.php">Lost username / password</a>" link to request a password reset at any time. If your authentication method is managed elsewhere, you will receive an error message and will need to contact your administrator to find out where you can reset your account details.</p>
+<p>If you logged in to the site a while ago, you will be logged out automatically after a period of inactivity. That is for your security. You will be prompted to log in again.</p>
 <p><strong>Note:</strong> This site requires a recent version of Firefox, Chrome, Internet Explorer or Safari.</p>