Commit b125a378 authored by Kristina Hoeppner's avatar Kristina Hoeppner Committed by Robert Lyon
Browse files

Bug 1793943: Review new language strings

Go over new language strings since 18.04
and fix them up where necessary. Those that
only have impact on English do not receive a
new language ID.

behatnotneeded

Change-Id: I18506b5092748111cb2fe7992702ca05b7d72e93
parent b23b21a6
......@@ -20,4 +20,4 @@ $string['instructions'] = 'Instructions';
$string['draft'] = 'Save draft';
$string['publish'] = 'Publish';
$string['savepublishhelp'] = '<p><strong>Save draft:</strong> Only you can view it. While your assessment is in draft status, you can make changes.</p>
<p><strong>Publish:</strong> The person for whom you are giving the peer assessment can see your assessment. Everybody else who has access to the portfolio can view it as well, unless the portfolio also contains the signoff block and is not signed off by the portfolio owner. You cannot revert a published assessment to draft status.</p>';
<p><strong>Publish:</strong> The person for whom you are giving the peer assessment can see your assessment. Everybody else who has access to the portfolio can view it as well, unless the portfolio also contains the sign-off block and is not signed off by the portfolio owner. You cannot revert a published assessment to draft status.</p>';
......@@ -22,7 +22,7 @@ $string['verifydesc'] = 'Decide whether a moderator needs to verify this page as
$string['signedoff'] = 'Signed off';
$string['verified'] = 'Verified';
$string['signoffpagetitle'] = 'Sign-off page';
$string['signoffpagetitle'] = 'Sign off page';
$string['signoffpagedesc'] = 'Select "Yes" to sign off this page and indicate that you have met all requirements. Select "No" to abort.';
$string['signoffpageundodesc'] = 'If you select "Yes", you will remove the signed off status. That will also remove the verification if that had been part of the assessment work flow. Select "No" to abort.';
$string['signoffpageconfirm'] = 'Confirm this action?';
......
......@@ -396,5 +396,5 @@ $string['membersinvalidaction'] = 'invalid action "%s" for user "%s" on group "%
$string['passwordmustbechangedviawebsite'] = 'You need to change your password. Please log in via a web browser in order to update your password.';
$string['featuredisabled'] = 'This web services feature is not enabled. Please contact your site administrator for more information.';
$string['institutionunknown'] = '- unknown -';
$string['unabletodeleteadmin'] = 'Unable to delete user with ID: "%s" as they are an admin';
$string['unabletodeleteadmin'] = 'Unable to delete user with ID "%s" as they are an admin';
$string['notuserblog'] = 'The journal is not owned by "%s"';
......@@ -19,7 +19,7 @@ $string['changeusernameheading'] = 'Change username';
$string['changeusername'] = 'New username';
$string['changeusernamedesc'] = 'The username you use to log into %s. Usernames are 3-30 characters long and may contain letters, numbers, and most common symbols excluding spaces.';
$string['usernameexists1'] = 'You can\'t use this username, please choose another one.';
$string['usernameexists1'] = 'You can\'t use this username. Please choose another one.';
$string['accountoptionsdesc'] = 'General account options';
......
......@@ -248,8 +248,8 @@ $string['Value'] = 'Value';
$string['dataincluded'] = 'Data included';
$string['datathathavebeensent'] = 'Data that has been sent';
$string['newregistrationpolicyinfo'] = '<p>We have updated our registration data policy to require registered sites to provide weekly updates of their data. Please follow the link below to confirm or remove your registration.</p>';
$string['registerwithmahara'] = 'Register with mahara.org?';
$string['remainregistered'] = 'Remain registered?';
$string['registerwithmahara'] = 'Register with mahara.org';
$string['remainregistered'] = 'Remain registered';
$string['Register'] = 'Register';
$string['Registration'] = 'Registration';
$string['registrationcancelled'] = 'You can choose to register at any time by going to the <a href="%sadmin/registersite.php">site registration page</a>.';
......@@ -257,16 +257,16 @@ $string['registrationfailedtrylater'] = 'Registration failed with error code %s.
$string['registrationsuccessfulthanksforregistering'] = 'Registration successful - thanks for registering.';
$string['registermaharasite'] = 'Site registration';
$string['registeryoursitesummary'] = '
<p>Registering your Mahara site with <a href="https://mahara.org/">mahara.org</a> helps us to build up a picture of the Mahara installations around the world.</p>';
<p>Registering your Mahara site with <a href="https://mahara.org/">mahara.org</a> helps us to get a picture of the Mahara installations around the world.</p>';
$string['registeryourmaharasitedetail'] = '
<p>You can choose to register your Mahara site with <a href="https://mahara.org/">mahara.org</a>. Registration is free and helps us build up a picture of the Mahara installations around the world.</p>
<p>You can choose to register your Mahara site with <a href="https://mahara.org/">mahara.org</a>. Registration is free and helps us get a picture of the Mahara installations around the world.</p>
<p>You can see the information that will be sent to mahara.org. Nothing that can personally identify any of your users will be sent. If you choose to register, Mahara will automatically send your updated information to mahara.org once a week.</p>';
$string['registrationremoved'] = 'Your site\'s registration has been removed. You can re-register with mahara.org at any time.';
$string['sendingweeklyupdates'] = 'You are currently sending weekly updates.';
$string['sendingweeklyupdates'] = 'Currently, you are sending weekly updates.';
$string['siteisregisteredsince'] = 'Your site has been registered with <a href="https://mahara.org/">mahara.org</a> since %s.';
$string['siteisregistered'] = 'Your site is registered with <a href="https://mahara.org/">mahara.org</a>.';
$string['registeredinfo'] = 'Updated information about your site is being sent to mahara.org weekly. You can see what is being sent in the &quot;Data included&quot; section below. Nothing that can personally identify any of your users is sent.</p><p>To remove registration of your site, change the &quot;Remain registered&quot; switch to &quot;No&quot; and press the &quot;Save&quot; button.';
$string['siteregistrationpolicy'] = '<p>To ensure our statistics accurately show how Mahara is being used, registration now includes sending us weekly updates. Please review and confirm your registration by clicking &quot;Save&quot; below.</p>';
$string['registeredinfo'] = 'Updated information about your site is sent to mahara.org weekly. You can see what is sent in the &quot;Data included&quot; section below. Nothing that can personally identify any of your users is sent.</p><p>To remove the registration of your site, change the &quot;Remain registered&quot; switch to &quot;No&quot; and click the &quot;Save&quot; button.';
$string['siteregistrationpolicy'] = '<p>To ensure our statistics show accurately how Mahara is being used, registration now includes sending us weekly updates. Please review and confirm your registration by clicking &quot;Save&quot; below.</p>';
// Close site
$string['Close'] = 'Close';
......@@ -516,7 +516,7 @@ $string['mathjaxdescription'] = 'MathJax renders LaTeX markup into properly form
$string['mathjaxconfig'] = 'MathJax configuration';
$string['timezone'] = 'Timezone';
$string['sitetimezonedescription'] = 'The default timezone for the site. If not selected one will be chosen based on country, but this can be innaccurate if the counrty has multiple timezones.';
$string['notimezoneselected'] = 'No Timezone Selected';
$string['notimezoneselected'] = 'No timezone selected';
// Site content
$string['about'] = 'About';
$string['discardpageedits'] = 'Discard your changes to this page?';
......@@ -1362,17 +1362,17 @@ $string['cli_done'] = 'Indexing finished';
// Clean up old users
$string['cli_param_dryrun'] = 'Dry run to indicate what will happen. Set to "true" by default. Need to set -d=false to actually update database.';
$string['cli_deleteinactiveusers_beforedate'] = 'Delete users where their last login date is earlier than this date. Date can be any datetime string, eg: "2018-02-25" or "-6 months"';
$string['cli_deleteinactiveusers_limit'] = 'Limit of users to work with for each delete run';
$string['cli_deleteinactiveusers_cleanusers'] = 'Try to delete users from the "usr" table as well';
$string['cli_deleteinactiveusers_beforedate'] = 'Delete users where their last login date is earlier than this date. Date can be any datetime string, e.g. "2018-02-25" or "-6 months".';
$string['cli_deleteinactiveusers_limit'] = 'Limit of users to work with for each delete run.';
$string['cli_deleteinactiveusers_cleanusers'] = 'Try to delete users from the "usr" table as well.';
$string['cli_deleteinactiveusers_info'] = 'This command-line PHP script allows you to delete old users. This will only work for users who either have not logged in or have never made a forum post.';
$string['cli_deleteinactiveusers_neverloggedin'] = 'Delete users that have never logged in (were setup by an admin)';
$string['cli_deleteinactiveusers_neverloggedin'] = 'Delete users that have never logged in (were set up by an admin).';
$string['cli_param_baddate'] = 'The supplied date "%s" is not valid.';
$string['cli_deleteinactiveusers_usercount'] = 'There are "%s" users to delete';
$string['cli_deleteinactiveusers_userunabletoclean'] = 'Unable to fully delete user "%s" (ID %s)';
$string['cli_deleteinactiveusers_userunabletodelete'] = 'Unable to delete user "%s" (ID %s)';
$string['cli_deleteinactiveusers_usercount'] = 'There are "%s" users to delete.';
$string['cli_deleteinactiveusers_userunabletoclean'] = 'Unable to delete user "%s" (ID %s) fully.';
$string['cli_deleteinactiveusers_userunabletodelete'] = 'Unable to delete user "%s" (ID %s).';
$string['cli_deleteinactiveusers_nouserstodelete'] = 'There are no users to delete.';
$string['cli_deleteinactiveusers_onlydryrun1'] = 'This is only a dry run with the following settings
$string['cli_deleteinactiveusers_onlydryrun1'] = 'This is only a dry run with the following settings:
Institution: %s
Group: %s
Before date: %s
......@@ -1380,12 +1380,12 @@ Delete users from "usr" table: %s
Never logged in: %s';
// Clean up old groups
$string['cli_deleteinactivegroups_info'] = 'This command-line PHP script allows you to delete old groups. This will only work for groups who currently have no members. This will also include groups with only one owner/administrator if the "onlyadmins" flag is set.';
$string['cli_deleteinactivegroups_beforedate'] = 'Delete groups where their last modification date is earlier than this date. Date can be any datetime string, eg: "2018-02-25" or "-6 months"';
$string['cli_deleteinactivegroups_limit'] = 'Limit of groups to work with for each delete run';
$string['cli_deleteinactivegroups_cleangroups'] = 'Try to delete groups from the "group" table as well';
$string['cli_deleteinactivegroups_onlyadmins'] = 'Also include groups that only have owner/administrator as members';
$string['cli_deleteinactivegroups_onlydryrun'] = 'This is only a dry run with the following settings
$string['cli_deleteinactivegroups_info'] = 'This command-line PHP script allows you to delete old groups. This will only work for groups that do not have any members. This will also include groups with only one owner / administrator if the "onlyadmins" flag is set.';
$string['cli_deleteinactivegroups_beforedate'] = 'Delete groups where their last modification date is earlier than this date. Date can be any datetime string, e.g. "2018-02-25" or "-6 months".';
$string['cli_deleteinactivegroups_limit'] = 'Limit of groups to work with for each delete run.';
$string['cli_deleteinactivegroups_cleangroups'] = 'Try to delete groups from the "group" table as well.';
$string['cli_deleteinactivegroups_onlyadmins'] = 'Also include groups that only have owner / administrator as members.';
$string['cli_deleteinactivegroups_onlydryrun'] = 'This is only a dry run with the following settings:
Institution: %s
Before date: %s
Delete groups from "group" table: %s
......@@ -1393,12 +1393,11 @@ Also delete groups that only contain owner/admin: %s
%s';
$string['cli_deleteinactivegroups_danger'] = '
*** The settings chosen will delete all groups ***
If this is what you desire then set the --beforedate to a date in the future
';
$string['cli_deleteinactivegroups_groupcount'] = 'There are "%s" groups to delete';
If this is what you desire, then set the --beforedate to a date in the future.';
$string['cli_deleteinactivegroups_groupcount'] = 'There are "%s" groups to delete.';
$string['cli_deleteinactivegroups_nogroupstodelete'] = 'There are no groups to delete.';
$string['cli_deleteinactivegroups_emptygroups'] = 'Only delete groups that have no members';
$string['cli_deleteinactivegroups_groupunabletoclean'] = 'Unable to fully delete group "%s" (ID %s)';
$string['cli_deleteinactivegroups_emptygroups'] = 'Only delete groups that do not have any members.';
$string['cli_deleteinactivegroups_groupunabletoclean'] = 'Unable to fully delete group "%s" (ID %s).';
$string['withselectedcontentexport'] = 'Re-queue items into the export queue';
$string['withselectedcontentdelete'] = 'Delete selected items from the export queue';
......
......@@ -136,7 +136,7 @@ $string['noreplyaddressmissingorinvalid'] = 'The noreply address setting is eith
$string['openbasedirenabled'] = 'Your server has the php open_basedir restriction enabled.';
$string['openbasedirpaths'] = 'Mahara can only open files within the following path(s): %s.';
$string['openbasedirwarning'] = 'Some requests for external sites may fail to complete. This could stop certain feeds from updating among other things.';
$string['resavecustomthemes'] = 'Your latest upgrade may have stopped your configurable themes displaying correctly. To update a configurable theme please go to Administration → Institution -> Settings and configure the institution\'s settings and save the form.<br>The following institutions use configurable themes:';
$string['resavecustomthemes'] = 'Your latest upgrade may have stopped your configurable themes from displaying correctly. To update a configurable theme, please go to Administration → Institution -> Settings, configure the institution\'s settings, and save the form.<br>The following institutions use configurable themes:';
$string['gdlibrarylacksgifsupport'] = 'The installed PHP GD library does not support both creating and reading GIF images. Full support is needed to upload GIF images.';
$string['gdlibrarylacksjpegsupport'] = 'The installed PHP GD library does not support JPEG/JPG images. Full support is needed to upload JPEG/JPG images.';
......@@ -153,5 +153,5 @@ $string['nophpextension'] = 'The PHP extension "%s" is not enabled. Please enabl
$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.';
$string['updatesitetimezone'] = 'The timezone for the site now needs to be set via Configure site → Site options → Site settings. Please set it there and delete the $cfg->dbtimezone line from your config.php file.';
$string['pluginnotactive'] = 'The plugin "%s" is not enabled. Please got to Administration → Extensions to enable it.';
$string['updatesitetimezone'] = 'The timezone for the site now needs to be set via "Configure site""Site options""Site settings". Please set it there and delete the $cfg->dbtimezone line from your config.php file.';
$string['pluginnotactive1'] = 'The plugin "%s" is not enabled. Please got to "Administration""Extensions" → "Plugin administration" to enable it.';
......@@ -483,7 +483,7 @@ $string['titleanddescriptionandtagsandowner'] = 'Title, description, tags, owner
$string['tagsonly'] = 'Tags only'; // for elasticsearch
$string['tagsonly1'] = 'Tags';
$string['matchalltags'] = 'Match all tags';
$string['matchalltagsdesc'] = 'Separate tags with commas, eg: cats,tabby';
$string['matchalltagsdesc'] = 'Separate tags with commas, e.g. cats,tabby';
$string['sharedviewsdescription'] = 'This page lists the most recently modified or commented on pages that have been shared with you. They may have been shared with you directly, shared with friends of the owner, or shared with one of your groups.';
$string['sharedwith'] = 'Shared with';
$string['sharewith'] = 'Share with';
......
......@@ -21,7 +21,7 @@ require(dirname(dirname(dirname(__FILE__))) . '/init.php');
define('TITLE', get_string('Framework', 'module.framework'));
safe_require('module', 'framework');
if (!PluginModuleFramework::is_active()) {
throw new AccessDeniedException(get_string('pluginnotactive', 'error', get_string('frameworknav', 'module.framework')));
throw new AccessDeniedException(get_string('pluginnotactive1', 'error', get_string('frameworknav', 'module.framework')));
}
$upload = param_boolean('upload');
......
......@@ -50,4 +50,4 @@ $string['labelsearch'] = 'Search';
$string['labelall'] = 'All';
$string['labelmessage'] = 'Message';
$string['multirecipientnotificationnotenabled'] = 'The module multirecipientnotifications needs to be installed and active. If you are upgrading Mahara from a version older than 16.10.0 please upgrade to this point first and make sure the module is installed and active by visiting "Administration menu" → "Extensions".';
$string['multirecipientnotificationnotenabled'] = 'The module "multirecipientnotifications" needs to be installed and be active. If you are upgrading Mahara from a version older than 16.10.0, please upgrade to that point first and make sure the module is installed and active by visiting "Administration menu" → "Extensions" → "Plugin administration".';
......@@ -42,8 +42,8 @@
</h4>
</div>
<div class="modal-body">
<p id="signoff-on" class="hidden"><strong>{str tag=signoffpageundodesc section=blocktype.peerassessment/signoff}</strong></p>
<p id="signoff-off" class="hidden"><strong>{str tag=signoffpagedesc section=blocktype.peerassessment/signoff}</strong></p>
<p id="signoff-on" class="hidden">{str tag=signoffpageundodesc section=blocktype.peerassessment/signoff}</p>
<p id="signoff-off" class="hidden">{str tag=signoffpagedesc section=blocktype.peerassessment/signoff}</p>
<div class="btn-group">
<button id="signoff-yes-button" type="button" class="btn btn-default">{str tag="yes"}</button>
<button id="signoff-back-button" type="button" class="btn btn-default">{str tag="no"}</button>
......@@ -63,7 +63,7 @@
</h4>
</div>
<div class="modal-body">
<p><strong>{str tag=verifypagedesc section=blocktype.peerassessment/signoff}</strong></p>
<p>{str tag=verifypagedesc section=blocktype.peerassessment/signoff}</p>
<div class="btn-group">
<button id="verify-yes-button" type="button" class="btn btn-default">{str tag="yes"}</button>
<button id="verify-back-button" type="button" class="btn btn-default">{str tag="no"}</button>
......@@ -136,4 +136,4 @@ $(function() {
});
});
});
</script>
\ No newline at end of file
</script>
......@@ -10,7 +10,7 @@ Background:
Scenario: Create a plan -> add plan block to page -> create new task from block on page
Given I log in as "admin" with password "Kupuh1pa!"
And I choose "Plans" in "Content" from main menu
And I choose "Plans" in "Create" from main menu
And I follow "New plan"
And I fill in the following:
| Title * | Plan 9 from outer space |
......@@ -19,7 +19,7 @@ Scenario: Create a plan -> add plan block to page -> create new task from block
And I fill in select2 input "addplan_tags" with "test" and select "test"
And I press "Save plan"
# add plan block to page
Given I choose "Pages and collections" in "Portfolio" from main menu
Given I choose "Pages and collections" in "Create" from main menu
And I click on "Page admin_01" panel menu
And I click on "Edit" in "Page admin_01" panel menu
And I expand "General" node
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment