Bug 1846915: Small language string fixes

Made small changes for newly added or changed language strings
for consistency and readability.

behatnotneeded

Change-Id: I6080927725d08951137f15c7dece9147a1352b39

htdocs/artefact/plans/groupplans/toggle_grouptask.json.php

@@ -34,7 +34,7 @@ try {
     }
 
     if ($USER->can_edit_artefact($rootGroupPlan)) {
-        throw new Exception(get_string('wrongroleforfunction', 'artefact.plans'));
+        throw new Exception(get_string('wrongfunctionrole', 'artefact.plans'));
     }
 
     if (!$rootGroupPlan->is_selection_plan()) {

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

@@ -67,7 +67,7 @@ $string['savetask'] = 'Save task';
 
 $string['Task'] = 'Task';
 $string['Tasks'] = 'Tasks';
-// For counting tasks results e. g. tasklist
+// For counting tasks results, e.g. tasklist
 $string['task'] = 'task';
 $string['tasks'] = 'tasks';
 
@@ -83,7 +83,7 @@ $string['viewandoutputcontainsameelement'] = 'Task and assignment portfolio cann
 $string['grouptaskselected'] = 'The plan and selected tasks were transferred to your personal portfolio area. If applicable, assignment portfolios were copied as well.';
 $string['grouptaskunselected'] = 'The plan and / or selected tasks were removed from your personal portfolio area. If applicable, any unedited assignment portfolios were removed as well.';
 $string['unselecttaskconfirm'] = 'Do you really want to remove this task from your plan?';
-$string['wrongroleforfunction'] = 'Your role is not intended to perform this functionality.';
+$string['wrongfunctionrole'] = 'You cannot complete this action because your role does not allow it.';
 
 $string['ntasks'] = [
         '1 task',

htdocs/artefact/plans/lang/en.utf8/help/pages/groupplans.html

@@ -5,8 +5,8 @@
 
 <p>Your <strong>personal plans</strong> can be todo lists for any sort of activities you would like to track.</p>
 
-<p>Your <strong>templates plans</strong> help you set up assignment plans for learners that you can use in groups as starting point.</p>
+<p>Your <strong>template plans</strong> help you set up assignment plans for learners that you can use in groups as starting point.</p>
 
-<p>Template plans typically contain explicit tasks for learners to complete. You can associate a template portfolio with each task making it easy for students to copy these into their personal areas.</p>
+<p>Template plans typically contain explicit tasks for learners to complete. You can associate a template portfolio with each task making it easy for learners to copy these into their personal portfolio areas.</p>
 
 <p>When you set up a <strong>group plan</strong>, you can decide whether to use one of your template plans as starting point or whether to set up a plan from scratch. You can set up assignment plans directly in a group as well.</p>

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

@@ -25,4 +25,4 @@ $string['options_order_desc'] = 'You can choose to display the latest group memb
 $string['Latest'] = 'Latest';
 $string['Random'] = 'Random';
 
-$string['defaulttitledescription'] = 'A default title will be generated if you leave the title field blank';
+$string['defaulttitledescription'] = 'A default title will be generated if you leave the title field blank.';

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

@@ -22,7 +22,7 @@ $string['displaysharedcollections'] = 'Display shared collections';
 $string['displaysharedcollectionsdesc'] = 'Show a list of collections shared with this group.';
 $string['displaysubmissions'] = 'Display submitted pages and collections';
 $string['displaysubmissionsdesc'] = 'Show a list of pages and collections submitted to this group.';
-$string['defaulttitledescription'] = 'A default title will be generated if you leave the title field blank';
+$string['defaulttitledescription'] = 'A default title will be generated if you leave the title field blank.';
 $string['itemstoshow'] = 'Entries per page';
 $string['itemstoshowdesc'] = 'The number of pages or collections shown for each section. Maximum: 100';
 $string['showbyanybody'] = 'By anybody';

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

@@ -18,4 +18,4 @@ $string['maxitems'] = 'Maximum number of items to display';
 $string['maxitemsdescription'] = 'Between 1 and 100';
 $string['More'] = 'More';
 $string['nomessages'] = 'No messages';
-$string['defaulttitledescription'] = 'A default title will be generated if you leave the title field blank';
+$string['defaulttitledescription'] = 'A default title will be generated if you leave the title field blank.';

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

@@ -15,4 +15,4 @@ $string['title1'] = 'Latest changes I can view';
 $string['description2'] = 'List the most recently updated pages and collections that you have access to on the site';
 $string['viewstoshow1'] = 'Maximum number of results to show';
 $string['viewstoshowdescription'] = 'Between 1 and 100';
-$string['defaulttitledescription'] = 'A default title will be generated if you leave the title field blank';
+$string['defaulttitledescription'] = 'A default title will be generated if you leave the title field blank.';

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

@@ -13,7 +13,7 @@ defined('INTERNAL') || die();
 
 $string['title'] = 'Placeholder';
 $string['description'] = 'Placeholder block that allows you to select what type of block you want';
-$string['placeholdertext'] = 'Please configure the block to choose what type of block this should be';
-$string['defaulttitledescription'] = 'A default title will be generated if you leave the title field blank';
+$string['placeholdertext'] = 'Please configure this block to choose its type.';
+$string['defaulttitledescription'] = 'A default title will be generated if you leave the title field blank.';
 $string['contenttypes'] = 'Content types';
-$string['placeholderblocktypenotenabled'] = 'The block type "placeholder" needs to be installed and be active. If it is already installed please set it to be active via the database "blocktype_installed" table.';
+$string['placeholderblocktypenotenabled'] = 'The block type "placeholder" needs to be installed and be active. If it is already installed, please set it to be active in the table "blocktype_installed" in the database.';

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

@@ -20,4 +20,4 @@ $string['nogroupstochoosefrom'] = 'Sorry, no groups to choose from';
 $string['poststoshow'] = 'Maximum number of posts to show';
 $string['poststoshowdescription'] = 'Between 1 and 100';
 $string['recentforumpostsforgroup'] = "Recent forum posts for %s";
-$string['defaulttitledescription'] = 'A default title will be generated if you leave the title field blank';
+$string['defaulttitledescription'] = 'A default title will be generated if you leave the title field blank.';

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

@@ -13,7 +13,7 @@
 defined('INTERNAL') || die();
 
 $string['title'] = 'Watched pages';
-$string['defaulttitledescription'] = 'A default title will be generated if you leave the title field blank';
+$string['defaulttitledescription'] = 'A default title will be generated if you leave the title field blank.';
 $string['description'] = 'Display pages on your watchlist';
 $string['nopages'] = 'There are no pages on your watchlist.';
 $string['itemstoshow'] = 'Items to show';

htdocs/lang/en.utf8/account.php

@@ -59,11 +59,11 @@ $string['hiderealnamedescription'] = 'Check this box if you have set a display n
 $string['showhomeinfo2'] = 'Dashboard information';
 $string['showhomeinfodescription1'] = 'Display information about how to use %s on the dashboard.';
 
-$string['showlayouttranslatewarning'] = 'Confirm before changing pages layout';
-$string['showlayouttranslatewarningdescription'] = 'Display a warning and request confirmation before changing the layout of a page to the new layout when editing the page';
+$string['showlayouttranslatewarning'] = 'Confirm before changing the page layout';
+$string['showlayouttranslatewarningdescription'] = 'Display a warning and request confirmation before changing the layout of a page to the new layout when editing the page.';
 
-$string['accessibilityprofile'] = 'Accessible profile';
-$string['accessibilityprofiledescription'] = 'Enable accessibility options in your account';
+$string['accessiblepagecreation'] = 'Accessible page creation';
+$string['accessiblepagecreationdescription'] = 'This option allows you to create and edit pages with a screenreader or the keyboard only.';
 
 $string['showprogressbar'] = 'Profile completion progress bar';
 $string['showprogressbardescription'] = 'Display progress bar and tips on how to complete your %s profile.';

htdocs/lang/en.utf8/admin.php

@@ -60,10 +60,10 @@ $string['cliupdatesitenamefailed'] = 'Updating site name failed.';
 $string['cliinstallerdescription'] = 'Install Mahara and create required data directories';
 $string['cliinstallingmahara'] = 'Installing Mahara';
 // CLI upgrade script
-$string['cli_upgrade_description'] = 'Upgrade the Mahara database and data to the version of Mahara installed';
+$string['cli_upgrade_description'] = 'Upgrade the Mahara database and data to the version of Mahara installed.';
 $string['cli_upgrade_title'] = 'Upgrading Mahara';
-$string['cli_upgrade_force'] = 'Force upgrade to rerun';
-$string['cli_upgrade_flag'] = 'An unfinished upgrade detected. To try upgrading again add "-f" option to the command.';
+$string['cli_upgrade_force'] = 'Force the upgrade to rerun';
+$string['cli_upgrade_flag'] = 'An unfinished upgrade was detected. To try upgrading again, add the "-f" option to the command.';
 
 $string['cliclearingcaches'] = 'Clearing Mahara caches.';
 $string['cliclearcachesdescription'] = 'Clearing caches will delete cached data from the server. There is no danger in clearing caches, but your site may appear slower for a while until the server and clients calculate new information and cache it.';
@@ -776,7 +776,7 @@ $string['bulkleap2aimportdescription1'] = '<p>You can import users in bulk from
 &nbsp;&nbsp;nigel,mahara-export-leap-user1-1266458159.zip
 </pre>
 <p>where mahara-export-leap-user8-1265165366.zip and mahara-export-leap-user1-1266458159.zip are files in a subdirectory called users.</p>
-<p>The structure of your ZIP file, eg import.zip file will be:</p>
+<p>The structure of your ZIP file, e.g. "import.zip" file will be:</p>
 <pre>
 import.zip<br>
 <span class="icon icon-file icon-regular"></span> usernames.csv<br>
@@ -790,7 +790,7 @@ $string['importfile'] = 'Bulk export file';
 $string['importfilemissinglisting'] = 'The bulk export file is missing a file named usernames.csv. Did you use the Mahara bulk exporter to export these users?';
 $string['importfilenotafile'] = 'Error during form submission: file was not recognised.';
 $string['importfilenotreadable'] = 'Error during form submission: file was not readable.';
-$string['bulkleap2aimportfiledescription1'] = 'Enter the path to the ZIP file on your server containing all exported users (in Leap2A format) along with a CSV listing of usernames<br>Eg "/home/example/data/import.zip"';
+$string['bulkleap2aimportfiledescription1'] = 'Enter the path to the ZIP file on your server that contains all exported users (in Leap2A format) along with a CSV listing of usernames, e.g. "/home/example/data/import.zip"';
 $string['importednuserssuccessfully'] = 'Imported %d of %d users successfully.';
 $string['Import'] = 'Import';
 $string['bulkimportdirdoesntexist'] = 'The directory %s does not exist.';
@@ -1361,7 +1361,7 @@ $string['cli_langpack_backup_failed'] = '*** WARNING *** Unable to make backup o
 $string['cli_langpack_en'] = 'You do not need to update the English langpack as the strings are defined in Mahara itself. You can set special lang strings in local/lang/.';
 $string['cli_langpack_extract_done'] = 'Copied new "%s" langpack into place';
 $string['cli_langpack_extract_failed'] = '*** WARNING *** Unable to extract files from "%s". Reason: %s';
-$string['cli_langpack_ignore'] = 'Langpack "%s" is already current so will skip updating';
+$string['cli_langpack_ignore'] = 'The language pack "%s" is already current so will skip updating';
 $string['cli_langpack_info'] = 'To update your language packs via the command line.
 You can:
 1) Install or update langpacks by listing the languages by their code, e.g. de = German, fr = French:

htdocs/lang/en.utf8/error.php

@@ -79,7 +79,7 @@ $string['blocktypeprovidedbyartefactnotinstallable'] = 'This will be installed a
 $string['blockconfigdatacalledfromset'] = 'Configdata should not be set directly. Use PluginBlocktype::instance_config_save instead.';
 $string['invaliddirection'] = 'Invalid direction %s.';
 $string['onlyoneprofileviewallowed'] = 'You are only allowed one profile page.';
-$string['cannotputblocktypeintoview'] = 'Cannot put %s blocktypes into this page';
+$string['cannotputblocktypeintoview'] = 'Cannot put %s block types into this page';
 $string['onlyoneblocktypeperview'] = 'Cannot put more than one %s block type into a page.';
 
 // if you change these next two , be sure to change them in libroot/errors.php

htdocs/lang/en.utf8/view.php

@@ -265,11 +265,11 @@ $string['updatedaccessfornumviews1'] = array(
 );
 
 $string['cantversionviewinvalid'] = 'The supplied page identifier is invalid.';
-$string['cantversionvieweditpermissions'] = 'You do not permission to edit this page.';
+$string['cantversionvieweditpermissions'] = 'You do not have permission to edit this page.';
 $string['cantversionviewsubmitted'] = 'You cannot edit this page because it has been submitted for assessment. You will have to wait until it is released.';
-$string['cantversionviewgroupeditwindow'] = 'You cannot edit this page. It is outside of the group editable date window.';
-$string['cantversionoldlayout'] = 'You cannot save a timeline version of a view with an old layout. You need to convert it to the new grid layout. To do this simply edit the page and the layout will be converted.';
-$string['cantaddannotationinoldlayout'] = 'You cannot add an annotation to this page. Please translate the page layout by editing the view first.';
+$string['cantversionviewgroupeditwindow'] = 'You cannot edit this page. It is outside of the group editability time frame.';
+$string['cantversionoldlayout'] = 'You cannot save a timeline version of a page with an old layout. You need to convert it to the new layout. To do this, edit the page and the layout will be converted.';
+$string['cantaddannotationinoldlayout'] = 'You cannot add an annotation to this page. Please convert the page layout by editing the page first.';
 
 $string['invalidcolumn'] = 'Column %s out of range';
 
@@ -279,10 +279,10 @@ $string['groupviewurltaken'] = 'A page with this URL already exists.';
 
 // view control stuff
 
-$string['editblockspagedescription'] = '<p>Drag and drop content blocks from the tabs below to create your page.</p>';
+$string['editblockspagedescription'] = '<p>Drag and drop content blocks from the buttons below to create your page.</p>';
 $string['displayview'] = 'Display page';
 $string['editthisview'] = 'Edit';
-$string['expandcontract'] = 'Expand /   Contract list of block types';
+$string['expandcontract'] = 'Expand / Contract the list of block types';
 $string['returntoviews'] = 'Return to pages and collections';
 $string['returntoinstitutionportfolios'] = 'Return to institution pages and collections';
 $string['returntositeportfolios'] = 'Return to site pages and collections';
@@ -306,10 +306,10 @@ $string['blockconfigurationrenderingerror'] = 'Configuration failed because the
 
 $string['blocksintructionnoajax'] = 'Select a block and choose where to add it to your page. You can position a block using the arrow buttons in its titlebar.';
 $string['blocksinstructionajaxlive1'] = 'This area shows a preview of what your page looks like. Changes are saved automatically.<br>Drag \'Add a new block\' onto the page to add one. You can then choose what type of block it will be. You can then also drag blocks around the page to change their position.';
-$string['blockchangedsuccess'] = "Changed placeholder block to a '%s' block successful";
-$string['blockchangederror'] = "Changing block to a '%s' block failed";
-$string['blockchangedbacksuccess'] = "Changed block back to placeholder block";
-$string['blockchangedbackerror'] = "Changing block back to placeholder block failed";
+$string['blockchangedsuccess'] = "Changed the placeholder block to a '%s' block successfully.";
+$string['blockchangederror'] = "Changing the block to a '%s' block failed.";
+$string['blockchangedbacksuccess'] = "Changed the block back to a placeholder block.";
+$string['blockchangedbackerror'] = "Changing the block back to a placeholder block failed.";
 
 $string['addblock'] = 'Add block: %s';
 $string['blockcell'] = 'Cell';
@@ -521,17 +521,17 @@ $string['top'] = 'Top';
 $string['blockssizeupdated'] = 'Block sizes were updated successfully';
 $string['dimensionsnotset'] = 'Block dimensions not set';
 $string['dontaskagain'] = 'Accept and remember';
-$string['pleaseconfirmtranslate'] = 'Transform page layout';
-$string['confirmtranslationmessage'] = 'As part of Mahara 19.10 we introduced a new way to create pages layout. To be able to edit this page we\'ll need to transform the old layout to the new grid layout.
-If you wish to transform this page alone, click \'Accept\'. To transform all pages that you edit and not see this message again, click \'Accept and remember\', this option can be changed in <a href="%s">Settings</a>. To go back to the page click on \'Cancel\'.
+$string['pleaseconfirmtranslate'] = 'Convert page layout';
+$string['confirmtranslationmessage'] = 'As part of Mahara 19.10 we introduced a new way to create a page layout. To be able to edit this page, you will need to convert the old layout to the new layout.
+If you wish to convert only this page, click \'Accept\'. To convert all pages and not see this message again, click \'Accept and remember\'. This option can be changed in your <a href="%s">Settings</a>. To go back to the page, click on \'Cancel\'.
 ';
 $string['accessibleview'] = 'Accessible layout';
-$string['accessibleviewdesc'] = 'Enable to have a one column layout for your page';
+$string['accessibleviewdescription'] = 'To create a one-column page layout and edit it with the keyboard instead of drag-and-drop.';
 $string['itemgrabbed'] = 'Item grabbed: %s';
 $string['itemdropped'] = 'Item dropped: %s';
 $string['itemreorder'] = 'List has been reordered. Item %s is now in position %s of %s';
-$string['reordercancelled'] = 'Reorder was cancelled';
-$string['accessibilitymodedescription'] = 'This page has accessibility layout enabled.
- In this mode, the page blocks will have full page width and will be displayed as a list that you can reorder.
- To change a block position, navigate to it, grab it with the \'Enter\' key and move it up and down the list of blocks with the arrow keys.';
+$string['reordercancelled'] = 'The reordering was cancelled';
+$string['accessibilitymodedescription'] = 'This page has the accessible layout enabled.
+ In this mode, the page blocks will have full page width and will be displayed one after the other.
+ To change a block position, navigate to it, grab it with the \'Enter\' key, and move it up and down the list of blocks with the arrow keys.';
 $string['blocktypeis'] = ' %s blocktype';

htdocs/lib/user.php

@@ -463,8 +463,8 @@ function general_account_prefs_form_elements($prefs) {
     $elements['accessibilityprofile'] = array(
         'type' => 'switchbox',
         'defaultvalue' => $prefs->accessibilityprofile,
-        'title' => get_string('accessibilityprofile', 'account'),
-        'description' => get_string('accessibilityprofiledescription', 'account'),
+        'title' => get_string('accessiblepagecreation', 'account'),
+        'description' => get_string('accessiblepagecreationdescription', 'account'),
     );
 
     return $elements;

htdocs/view/editlayout.php

@@ -296,7 +296,7 @@ function get_basic_elements() {
         $elements['accessibleview'] = array(
             'type'         => 'switchbox',
             'title'        => get_string('accessibleview', 'view'),
-            'description'  => get_string('accessibleviewdesc', 'view'),
+            'description'  => get_string('accessibleviewdescription', 'view'),
             'defaultvalue' => !$accessibleviewdisabled,
             'disabled'     => $accessibleviewdisabled,
         );

test/behat/features/user_content/placeholder.feature

@@ -26,7 +26,7 @@ Scenario: Adding a placeholder block to the page
     And I fill in the following:
     | Block title | Mahara placeholder block |
     And I press "Save"
-    Then I should see "Please configure the block to choose what type of block this should be"
+    Then I should see "Please configure this block to choose its type."
 
     # Edit placeholder block and check we can see more options
     And I scroll to the top