diff --git a/admin/tool/installaddon/lang/en/tool_installaddon.php b/admin/tool/installaddon/lang/en/tool_installaddon.php index da1aee9642fb9..6d9a4ea69a43d 100644 --- a/admin/tool/installaddon/lang/en/tool_installaddon.php +++ b/admin/tool/installaddon/lang/en/tool_installaddon.php @@ -37,7 +37,7 @@ $string['installfromzip_help'] = 'An alternative to installing a plugin directly from the Moodle plugins directory is to upload a ZIP package of the plugin. The ZIP package should have the same structure as a package downloaded from the Moodle plugins directory.'; $string['installfromzipfile'] = 'ZIP package'; $string['installfromzipfile_help'] = 'The plugin ZIP package must contain just one directory, named to match the plugin name. The ZIP will be extracted into an appropriate location for the plugin type. If the package has been downloaded from the Moodle plugins directory then it will have this structure.'; -$string['installfromzipinvalid'] = 'The plugin ZIP package must contain just one directory, named to match the plugin name. Provided file is not a valid plugin ZIP package.'; +$string['installfromzipinvalid'] = 'The plugin ZIP package must contain just one directory, named to match the plugin name. The file provided is not a valid plugin ZIP package.'; $string['installfromziprootdir'] = 'Rename the root directory'; $string['installfromziprootdir_help'] = 'Some ZIP packages, such as those generated by Github, may contain an incorrect root directory name. If so, the correct name may be entered here.'; $string['installfromzipsubmit'] = 'Install plugin from the ZIP file'; diff --git a/admin/tool/langimport/lang/en/tool_langimport.php b/admin/tool/langimport/lang/en/tool_langimport.php index a2ccf4e50f71b..d62d843d98567 100644 --- a/admin/tool/langimport/lang/en/tool_langimport.php +++ b/admin/tool/langimport/lang/en/tool_langimport.php @@ -39,12 +39,12 @@ $string['langupdatecomplete'] = 'Language pack update completed'; $string['missingcfglangotherroot'] = 'Missing configuration value $CFG->langotherroot'; $string['missinglangparent'] = 'Missing parent language {$a->parent} of {$a->lang}.'; -$string['noenglishuninstall'] = 'English language pack can not be uninstalled'; +$string['noenglishuninstall'] = 'The English language pack cannot be uninstalled.'; $string['nolangupdateneeded'] = 'All your language packs are up to date, no update is needed'; $string['pluginname'] = 'Language packs'; $string['purgestringcaches'] = 'Purge string caches'; $string['remotelangnotavailable'] = 'Because Moodle cannot connect to download.moodle.org, it is not possible for language packs to be installed automatically. Please download the appropriate ZIP file(s) from download.moodle.org/langpack, copy them to your {$a} directory and unzip them manually.'; -$string['selectlangs'] = 'Select languages to unistall!'; +$string['selectlangs'] = 'Select languages to uninstall'; $string['uninstall'] = 'Uninstall selected language pack(s)'; $string['uninstallconfirm'] = 'You are about to completely uninstall these language packs: {$a}. Are you sure?'; $string['updatelangs'] = 'Update all installed language packs'; diff --git a/admin/tool/langimport/tests/behat/manage_langpacks.feature b/admin/tool/langimport/tests/behat/manage_langpacks.feature index 757d46e9c1d2a..4d518de55e9af 100644 --- a/admin/tool/langimport/tests/behat/manage_langpacks.feature +++ b/admin/tool/langimport/tests/behat/manage_langpacks.feature @@ -53,7 +53,7 @@ Feature: Manage language packs And I navigate to "Language packs" node in "Site administration > Language" When I set the field "Installed language packs" to "English (en)" And I press "Uninstall selected language pack(s)" - Then I should see "English language pack can not be uninstalled" + Then I should see "The English language pack cannot be uninstalled." And I navigate to "Live logs" node in "Site administration > Reports" And I should not see "Language pack uninstalled" And I log out diff --git a/auth/ldap/lang/en/auth_ldap.php b/auth/ldap/lang/en/auth_ldap.php index c4c8c1d64705d..6812abee5650a 100644 --- a/auth/ldap/lang/en/auth_ldap.php +++ b/auth/ldap/lang/en/auth_ldap.php @@ -47,7 +47,7 @@ $string['auth_ldap_expiration_key'] = 'Expiration'; $string['auth_ldap_expiration_warning_desc'] = 'Number of days before password expiration warning is issued.'; $string['auth_ldap_expiration_warning_key'] = 'Expiration warning'; -$string['auth_ldap_expireattr_desc'] = 'Optional: overrides ldap-attribute that stores password expiration time'; +$string['auth_ldap_expireattr_desc'] = 'Optional: Overrides the LDAP attribute that stores password expiration time.'; $string['auth_ldap_expireattr_key'] = 'Expiration attribute'; $string['auth_ldapextrafields'] = 'These fields are optional. You can choose to pre-fill some Moodle user fields with information from the LDAP fields that you specify here.

If you leave these fields blank, then nothing will be transferred from LDAP and Moodle defaults will be used instead.

In either case, the user will be able to edit all of these fields after they log in.

'; $string['auth_ldap_graceattr_desc'] = 'Optional: Overrides gracelogin attribute'; @@ -71,7 +71,7 @@ $string['auth_ldap_noextension'] = 'The PHP LDAP module does not seem to be present. Please ensure it is installed and enabled if you want to use this authentication plugin.'; $string['auth_ldap_no_mbstring'] = 'You need the mbstring extension to create users in Active Directory.'; $string['auth_ldapnotinstalled'] = 'Cannot use LDAP authentication. The PHP LDAP module is not installed.'; -$string['auth_ldap_objectclass'] = 'Optional: Overrides objectClass used to name/search users on ldap_user_type. Usually you dont need to chage this.'; +$string['auth_ldap_objectclass'] = 'Optional: Overrides objectClass used to name/search users on ldap_user_type. Usually you don\'t need to change this.'; $string['auth_ldap_objectclass_key'] = 'Object class'; $string['auth_ldap_opt_deref'] = 'Determines how aliases are handled during search. Select one of the following values: "No" (LDAP_DEREF_NEVER) or "Yes" (LDAP_DEREF_ALWAYS)'; $string['auth_ldap_opt_deref_key'] = 'Dereference aliases'; diff --git a/blocks/tag_youtube/lang/en/block_tag_youtube.php b/blocks/tag_youtube/lang/en/block_tag_youtube.php index d56c330fb67e2..2016fd3b4f824 100644 --- a/blocks/tag_youtube/lang/en/block_tag_youtube.php +++ b/blocks/tag_youtube/lang/en/block_tag_youtube.php @@ -23,7 +23,7 @@ */ $string['anycategory'] = 'Any category'; -$string['apierror'] = 'The Youtube API key is not set. Contact your administrator.'; +$string['apierror'] = 'The YouTube API key is not set. Contact your administrator.'; $string['apikey'] = 'API key'; $string['apikeyinfo'] = 'Get a Google API key for your Moodle site.'; $string['autosvehicles'] = 'Autos & Vehicles'; @@ -42,7 +42,7 @@ $string['peopleblogs'] = 'People & Blogs'; $string['petsanimals'] = 'Pets & Animals'; $string['pluginname'] = 'YouTube'; -$string['requesterror'] = 'Data could not be obtained from the server. Contact your administrator if the problem persist.'; +$string['requesterror'] = 'Data could not be obtained from the server. Contact your administrator if the problem persists.'; $string['scienceandtech'] = 'Science & Tech'; $string['sports'] = 'Sports'; $string['tag_youtube:addinstance'] = 'Add a new YouTube block'; diff --git a/enrol/self/lang/en/enrol_self.php b/enrol/self/lang/en/enrol_self.php index 4ab8d5bae4e77..1af38c695743a 100644 --- a/enrol/self/lang/en/enrol_self.php +++ b/enrol/self/lang/en/enrol_self.php @@ -101,9 +101,9 @@ $string['sendcoursewelcomemessage_help'] = 'If enabled, users receive a welcome message via email when they self-enrol in a course.'; $string['showhint'] = 'Show hint'; $string['showhint_desc'] = 'Show first letter of the guest access key.'; -$string['status'] = 'Enable existing enrolments'; +$string['status'] = 'Allow existing enrolments'; $string['status_desc'] = 'Enable self enrolment method in new courses.'; -$string['status_help'] = 'If disabled all existing self enrolments are suspended and new users can not enrol.'; +$string['status_help'] = 'If enabled together with \'Allow new enrolments\' disabled, only users who self enrolled previously can access the course. If disabled, this self enrolment method is effectively disabled, since all existing self enrolments are suspended and new users cannot self enrol.'; $string['unenrol'] = 'Unenrol user'; $string['unenrolselfconfirm'] = 'Do you really want to unenrol yourself from course "{$a}"?'; $string['unenroluser'] = 'Do you really want to unenrol "{$a->user}" from course "{$a->course}"?'; diff --git a/enrol/self/tests/behat/self_enrolment.feature b/enrol/self/tests/behat/self_enrolment.feature index 74a4793f5480d..c60f0ed74085d 100644 --- a/enrol/self/tests/behat/self_enrolment.feature +++ b/enrol/self/tests/behat/self_enrolment.feature @@ -27,7 +27,7 @@ Feature: Users can auto-enrol themself in courses where self enrolment is allowe And I log out When I follow "Course 1" And I press "Log in as a guest" - Then I should see "Guests can not access this course, please try to log in." + Then I should see "Guests cannot access this course. Please log in." And I press "Continue" And I should see "Log in" diff --git a/lang/en/availability.php b/lang/en/availability.php index 0ec9ace35581d..f4ed7e4d2e0d9 100644 --- a/lang/en/availability.php +++ b/lang/en/availability.php @@ -27,7 +27,7 @@ $string['and'] = 'and'; $string['condition_group'] = 'Restriction set'; $string['condition_group_info'] = 'Add a set of nested restrictions to apply complex logic.'; -$string['enableavailability'] = 'Enable conditional access'; +$string['enableavailability'] = 'Enable restricted access'; $string['enableavailability_desc'] = 'When enabled, this lets you set conditions (based on date, grade, or completion) that control whether an activity or resource can be accessed.'; $string['error_list_nochildren'] = 'Restriction sets should contain at least one condition.'; $string['hidden_marker'] = '(hidden otherwise)'; diff --git a/lang/en/badges.php b/lang/en/badges.php index 83ab453684035..abf487a7990a2 100644 --- a/lang/en/badges.php +++ b/lang/en/badges.php @@ -106,7 +106,7 @@ You can still control individual badge privacy settings on your badges page.'; $string['badgeprivacysetting_str'] = 'Automatically show badges I earn on my profile page'; -$string['badgesalt'] = 'Salt for hashing the recepient\'s email address'; +$string['badgesalt'] = 'Salt for hashing the recipient\'s email address'; $string['badgesalt_desc'] = 'Using a hash allows backpack services to confirm the badge earner without having to expose their email address. This setting should only use numbers and letters. Note: For recipient verification purposes, please avoid changing this setting once you start issuing badges.'; diff --git a/lang/en/completion.php b/lang/en/completion.php index 52bbbe27dd1ab..a876d64aa57ae 100644 --- a/lang/en/completion.php +++ b/lang/en/completion.php @@ -41,7 +41,7 @@ $string['completedunlocked'] = 'Completion options unlocked'; $string['completedunlockedtext'] = 'When you save changes, completion state for all students will be erased. If you change your mind about this, do not save the form.'; $string['completedwarning'] = 'Completion options locked'; -$string['completedwarningtext'] = 'One or more students ({$a}) has already marked this activity as completed. Changing completion options will erase their completion state and may cause confusion. Thus the options have been locked and should not be unlocked unless absolutely necessary.'; +$string['completedwarningtext'] = 'This activity has already been marked as completed for {$a} participant(s). Changing completion options will erase their completion state and may cause confusion. Thus the options have been locked and should not be unlocked unless absolutely necessary.'; $string['completion'] = 'Completion tracking'; $string['completion-alt-auto-enabled'] = 'The system marks this item complete according to conditions: {$a}'; $string['completion-alt-auto-fail'] = 'Completed: {$a} (did not achieve pass grade)'; diff --git a/lang/en/enrol.php b/lang/en/enrol.php index ec115e262dcd0..018eb62d430dd 100644 --- a/lang/en/enrol.php +++ b/lang/en/enrol.php @@ -98,7 +98,7 @@ $string['nochange'] = 'No change'; $string['noexistingparticipants'] = 'No existing participants'; $string['nogroup'] = 'No group'; -$string['noguestaccess'] = 'Guests can not access this course, please try to log in.'; +$string['noguestaccess'] = 'Guests cannot access this course. Please log in.'; $string['none'] = 'None'; $string['notenrollable'] = 'You can not enrol yourself in this course.'; $string['notenrolledusers'] = 'Other users'; diff --git a/lang/en/error.php b/lang/en/error.php index dd5ace361c6d7..a5248d1d59eed 100644 --- a/lang/en/error.php +++ b/lang/en/error.php @@ -304,7 +304,7 @@ $string['invalidcoursemodule'] = 'Invalid course module ID'; $string['invalidcoursenameshort'] = 'Invalid short course name'; $string['invaliddata'] = 'Data submitted is invalid'; -$string['invaliddatarootpermissions'] = 'Invalid permissions detected in $CFG->dataroot directory, administrator has to fix permissions.'; +$string['invaliddatarootpermissions'] = 'Invalid permissions detected when trying to create a directory. Turn debugging on for further details.'; $string['invaliddevicetype'] = 'Invalid device type'; $string['invalidelementid'] = 'Incorrect element id!'; $string['invalidentry'] = 'This is not valid entry!'; @@ -388,7 +388,7 @@ $string['movecategorynotpossible'] = 'You cannot move category \'{$a}\' into the selected category.'; $string['movecategoryownparent'] = 'You cannot make category \'{$a}\' a parent of itself.'; $string['movecategoryparentconflict'] = 'You cannot make category \'{$a}\' a subcategory of one of its own subcategories.'; -$string['mssqlrcsmodemissing'] = 'The database is not using the expected READ_COMMITTED_SNAPSHOT mode which can lead to wrong results, especially under high concurrency scenarios. Please enable it for correct behaviour. You can find more information in the Moodle Docs.'; +$string['mssqlrcsmodemissing'] = 'The database is not using the expected READ_COMMITTED_SNAPSHOT mode which can lead to wrong results, especially under high concurrency scenarios. Please enable it for correct behaviour. For further information, see the documentation Installing MSSQL for PHP.'; $string['multiplerecordsfound'] = 'Multiple records found, only one record expected.'; $string['multiplerestorenotallow'] = 'Multiple restore execution not allowed!'; $string['mustbeloggedin'] = 'You must be logged in to do this'; diff --git a/lang/en/grades.php b/lang/en/grades.php index da10569b5c420..cfa4f89275b59 100644 --- a/lang/en/grades.php +++ b/lang/en/grades.php @@ -240,7 +240,9 @@ $string['gradebook'] = 'Gradebook'; $string['gradebookcalculationsuptodate'] = 'The calculations in the gradebook are up to date. You may need to reload this page to see changes.'; $string['gradebookcalculationsfixbutton'] = 'Accept grade changes and fix calculation errors'; -$string['gradebookcalculationswarning'] = 'Note: Some errors have been detected in calculating the grades displayed in the gradebook. It is recommended that the errors are fixed by clicking the button below, though this will result in some grades being changed. For details, see the changes between versions {$a->gradebookversion} and {$a->currentversion} in Gradebook calculation changes.'; +$string['gradebookcalculationswarning'] = 'Note: Some errors have been detected in calculating the grades displayed in the gradebook. If your course has not started or is in progress, it is recommended that the errors are fixed by clicking the button below, though this will result in some grades being changed. If your course has already ended and grades have been submitted, you probably do not want to fix this issue. + +The newer version is {$a->currentversion}; you are using gradebook version {$a->gradebookversion}. You can see a list of changes in Gradebook calculation changes.'; $string['gradebookhiddenerror'] = 'The gradebook is currently set to hide everything from students.'; $string['gradebookhistories'] = 'Grade histories'; $string['gradebooksetup'] = 'Gradebook setup'; diff --git a/lang/en/moodle.php b/lang/en/moodle.php index c94582221aaba..a629a96646ce3 100644 --- a/lang/en/moodle.php +++ b/lang/en/moodle.php @@ -1002,7 +1002,7 @@ $string['instudentview'] = 'in student view'; $string['interests'] = 'Interests'; $string['interestslist'] = 'List of interests'; -$string['interestslist_help'] = 'Enter your interests. Your interests will be displayed on your profile page as tags.'; +$string['interestslist_help'] = 'Enter your interests, one by one, which will then be displayed on your profile page as tags.'; $string['invalidemail'] = 'Invalid email address'; $string['invalidlogin'] = 'Invalid login, please try again'; $string['invalidusername'] = 'The username can only contain alphanumeric lowercase characters, underscore (_), hyphen (-), period (.) or at symbol (@)'; diff --git a/lang/en/plugin.php b/lang/en/plugin.php index fc551009c388a..58255981cd4b6 100644 --- a/lang/en/plugin.php +++ b/lang/en/plugin.php @@ -30,7 +30,7 @@ $string['cancelinstallall'] = 'Cancel new installations ({$a})'; $string['cancelinstallone'] = 'Cancel this installation'; $string['cancelinstallhead'] = 'Cancelling installation of plugins'; -$string['cancelinstallinfo'] = 'Following plugins are not fully installed yet and their installation can be cancelled. To do so, the plugin folder must be removed from your server now. Make sure that is really what you want to prevent accidental data loss (such as your own code modifications).'; +$string['cancelinstallinfo'] = 'The following plugins are not fully installed yet so their installation may be cancelled. To do so, the plugin folder must be removed from the server now. Make sure this is really what you want to prevent accidental data loss (such as your own code modifications).'; $string['cancelinstallinfodir'] = 'Folder to be deleted: {$a}'; $string['cancelupgradeall'] = 'Cancel upgrades ({$a})'; $string['cancelupgradehead'] = 'Restoring previous version of plugins'; @@ -67,7 +67,7 @@ $string['notdownloadable_help'] = 'ZIP package with the update can not be downloaded automatically. Please refer to the documentation page for more help.'; $string['notdownloadable_link'] = 'admin/mdeploy/notdownloadable'; $string['notwritable'] = 'Plugin files not writable'; -$string['notwritable_help'] = 'Plugin files are not writable by the web server. The web server process has to have write access to the plugin folder and all its contents. Write access to the root folder of the given plugin type may be required, too.'; +$string['notwritable_help'] = 'Plugin files are not writable by the web server. The web server process must have write access to the plugin folder and all its contents. Write access to the root folder of the given plugin type may also be required.'; $string['otherplugin'] = '{$a->component}'; $string['otherpluginversion'] = '{$a->component} ({$a->version})'; $string['overviewall'] = 'All plugins'; diff --git a/lang/en/webservice.php b/lang/en/webservice.php index 82d75886c1f41..092ca07ae3a3d 100644 --- a/lang/en/webservice.php +++ b/lang/en/webservice.php @@ -117,7 +117,7 @@ $string['iprestriction_help'] = 'The user will need to call the web service from the listed IPs (separated by commas).'; $string['key'] = 'Key'; $string['keyshelp'] = 'The keys are used to access your Moodle account from external applications.'; -$string['loginrequired'] = 'Restricted to logged in users'; +$string['loginrequired'] = 'Restricted to logged-in users'; $string['manageprotocols'] = 'Manage protocols'; $string['managetokens'] = 'Manage tokens'; $string['missingcaps'] = 'Missing capabilities'; diff --git a/lib/editor/atto/plugins/table/lang/en/atto_table.php b/lib/editor/atto/plugins/table/lang/en/atto_table.php index be079497e0405..3a8abc3573f5c 100644 --- a/lib/editor/atto/plugins/table/lang/en/atto_table.php +++ b/lib/editor/atto/plugins/table/lang/en/atto_table.php @@ -28,13 +28,13 @@ $string['allowbackgroundcolour'] = 'Allow background colour'; $string['allowbackgroundcolour_desc'] = 'Allow users to set the background colour for the table'; $string['allowborder'] = 'Allow borders'; -$string['allowborder_desc'] = 'If checked, users will be able to customize borders when creating and editing a table'; +$string['allowborder_desc'] = 'If enabled, table and cell borders can be customised. The default border is a solid, 1px, black line.'; $string['allowborderstyle'] = 'Allow border styling'; -$string['allowborderstyle_desc'] = 'Allow users to style borders on tables. If this is not checked, but allowborder is checked, the default style is solid.
NOTE that this setting will not have an impact unless allowborder is checked'; +$string['allowborderstyle_desc'] = 'This setting has no effect unless \'Allow borders\' is enabled.'; $string['allowbordersize'] = 'Allow border size control'; -$string['allowbordersize_desc'] = 'Allow users to set the size of borders on tables. If this is not checked, but allowborder is checked, the default size is 1px.
NOTE that this setting will not have an impact unless allowborder is checked'; +$string['allowbordersize_desc'] = 'This setting has no effect unless \'Allow borders\' is enabled.'; $string['allowbordercolour'] = 'Allow border colour'; -$string['allowbordercolour_desc'] = 'Allow users to set the colour of the borders on tables. If this is not checked, but allowborder is checked, the default colour is black.
NOTE that this setting will not have an impact unless allowborder is checked'; +$string['allowbordercolour_desc'] = 'This setting has no effect unless \'Allow borders\' is enabled.'; $string['allowwidth'] = 'Allow width'; $string['allowwidth_desc'] = 'Allow users to set the width of the tables.'; $string['appearance'] = 'Appearance'; diff --git a/mod/data/lang/en/data.php b/mod/data/lang/en/data.php index 76406e7bac73b..0d01c13b82aac 100644 --- a/mod/data/lang/en/data.php +++ b/mod/data/lang/en/data.php @@ -208,7 +208,7 @@ $string['jstemplate'] = 'Javascript template'; $string['latitude'] = 'Latitude'; $string['latlong'] = 'Latitude/longitude'; -$string['latlongboth'] = 'Both the Latitude and the Longitude must be filled in.'; +$string['latlongboth'] = 'Both latitude and longitude are required.'; $string['latlongdownloadallhint'] = 'Download link for all entries as KML'; $string['latlongkmllabelling'] = 'How to label items in KML files (Google Earth)'; $string['latlonglinkservicesdisplayed'] = 'Link-out services to display'; @@ -217,7 +217,7 @@ $string['listtemplate'] = 'List template'; $string['longitude'] = 'Longitude'; $string['manageapproved'] = 'Allow editing of approved entries'; -$string['manageapproved_help'] = 'If disabled, approved entries are not editable and deletable by its owner. This setting only takes effect if approval required is set to yes. Default is yes.'; +$string['manageapproved_help'] = 'If disabled, approved entries are no longer editable or deletable by the user who added them. This setting has no effect unless \'Approval required\' is enabled.'; $string['mapexistingfield'] = 'Map to {$a}'; $string['mapnewfield'] = 'Create a new field'; $string['mappingwarning'] = 'All old fields not mapped to a new field will be lost and all data in that field will be removed.'; diff --git a/question/type/ddimageortext/lang/en/qtype_ddimageortext.php b/question/type/ddimageortext/lang/en/qtype_ddimageortext.php index 72547ba3b99f3..62253ac951b80 100644 --- a/question/type/ddimageortext/lang/en/qtype_ddimageortext.php +++ b/question/type/ddimageortext/lang/en/qtype_ddimageortext.php @@ -36,30 +36,30 @@ $string['dropbackground'] = 'Background image for dragging markers onto'; $string['dropzone'] = 'Drop zone {$a}'; $string['dropzoneheader'] = 'Drop zones'; -$string['formerror_disallowedtags'] = 'You have used html tags here that are not allowed in a draggable text drag item type.'; -$string['formerror_noallowedtags'] = 'No html tags are allowed in this text which is the alt text for a draggable image'; -$string['formerror_noytop'] = 'You must provide a value for the y coords for the top left corner of this drop area. You can drag and drop the drop area above to set the coordinates or enter them manually here.'; -$string['formerror_noxleft'] = 'You must provide a value for the x coords for the top left corner of this drop area. You can drag and drop the drop area above to set the coordinates or enter them manually here.'; +$string['formerror_disallowedtags'] = 'Sorry, HTML tags are not allowed in draggable text.'; +$string['formerror_noallowedtags'] = 'HTML tags are not allowed in this text which is the alt text for a draggable image.'; +$string['formerror_noytop'] = 'You must provide a value for the y coordinate for the top left corner of this drop area. You can drag and drop the drop area above to set the coordinates or enter them manually here.'; +$string['formerror_noxleft'] = 'You must provide a value for the x coordinate for the top left corner of this drop area. You can drag and drop the drop area above to set the coordinates or enter them manually here.'; $string['formerror_nofile'] = 'You need to upload or select a file to use here.'; -$string['formerror_nofile3'] = 'You need to select an image file here, or delete the associated label and uncheck the infinite checkbox.'; -$string['formerror_notintytop'] = 'The y coords must be an integer.'; -$string['formerror_notintxleft'] = 'The x coords must be an integer.'; -$string['formerror_multipledraginstance'] = 'You have selected this image {$a} more than once as the correct choice for a drop zone but it is not marked as being an infinite drag item.'; -$string['formerror_multipledraginstance2'] = 'You have selected this image more than once as the correct choice for a drop zone but it is not marked as being an infinite drag item.'; +$string['formerror_nofile3'] = 'You need to select an image file here, or delete the associated label and uncheck the unlimited checkbox.'; +$string['formerror_notintytop'] = 'The y coordinate must be an integer.'; +$string['formerror_notintxleft'] = 'The x coordinate must be an integer.'; +$string['formerror_multipledraginstance'] = 'You have selected this image {$a} more than once as the correct choice for a drop zone but it is not marked as being an unlimited drag item.'; +$string['formerror_multipledraginstance2'] = 'You have selected this image more than once as the correct choice for a drop zone but it is not marked as being an unlimited drag item.'; $string['formerror_noimageselected'] = 'You need to select a drag item to be the correct choice for this drop zone.'; $string['formerror_nobgimage'] = 'You need to select an image to use as the background for the drag and drop area.'; -$string['infinite'] = 'Infinite'; +$string['infinite'] = 'Unlimited'; $string['label'] = 'Text'; $string['nolabel'] = 'No label text'; -$string['pleasedraganimagetoeachdropregion'] = 'Your answer is not complete, please drag an item to each drop region.'; +$string['pleasedraganimagetoeachdropregion'] = 'Your answer is not complete; please drag an item to each drop region.'; $string['pluginname'] = 'Drag and drop onto image'; -$string['pluginname_help'] = 'Select a background image file, select draggable images or enter text and define the drop zones on the background image to which they must be dragged.'; +$string['pluginname_help'] = 'Drag and drop onto image questions require the respondent to drag images or text labels and drop them into defined drop zones on a background image. Draggable items may be grouped so that all items in a particular group are coloured the same as the drop zones. Draggable items marked as unlimited may be dropped into more than one zone.'; $string['pluginname_link'] = 'question/type/ddimageortext'; $string['pluginnameadding'] = 'Adding drag and drop onto image'; $string['pluginnameediting'] = 'Editing drag and drop onto image'; $string['pluginnamesummary'] = 'Images or text labels are dragged and dropped into drop zones on a background image.'; $string['previewareaheader'] = 'Preview'; -$string['previewareamessage'] = 'Select a background image file and select draggable images or just enter text that will be made draggable. Then choose a drag item for each \'drop zone\', and drag the drag item to where the student should drag it to.'; +$string['previewareamessage'] = 'Select a background image, specify draggable items and define drop zones on the background image into which they must be dragged.'; $string['refresh'] = 'Refresh preview'; $string['shuffleimages'] = 'Shuffle drag items each time question is attempted'; $string['summarisechoice'] = '{$a->no}. {$a->text}'; diff --git a/question/type/ddmarker/lang/en/qtype_ddmarker.php b/question/type/ddmarker/lang/en/qtype_ddmarker.php index 2d5ae24bdc846..3c80d54f5b224 100644 --- a/question/type/ddmarker/lang/en/qtype_ddmarker.php +++ b/question/type/ddmarker/lang/en/qtype_ddmarker.php @@ -25,7 +25,7 @@ $string['alttext'] = 'Alt text'; $string['answer'] = 'Answer'; $string['bgimage'] = 'Background image'; -$string['coords'] = 'Coords'; +$string['coords'] = 'Coordinates'; $string['correctansweris'] = 'The correct answer is: {$a}'; $string['draggableimage'] = 'Draggable image'; $string['draggableitem'] = 'Draggable item'; @@ -36,7 +36,7 @@ $string['dropzone'] = 'Drop zone {$a}'; $string['dropzoneheader'] = 'Drop zones'; $string['dropzones'] = 'Drop zones'; -$string['dropzones_help'] = 'The drop zones are defined by typing co-ordinates. As you type, the preview above is immediately updated, so you can position things by trial and error. +$string['dropzones_help'] = 'The drop zones are defined by typing coordinates. As you type, the preview above is immediately updated, so you can position things by trial and improvement. * Circle: centre_x, centre_y; radius
for example: 80, 100; 50 * Polygon: x1, y1; x2, y2; ...; xn, yn
for example: 20, 60; 100, 60; 20, 100 @@ -44,25 +44,25 @@ $string['followingarewrong'] = 'The following markers have been placed in the wrong area : {$a}.'; $string['followingarewrongandhighlighted'] = 'The following markers were incorrectly placed : {$a}. Highlighted marker(s) are now shown with the correct placement(s).
Click on the marker to highlight the allowed area.'; $string['formerror_nobgimage'] = 'You need to select an image to use as the background for the drag and drop area.'; -$string['formerror_noitemselected'] = 'You have specified a drop zone but not chosen a marker that must be dragged to the zone'; +$string['formerror_noitemselected'] = 'You have specified a drop zone but not chosen a marker that must be dragged to the zone.'; $string['formerror_nosemicolons'] = 'There are no semicolons in your coordinates string. Your coordinates for a {$a->shape} should be expressed as - {$a->coordsstring}.'; -$string['formerror_onlysometagsallowed'] = 'Only "{$a}" tags are allowed in the label for a marker'; -$string['formerror_onlyusewholepositivenumbers'] = 'Please use only whole positive numbers to specify x,y coords and/or width and height of shapes. Your coordinates for a {$a->shape} should be expressed as - {$a->coordsstring}.'; +$string['formerror_onlysometagsallowed'] = 'Only "{$a}" tags are allowed in the label for a marker.'; +$string['formerror_onlyusewholepositivenumbers'] = 'Please use only whole positive numbers to specify x,y coordinates and/or width and height of shapes. Your coordinates for a {$a->shape} should be expressed as - {$a->coordsstring}.'; $string['formerror_polygonmusthaveatleastthreepoints'] = 'For a polygon shape you need to specify at least 3 points. Your coordinates for a {$a->shape} should be expressed as - {$a->coordsstring}.'; -$string['formerror_repeatedpoint'] = 'You have given the same point twice. Please remove the duplication. Your coordinates for a {$a->shape} should be expressed as - {$a->coordsstring}.'; -$string['formerror_shapeoutsideboundsofbgimage'] = 'The shape you have defined goes out of the bounds of the background image'; -$string['formerror_toomanysemicolons'] = 'There are too many semi colon separated parts to the coordinates you have specified. Your coordinates for a {$a->shape} should be expressed as - {$a->coordsstring}.'; -$string['formerror_unrecognisedwidthheightpart'] = 'We do not recognise the width and height you have specified. Your coordinates for a {$a->shape} should be expressed as - {$a->coordsstring}.'; -$string['formerror_unrecognisedxypart'] = 'We do not recognise the x,y coordinates you have specified. Your coordinates for a {$a->shape} should be expressed as - {$a->coordsstring}.'; +$string['formerror_repeatedpoint'] = 'You have entered the same coordinates twice. Each point must be unique. Your coordinates for a {$a->shape} should be expressed as - {$a->coordsstring}.'; +$string['formerror_shapeoutsideboundsofbgimage'] = 'The shape you have defined goes out of the bounds of the background image.'; +$string['formerror_toomanysemicolons'] = 'There are too many semicolon-separated parts to the coordinates you have specified. Your coordinates for a {$a->shape} should be expressed as - {$a->coordsstring}.'; +$string['formerror_unrecognisedwidthheightpart'] = 'The width and height that you have specified are unrecognisable. Your coordinates for a {$a->shape} should be expressed as - {$a->coordsstring}.'; +$string['formerror_unrecognisedxypart'] = 'The x,y coordinates that you have specified are unrecognisable. Your coordinates for a {$a->shape} should be expressed as - {$a->coordsstring}.'; $string['infinite'] = 'Infinite'; $string['marker'] = 'Marker'; $string['marker_n'] = 'Marker {no}'; $string['markers'] = 'Markers'; $string['nolabel'] = 'No label text'; $string['noofdrags'] = 'Number'; -$string['pleasedragatleastonemarker'] = 'Your answer is not complete, you must place at least one marker on the image.'; +$string['pleasedragatleastonemarker'] = 'Your answer is not complete; you must place at least one marker on the image.'; $string['pluginname'] = 'Drag and drop markers'; -$string['pluginname_help'] = 'select a background image file, enter text labels for markers and define the drop zones on the background image to which they must be dragged.'; +$string['pluginname_help'] = 'Drag and drop markers require the respondent to drag text labels and drop them into defined drop zones on a background image.'; $string['pluginname_link'] = 'question/type/ddmarker'; $string['pluginnameadding'] = 'Adding drag and drop markers'; $string['pluginnameediting'] = 'Editing drag and drop markers'; @@ -74,13 +74,13 @@ $string['shape'] = 'Shape'; $string['shape_circle'] = 'Circle'; $string['shape_circle_lowercase'] = 'circle'; -$string['shape_circle_coords'] = 'x,y;r (where x,y are the xy coordinates of the centre of the circle and r is the radius)'; +$string['shape_circle_coords'] = 'x,y;r (where x,y are the coordinates of the centre of the circle and r is the radius)'; $string['shape_rectangle'] = 'Rectangle'; $string['shape_rectangle_lowercase'] = 'rectangle'; -$string['shape_rectangle_coords'] = 'x,y;w,h (where x,y are the xy coordinates of the top left corner of the rectangle and w and h are the width and height of the rectangle)'; +$string['shape_rectangle_coords'] = 'x,y;w,h (where x,y are the coordinates of the top left corner of the rectangle and w and h are the width and height of the rectangle)'; $string['shape_polygon'] = 'Polygon'; $string['shape_polygon_lowercase'] = 'polygon'; -$string['shape_polygon_coords'] = 'x1,y1;x2,y2;x3,y3;x4,y4....(where x1, y1 are the x,y coordinates of the first vertex, x2, y2 are the x,y coordinates of the second, etc. You do not need to repeat the coordinates for the first vertex to close the polygon)'; +$string['shape_polygon_coords'] = 'x1,y1;x2,y2;x3,y3;x4,y4... (where x1, y1 are the coordinates of the first vertex, x2, y2 are the coordinates of the second etc. There is no need to repeat the coordinates for the first vertex to close the polygon.)'; $string['showmisplaced'] = 'Highlight drop zones which have not had the correct marker dropped on them'; $string['shuffleimages'] = 'Shuffle drag items each time question is attempted'; $string['stateincorrectlyplaced'] = 'State which markers are incorrectly placed'; diff --git a/question/type/ddmarker/tests/behat/add.feature b/question/type/ddmarker/tests/behat/add.feature index 60a3337b698de..00b1fd8e66de4 100644 --- a/question/type/ddmarker/tests/behat/add.feature +++ b/question/type/ddmarker/tests/behat/add.feature @@ -51,7 +51,7 @@ Feature: Test creating a drag and drop markers question # Try to submit without setting the last marker. And I press "id_submitbutton" - Then I should see "You have specified a drop zone but not chosen a marker that must be dragged to the zone" + Then I should see "You have specified a drop zone but not chosen a marker that must be dragged to the zone." # Set the last marker and submit again. And I set the field "id_drops_3_choice" to "2" diff --git a/question/type/ddwtos/lang/en/qtype_ddwtos.php b/question/type/ddwtos/lang/en/qtype_ddwtos.php index c8c764a4e2a63..3ba6656c0f49a 100644 --- a/question/type/ddwtos/lang/en/qtype_ddwtos.php +++ b/question/type/ddwtos/lang/en/qtype_ddwtos.php @@ -25,11 +25,11 @@ $string['addmorechoiceblanks'] = 'Blanks for {no} more choices'; $string['answer'] = 'Answer'; $string['correctansweris'] = 'The correct answer is: {$a}'; -$string['infinite'] = 'Infinite'; +$string['infinite'] = 'Unlimited'; $string['pleaseputananswerineachbox'] = 'Please put an answer in each box.'; $string['pluginname'] = 'Drag and drop into text'; -$string['pluginname_help'] = 'Type in some question text like "The [[1]] jumped over the [[2]]", then enter the possible words to go in gaps 1 and 2 underneath.'; +$string['pluginname_help'] = 'Drag and drop into text questions require the respondent to drag words or phrases into the correct gaps in the question text. [[1]], [[2]], [[3]], ... are used as placeholders in the question text, with the correct answers specified as choice answers 1, 2, 3, ... respectively. Choice answers may be grouped so that all answers in a particular group are coloured the same as the gaps for them in the question text. Choice answers marked as unlimited may be used in more than one gap.'; $string['pluginname_link'] = 'question/type/ddwtos'; $string['pluginnameadding'] = 'Adding a drag and drop into text'; $string['pluginnameediting'] = 'Editing a drag and drop into text'; -$string['pluginnamesummary'] = 'Missing words in some text are filled in using drag-and-drop.'; +$string['pluginnamesummary'] = 'Missing words in the question text are filled in using drag and drop.'; diff --git a/question/type/gapselect/lang/en/qtype_gapselect.php b/question/type/gapselect/lang/en/qtype_gapselect.php index cd5ca24ece536..6ec72e912e7c2 100644 --- a/question/type/gapselect/lang/en/qtype_gapselect.php +++ b/question/type/gapselect/lang/en/qtype_gapselect.php @@ -29,18 +29,18 @@ $string['combinedcontrolnamegapselect'] = 'drop down box'; $string['combinedcontrolnamegapselectplural'] = 'drop down boxes'; $string['correctansweris'] = 'The correct answer is: {$a}'; -$string['errorblankchoice'] = 'Please check the Choices: Choice {$a} is empty.'; -$string['errormissingchoice'] = 'Please check the Question text: {$a} was not found in Choices! Only the choice numbers that exist in choices are allowed to be used a place holders.'; +$string['errorblankchoice'] = 'Please check the choices: Choice {$a} is empty.'; +$string['errormissingchoice'] = 'Please check the question text: {$a} was not found in the choices! Only numbers with choice answers specified are allowed to be used as place holders.'; $string['errornoslots'] = 'The question text must contain placeholders like [[1]] to show where the missing words go.'; $string['errorquestiontextblank'] = 'You must enter some question text.'; $string['group'] = 'Group'; $string['pleaseputananswerineachbox'] = 'Please put an answer in each box.'; $string['pluginname'] = 'Select missing words'; -$string['pluginname_help'] = 'Type in some question text like "The [[1]] jumped over the [[2]]", then enter the possible words to go in gaps 1 and 2 underneath.'; +$string['pluginname_help'] = 'Select missing words questions require the respondent to select correct answers from dropdown menus. [[1]], [[2]], [[3]], ... are used as placeholders in the question text, with the correct answers specified as choice answers 1, 2, 3, ... respectively. Extra choice answers may be added to make the question harder. Choice answers may be grouped to restrict answers available in each dropdown menu.'; $string['pluginname_link'] = 'question/type/gapselect'; $string['pluginnameadding'] = 'Adding a select missing words question'; $string['pluginnameediting'] = 'Editing a select missing words question'; -$string['pluginnamesummary'] = 'Missing words in some text are filled in using dropdown menus.'; +$string['pluginnamesummary'] = 'Missing words in the question text are filled in using dropdown menus.'; $string['shuffle'] = 'Shuffle'; $string['tagsnotallowed'] = '{$a->tag} is not allowed. (Only {$a->allowed} are permitted.)'; $string['tagsnotallowedatall'] = '{$a->tag} is not allowed. (No HTML is allowed here.)';