Commit 425628b9 authored by Kristina Hoeppner's avatar Kristina Hoeppner Committed by Kristina Hoeppner

Bug 1754208: Language string review of new / changes strings

Change-Id: I7b04f12de8d896c56c81bfeb5d53a7bd91003b0e
parent 95aada8c
......@@ -98,7 +98,7 @@ function institutionform_submit(Pieform $form, $values) {
update_record('group', array('institution' => $values['institution']), array('id' => $values['groupid']));
$SESSION->add_ok_msg(get_string('groupassigned', 'group'));
$SESSION->add_ok_msg(get_string('groupassociated', 'group'));
redirect(get_config('wwwroot').'admin/groups/groups.php');
}
......
......@@ -207,7 +207,7 @@ $(document).on('pageupdated', function(e, data) {
jQuery(function ($) {
// JS Code to deal with the report configuration modal
// This fetches the form for choosing the results with filters, eg time frame
// This fetches the form for choosing the results with filters, eg time period
// We need to show/hide modal explicitly so the on 'show.bs.modal' fires allowing
// us to do ajax call for form as modal opens
......
......@@ -158,10 +158,10 @@ $string['viewposts'] = 'Copied entries (%s)';
$string['postscopiedfromview'] = 'Entries copied from %s';
$string['youhavenoblogs'] = 'You have no journals.';
$string['youhavenoblogsaddone'] = 'You have no journals. <a href="%s">Add one</a>';
$string['youhavenogroupblogs1'] = 'There are no journals in this group. <a href="%s">Add one</a>';
$string['youhavenoinstitutionblogs1'] = 'There are no journals in this institution. <a href="%s">Add one</a>';
$string['youhavenositeblogs1'] = 'There are no site journals. <a href="%s">Add one</a>';
$string['youhavenoblogsaddone'] = 'You have no journals. <a href="%s">Add one</a>.';
$string['youhavenogroupblogs1'] = 'There are no journals in this group. <a href="%s">Add one</a>.';
$string['youhavenoinstitutionblogs1'] = 'There are no journals in this institution. <a href="%s">Add one</a>.';
$string['youhavenositeblogs1'] = 'There are no site journals. <a href="%s">Add one</a>.';
$string['youhavenblog'] = array(
'You have 1 journal.',
'You have %d journals.'
......
......@@ -366,8 +366,8 @@ function profileform_submit(Pieform $form, $values) {
),
null,
get_string('newemailalert_subject', 'artefact.internal', $sitename),
get_string('newemailalert_body_text', 'artefact.internal', $USER->get('firstname'), $sitename, $emails, $sitename, get_config('wwwroot')),
get_string('newemailalert_body_html', 'artefact.internal', hsc($USER->get('firstname')), hsc($sitename), hsc($emails), hsc($sitename), get_config('wwwroot'))
get_string('newemailalert_body_text1', 'artefact.internal', $USER->get('firstname'), $sitename, $emails, $sitename, get_config('wwwroot')),
get_string('newemailalert_body_html1', 'artefact.internal', hsc($USER->get('firstname')), hsc($sitename), hsc($emails), hsc($sitename), get_config('wwwroot'))
);
}
catch (EmailException $e) {
......
......@@ -100,26 +100,26 @@ If this email belongs to you, but you have not requested adding it to your %s ac
%s
EOF;
$string['newemailalert_subject'] = 'New email address added to your %s account';
$string['newemailalert_body_text'] = <<<EOF
$string['newemailalert_body_text1'] = <<<EOF
Hello %s,
You have added the email addresses to your user account in %s:
You have added the following email address(es) to your account in %s:
%s
If you have not requested this change in your %s account, please contact the site administrator
If you have not requested this change in your %s account, please contact the site administrator.
%scontact.php
EOF;
$string['newemailalert_body_html'] = <<<EOF
$string['newemailalert_body_html1'] = <<<EOF
<p>Hello %s,</p>
<p>You have added the email addresses to your user account in %s:</p>
<p>You have added the following email address(es) to your account in %s:</p>
<p>%s</p>
<p>If you have not requested this change in your %s account, please <a href="%scontact.php">contact the site administrator</a></p>
<p>If you have not requested this change in your %s account, please <a href="%scontact.php">contact the site administrator</a>.</p>
EOF;
......
......@@ -5,6 +5,6 @@
<p>You could use the functionality to:</p>
<uL>
<li>set yourself individual goals for a large task.</li>
<li>manage your personal learning activities and keep an eye on how many you have already accomplished during the time frame that you have set yourself.</li>
<li>manage your personal learning activities and keep an eye on how many you have already accomplished during the time period that you have set yourself.</li>
<li>keep track of workshops you have attended for your professional development over time.</li>
</ul>
......@@ -21,7 +21,7 @@ $string['emailalreadytakenbyothers'] = 'This email address has been taken by ano
$string['iagreetothetermsandconditions'] = 'I agree to the Terms and Conditions.';
$string['passwordinvalidform1'] = 'Your password must be at least %s characters long. Passwords are case sensitive and must be different from your username. Your password must contain %s.';
$string['recaptcharegistertitle'] = 'reCAPTCHA challenge';
$string['recaptcharegisterdesc1'] = 'Please tick the "I\'m not a robot" box. Doing so helps prevent automated programs from abusing this service.';
$string['recaptcharegisterdesc2'] = 'Please tick the "I\'m not a robot" box if you want to continue.';
$string['registeredemailsubject'] = 'You have registered at %s';
$string['registeredemailmessagetext'] = 'Hi %s,
......
......@@ -857,7 +857,7 @@ function auth_check_required_fields() {
setpageicon($smarty, 'icon-umbrella');
if ($USER->get('parentuser')) {
$smarty->assign('loginanyway',
get_string('loginasoverrideprivacyaccept', 'admin',
get_string('loginasoverridelegalaccept', 'admin',
'<strong><a class="" href="' . get_config('wwwroot') . '?loginanyway">', '</a></strong>'));
}
$smarty->assign('form', $form);
......
......@@ -12,4 +12,4 @@
defined('INTERNAL') || die();
$string['title'] = 'None';
$string['description'] = 'Anyone can log in. Does not work when in production mode!';
$string['description'] = 'Anyone can log in. This does not work when in production mode!';
......@@ -16,8 +16,8 @@ $string['attributemapfilenotfound'] = 'Could not find attribute map file or it i
$string['certificate1'] = 'SAML Service Provider signing and encryption certificate';
$string['spmetadata'] = 'Service Provider metadata';
$string['metadatavewlink'] = '<a href="%s">View metadata</a>';
$string['ssphpnotconfigured'] = 'SimpleSAMLPHP is not configured';
$string['manage_certificate2'] = 'This is the certificate generated as part of the SAML Service Provider';
$string['ssphpnotconfigured'] = 'SimpleSAMLPHP is not configured.';
$string['manage_certificate2'] = 'This is the certificate generated as part of the SAML Service Provider.';
$string['nullprivatecert'] = "Could not generate or save the private key";
$string['nullpubliccert'] = "Could not generate or save the public certificate";
$string['defaultinstitution'] = 'Default institution';
......
<!-- @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 error message</h3>
<p>When users are only able to log in via SSO and are unable to use Mahara's login form.</p>
<p>Enter a message here to show to users who try to log in using Mahara's login form. This message should contain instructions on how a user can gain access to Mahara through SSO.</p>
<h3>Wrong login message</h3>
<p>When users are only able to log in via SSO and cannot use the standard login form.</p>
<p>Enter a message to show to users who try to log in via the standard login form. This message should contain instructions on how they can gain access to Mahara through SSO.</p>
<p><b>Note</b>: The message is displayed right above the login form in the sidebar. Therefore, do not make it too long.</p>
......@@ -53,7 +53,7 @@ $string['youmaynotregisterwithouttandc'] = 'You may not register unless you agre
$string['pluginconnections'] = 'Connection objects';
$string['nodefinedconnections'] = 'No webservice connections defined in any plugins. Please define a connection first.';
$string['nodefinedconnections'] = 'There are no webservice connections defined in any plugin. Please define a connection first.';
$string['instancelistempty'] = 'No connection objects for this institution.';
$string['addconnection'] = 'Add client connection';
......
<!-- @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 error message</h3>
<p>When there is no parent authority, users are only able to log in via SSO and are unable to use Mahara's login form.</p>
<p>Enter a message here to show to users who try to log in using Mahara's login form. This message should contain instructions on how a user can gain access to Mahara through SSO.</p>
<h3>Wrong login message</h3>
<p>When users are only able to log in via Moodle and cannot use the standard login form.</p>
<p>Enter a message to show to users who try to log in via the standard login form. This message should contain instructions on how they can gain access to Mahara through Moodle.</p>
<p><b>Note</b>: The message is displayed right above the login form in the sidebar. Therefore, do not make it too long.</p>
......@@ -106,7 +106,7 @@ class PluginBlocktypeWatchlist extends MaharaCoreBlocktype {
$options->period = $period;
$options->orderby = $orderby;
if ($results->count > 0) {
// Pages shared to user filtered according to date/time frame and filter
// Pages shared to user filtered according to date/time period and filter
list($results, $count) = self::filter_views_shared_to_user($results->data, $options);
}
break;
......
......@@ -88,7 +88,7 @@ $form = array(
'shortname' => group_get_shortname_element($group_data),
'institution' => array(
'type' => 'select',
'title' => get_string('assigntoinstitution', 'group'),
'title' => get_string('associatewithinstitution', 'group'),
'defaultvalue' => $group_data->institution,
'collapseifoneoption' => true,
'options' => get_institutions_to_associate(),
......
This diff is collapsed.
......@@ -39,8 +39,8 @@ $string['wessoout'] = 'We SSO out';
$string['weimportcontent'] = 'We import content';
$string['weimportcontentdescription'] = '(some applications only)';
$string['theyssoin'] = 'They SSO in';
$string['authloginmsg2'] = "When you have not chosen a parent authority, enter a message to display when a user tries to log in via the login form";
$string['authloginmsgnoparent'] = "Enter a message to display when a user tries to log in via the login form";
$string['authloginmsg2'] = "When you have not chosen a parent authority, enter a message to display when a user tries to log in via the login form.";
$string['authloginmsgnoparent'] = "Enter a message to display when a user tries to log in via the login form.";
$string['application'] = 'Application';
$string['cantretrievekey'] = 'An error occurred while retrieving the public key from the remote server.<br>Please ensure that the Application and WWW root fields are correct and that networking is enabled on the remote host.';
$string['ssodirection'] = 'SSO direction';
......
......@@ -73,7 +73,7 @@ $string['blocktypelibmissing'] = 'Missing lib.php for block %s in artefact plugi
$string['unabletosetmultipleblogs'] = 'Enabling multiple journals for the user %s when copying page %s has failed. This can be set manually on the <a href="%s">account</a> page.';
$string['pleaseloginforjournals'] = 'You need to log out and log back in before you will see all your journals and posts.';
$string['blocktypemissingconfigform'] = 'Block type %s must implement instance_config_form.';
$string['versionphpmissing1'] = 'Plugin %s %s is missing version.php. If you are not expecting to have a plugin %s, please delete the folder at %s';
$string['versionphpmissing1'] = 'Plugin %s %s is missing version.php. If you are not expecting to have a plugin %s, please delete the folder at %s.';
$string['blocktypeprovidedbyartefactnotinstallable'] = 'This will be installed as part of the installation of artefact plugin %s.';
$string['blockconfigdatacalledfromset'] = 'Configdata should not be set directly. Use PluginBlocktype::instance_config_save instead.';
$string['invaliddirection'] = 'Invalid direction %s.';
......@@ -94,8 +94,8 @@ $string['accessdeniedobjection'] = 'Access denied. The objection has already bee
$string['accessdeniedexception'] = 'You do not have access to view this page.';
$string['accessdeniednourlsecret'] = 'You do not have access to this functionality. Please provide the value for "urlsecret" from your config.php file as part of the URL.';
$string['accessdeniedbadge'] = 'You do not have access to view this badge.';
$string['siteprivacystatementnotfound'] = 'Site privacy statement with id %s not found.';
$string['institutionprivacystatementnotfound'] = 'Privacy statement for "%s" with id %s not found.';
$string['siteprivacystatementnotfound'] = 'The site privacy statement with ID %s was not found.';
$string['institutionprivacystatementnotfound'] = 'The privacy statement for "%s" with ID %s was not found.';
$string['viewnotfoundexceptiontitle'] = 'Page not found';
$string['viewnotfoundexceptionmessage'] = 'You tried to access a page that does not exist.';
$string['viewnotfound'] = 'Page with id %s not found.';
......@@ -148,6 +148,6 @@ $string['badsessionhandle'] = 'The session save handler "%s" is not configured c
$string['wrongsessionhandle'] = 'The session save handler "%s" is not supported in Mahara.';
$string['nomemcachedserver'] = 'The memcache server "%s" is not reachable. Please check the $cfg->memcacheservers value to make sure it is correct';
$string['nophpextension'] = 'The PHP extension "%s" is not enabled. Please enable the extension and restart your webserver or choose a different session option.';
$string['nomemcacheserversdefined'] = 'The session save handler "%s" has no related servers defined. Please set the $cfg->memcacheservers value, eg "localhost:11211"';
$string['memcacheusememcached'] = 'The "memcache" session storage is obsolete. Please use "memcached"';
$string['nomemcacheserversdefined'] = 'The session save handler "%s" has no related servers defined. Please set the $cfg->memcacheservers value, e.g. "localhost:11211".';
$string['memcacheusememcached'] = 'The "memcache" session storage is obsolete. Please use "memcached".';
$string['siteoutofsyncfor'] = 'This site has database information newer than %s files indicate it should be.';
......@@ -14,9 +14,9 @@ defined('INTERNAL') || die();
// my groups
$string['groupname'] = 'Group name';
$string['groupshortname'] = 'Short name';
$string['assigntoinstitution'] = 'Assign to institution';
$string['assigntoaninstitution'] = 'Assign group \'%s\' to an institution';
$string['groupassigned'] = 'Group assigned to institution successfully';
$string['associatewithinstitution'] = 'Associate with institution';
$string['associatewithaninstitution'] = 'Associate group \'%s\' with an institution.';
$string['groupassociated'] = 'Group associated with institution successfully';
$string['creategroup'] = 'Create group';
$string['copygroup'] = 'Copy group "%s"';
$string['groupmemberrequests'] = 'Pending membership requests';
......
......@@ -2,6 +2,6 @@
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Access list</h3>
<p>
Listed are the people, institutions, and groups that have access to the portfolio that was created during the selected time frame.</p>
Listed are the people, institutions, and groups that have access to the portfolio that was created during the selected time period.</p>
<p>The number of secret URLs is also listed, but for privacy reasons, the URLs are not shown themselves.
</p>
......@@ -2,5 +2,5 @@
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Pages</h3>
<p>
The number of pages contained in the portfolio that was created during the selected time frame.
The number of pages contained in the portfolio that was created during the selected time period.
</p>
......@@ -2,5 +2,5 @@
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Owner</h3>
<p>
The person who created a portfolio during the selected time frame.
The person who created a portfolio during the selected time period.
</p>
......@@ -2,5 +2,5 @@
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Page / collection</h3>
<p>
The portfolio that was created during the selected time frame.
The portfolio that was created during the selected time period.
</p>
......@@ -2,5 +2,5 @@
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Artefacts</h3>
<p>
Number of artefacts created by institution members during the selected time frame.
Number of artefacts created by institution members during the selected time period.
</p>
......@@ -2,5 +2,5 @@
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Blocks</h3>
<p>
Number of blocks created by institution members during the selected time frame.
Number of blocks created by institution members during the selected time period.
</p>
......@@ -2,5 +2,5 @@
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Members</h3>
<p>
Number of members in an institution during the selected time frame.
Number of members in an institution during the selected time period.
</p>
......@@ -2,5 +2,5 @@
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Forum posts</h3>
<p>
Number of forum posts created by institution members during the selected time frame.
Number of forum posts created by institution members during the selected time period.
</p>
......@@ -2,5 +2,5 @@
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Pages</h3>
<p>
Number of pages in an institution during the selected time frame.
Number of pages in an institution during the selected time period.
</p>
......@@ -2,5 +2,5 @@
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Modified</h3>
<p>
Sum of all items that were modified during the selected time frame.
Sum of all items that were modified during the selected time period.
</p>
......@@ -2,5 +2,5 @@
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Total</h3>
<p>
Sum of all items that are in the institution or the site during the selected time frame.
Sum of all items that are in the institution or the site during the selected time period.
</p>
......@@ -2,5 +2,5 @@
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Collections</h3>
<p>
Sum of all collections in a group that was created during the selected time frame.
Sum of all collections in a group that was created during the selected time period.
</p>
......@@ -2,5 +2,5 @@
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Forums</h3>
<p>
Sum of all forums available in a group that was created during the selected time frame.
Sum of all forums available in a group that was created during the selected time period.
</p>
......@@ -2,5 +2,5 @@
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Group</h3>
<p>
Listed are groups that were created during the selected time frame.
Listed are groups that were created during the selected time period.
</p>
......@@ -2,5 +2,5 @@
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Group page comments</h3>
<p>
Sum of all comments added to group pages and artefacts for a group that was created during the selected time frame.
Sum of all comments added to group pages and artefacts for a group that was created during the selected time period.
</p>
......@@ -2,5 +2,5 @@
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Members</h3>
<p>
Total number of all members who are in a group that was created during the selected time frame.
Total number of all members who are in a group that was created during the selected time period.
</p>
......@@ -2,5 +2,5 @@
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Forum posts</h3>
<p>
Sum of all forum posts in a group that was created during the selected time frame.
Sum of all forum posts in a group that was created during the selected time period.
</p>
......@@ -2,7 +2,7 @@
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Shared page comments</h3>
<p>
Sum of all comments added to pages and page artefacts after they have been shared with a group that was created during the selected time frame.
Sum of all comments added to pages and page artefacts after they have been shared with a group that was created during the selected time period.
</p>
<p>Any comments added before the page was shared are not counted.
</p>
......@@ -2,5 +2,5 @@
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Shared pages</h3>
<p>
Sum of all the pages, including all within collections, that have been shared with a group that was created during the selected time frame.
Sum of all the pages, including all within collections, that have been shared with a group that was created during the selected time period.
</p>
......@@ -2,5 +2,5 @@
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Pages</h3>
<p>
Sum of all pages in a group that was created during the selected time frame.
Sum of all pages in a group that was created during the selected time period.
</p>
......@@ -2,6 +2,6 @@
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Active users</h3>
<p>
Number of institution members who logged into the site during the selected time frame.</p>
Number of institution members who logged into the site during the selected time period.</p>
<p>For example, if a person logs into the site twice in a single day, they are only counted once for the "Active users" count, but twice for the "Logins" count.
</p>
......@@ -2,6 +2,6 @@
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Logins</h3>
<p>
Number of total logins of institution members during the selected time frame.</p>
Number of total logins of institution members during the selected time period.</p>
<p>That means if a person logs into the site twice in a single day, both logins are counted here. However, they are only counted once in the "Active users" count.
</p>
......@@ -2,5 +2,5 @@
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>User</h3>
<p>
Person who was masqueraded by an administrator during the seclected time frame.
Person who was masqueraded by an administrator during the seclected time period.
</p>
......@@ -2,5 +2,5 @@
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Blocks</h3>
<p>
Sum of all blocks on a page provided that the page was modified during the reporting time frame.
Sum of all blocks on a page provided that the page was modified during the reporting time period.
</p>
......@@ -2,5 +2,5 @@
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Collection</h3>
<p>
Title of the collection if the page, which was modified during the reporting time frame, is part of one.
Title of the collection if the page, which was modified during the reporting time period, is part of one.
</p>
......@@ -2,5 +2,5 @@
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Comments</h3>
<p>
Sum of all page and artefact comments for a page provided the page was modified during the reporting time frame.
Sum of all page and artefact comments for a page provided the page was modified during the reporting time period.
</p>
......@@ -2,5 +2,5 @@
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Created</h3>
<p>
Date when the page was created. Only pages modified during the reporting time frame are displayed.
Date when the page was created. Only pages modified during the reporting time period are displayed.
</p>
......@@ -2,5 +2,5 @@
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Last modified</h3>
<p>
Date when the page was last modified during the reporting time frame.
Date when the page was last modified during the reporting time period.
</p>
......@@ -2,5 +2,5 @@
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Owner</h3>
<p>
Person, group, or institution that owns the page modified during the reporting time frame.
Person, group, or institution that owns the page modified during the reporting time period.
</p>
......@@ -2,5 +2,5 @@
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Page</h3>
<p>
Title of the the page that was modified during the reporting time frame.
Title of the page that was modified during the reporting time period.
</p>
......@@ -2,5 +2,5 @@
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Last visited</h3>
<p>
Date when a person last visited the page provided it was modified during the reporting time frame.
Date when a person last visited the page provided it was modified during the reporting time period.
</p>
......@@ -2,5 +2,5 @@
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Visits</h3>
<p>
Sum of all visits on a page provided it was modified during the reporting time frame.
Sum of all visits on a page provided it was modified during the reporting time period.
</p>
<!-- @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>Strict privacy</h3>
<p>Turning on this option will require everyone on the site to accept the terms and conditions and the privacy statement for the site. If institutions have their own statements, members of the institution will need to consent to that as well.</p> <p>This option is not available if the site has people in multiple institutions. If you need to enable strict privacy, you will need to make changes to these accounts first and have them in one institution only.</p>
<p>For more information and any text changes you may need to make to your terms and conditions and privacy statement, please consult your lawyer. The Mahara project cannot provide legal advice.</p>
<p>Turning on this option will require everyone on the site to accept the terms and conditions and the privacy statement for the site. If institutions have their own statements, members of the institution will need to consent to them as well.</p> <p>This option is not available if the site has people in multiple institutions. If you need to enable strict privacy, you will need to make changes to these accounts first and have them in one institution only.</p>
<p>For more information and any text changes you may need to make to your terms and conditions and privacy statement, please consult your lawyer. The Mahara project does not provide legal advice.</p>
<p>Find out more about the <a href="https://www.eugdpr.org/">GDPR</a>.</p>
......@@ -2,7 +2,7 @@
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Internal notification expiry</h3>
<p>The following notification types will be deleted from your inbox
after the specified days have elapsed:</p>
after the specified number of days have elapsed:</p>
<ul>
<li>Page access notifications</li>
<li>Watchlist notifications</li>
......
......@@ -2,7 +2,7 @@
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Actions</h3>
<p>
Total number of actions a person performed during the selected time frame. The following actions are recorded and included in the count:</p>
Total number of actions a person performed during the selected time period. The following actions are recorded and included in the count:</p>
<ul>
<li>Add a block to a page</li>
<li>Add a friend</li>
......
......@@ -2,5 +2,5 @@
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Collections</h3>
<p>
Total number of collections that a person has created during the time frame.
Total number of collections that a person has created during the time period.
</p>
......@@ -2,5 +2,5 @@
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Groups</h3>
<p>
The number of groups a person created during the time frame.
The number of groups a person created during the time period.
</p>
......@@ -2,5 +2,5 @@
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Last action</h3>
<p>
The last time a person performed an action in their account during the time frame.
The last time a person performed an action in their account during the time period.
</p>
......@@ -2,5 +2,5 @@
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Logins</h3>
<p>
Total number of times a person logged into their account during the selected time frame.
Total number of times a person logged into their account during the selected time period.
</p>
......@@ -2,5 +2,5 @@
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Pages</h3>
<p>
Total number of pages that a person created during the time frame.</p>
<p>This may be fewer or more pages than they have in their account depending on whether they have deleted some or created some outside of the time frame.</p>
Total number of pages that a person created during the time period.</p>
<p>This may be fewer or more pages than they have in their account depending on whether they have deleted some or created some outside of the time period.</p>
......@@ -2,5 +2,5 @@
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Created</h3>
<p>
Number of user accounts that were created during the selected time frame.
Number of user accounts that were created during the selected time period.
</p>
......@@ -2,5 +2,5 @@
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Logged in</h3>
<p>
Number of people who logged into the site during the selected time frame.
Number of people who logged into the site during the selected time period.
</p>
......@@ -2,5 +2,5 @@
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Total</h3>
<p>
Total number of user accounts that exist during the selected time frame.
Total number of user accounts that exist during the selected time period.
</p>
......@@ -3,7 +3,7 @@
<h3>Inbox</h3>
<p>This is a list of system messages and notifications that apply to you. Use the "Notifications" page in the "Settings" area to decide how you will receive notifications. Once you have read a notification, you can mark it for removal from your list.</p>
<p><strong>Note:</strong> The following notification types expire automatically when you choose an email notification option and are
deleted from your inbox after the specified days in Site options → Notification settings → Internal notification expiry:</p>
deleted from your inbox after the number of days specified in "Administration menu" → "Site options" → "Notification settings" → "Internal notification expiry":</p>
<ul>
<li>Page access notifications</li>
<li>Watchlist notifications</li>
......
......@@ -6,9 +6,8 @@
<p><strong>Email:</strong> Your primary email address will receive an email each time the activity occurs.</p>
<p><strong>Email digest:</strong> Your primary email address will receive an email each day with a list of the activities of the last 24 hours.</p>
<p><strong>Note:</strong> If you select either email option, all activities will also be recorded in your inbox as they happen. They will all be marked as already read.</p>
<p>The following notifications expire automatically when you choose an email notification option and are deleted from your inbox after the specified days in Site options → Notification settings → Internal
notification expiry:</p>
<p>The following notifications expire automatically when you choose an email notification option and are deleted from your inbox after the number of days specified in "Administration menu" → "Site options" → "Notification settings" → "Internal notification expiry":</p>
<ul>
<li>Page access notifications</li>
<li>Watchlist notifications</li>
<li>Institution messages</li>
\ No newline at end of file
<li>Institution messages</li>
......@@ -448,13 +448,13 @@ $string['passwordstrength4'] = 'Very strong';
$string['passworddescription'] = '';
$string['passworddescriptionbase'] = 'The mininum length of the password is %s characters.';
$string['passworddescription.ul'] = 'It must contain upper and lowercase letters.';