diff --git a/admin/tool/multilangupgrade/lang/en/tool_multilangupgrade.php b/admin/tool/multilangupgrade/lang/en/tool_multilangupgrade.php
index f874a46093be3..62a4426dae9d9 100644
--- a/admin/tool/multilangupgrade/lang/en/tool_multilangupgrade.php
+++ b/admin/tool/multilangupgrade/lang/en/tool_multilangupgrade.php
@@ -23,5 +23,7 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-$string['multilangupgradeinfo'] = 'The multilang filter syntax was changed in 1.8, <lang> tag is not supported any more.
Example: <span lang="en" class="multilang">Hello!</span><span lang="es" class="multilang">Hola!</span>
Do you want to upgrade the syntax in all existing texts now?';
+$string['multilangupgradeinfo'] = '
The multilang filter syntax was changed in 1.8 and so the <lang> tag is not supported any more.
+Example: <span lang="en" class="multilang">Hello!</span><span lang="es" class="multilang">Hola!</span>
+Do you want to upgrade the syntax in all existing texts now?
'; $string['pluginname'] = 'Multilang upgrade'; diff --git a/admin/tool/spamcleaner/lang/en/tool_spamcleaner.php b/admin/tool/spamcleaner/lang/en/tool_spamcleaner.php index df6b4a338b00f..d9f591874d97a 100644 --- a/admin/tool/spamcleaner/lang/en/tool_spamcleaner.php +++ b/admin/tool/spamcleaner/lang/en/tool_spamcleaner.php @@ -27,7 +27,8 @@ $string['spamauto'] = 'Autodetect common spam patterns'; $string['spamcannotdelete'] = 'Cannot delete this user'; $string['spamcannotfinduser'] = 'No users matching your search'; -$string['spamcleanerintro'] = 'This script allows you to search all user profiles for certain strings and then delete those accounts which are obviously created by spammers. You can search for multiple keywords using commas (eg casino, porn)This script allows you to search all user profiles for certain strings and then delete those accounts which are obviously created by spammers. You can search for multiple keywords using commas (e.g. casino, porn).
+For further information, see the documentation Reducing spam in Moodle.
'; $string['spamdeleteall'] = 'Delete all these user accounts'; $string['spamdeleteallconfirm'] = 'Are you sure you want to delete all these user accounts? You can not undo this.'; $string['spamdeleteconfirm'] = 'Are you sure you want to delete this entry? You can not undo this.'; diff --git a/admin/tool/xmldb/lang/en/tool_xmldb.php b/admin/tool/xmldb/lang/en/tool_xmldb.php index f89293fbc2349..638941f2586c2 100644 --- a/admin/tool/xmldb/lang/en/tool_xmldb.php +++ b/admin/tool/xmldb/lang/en/tool_xmldb.php @@ -210,7 +210,11 @@ $string['wrongnumberofreffields'] = 'Wrong number of reference fields'; $string['wrongreservedwords'] = 'Currently used reserved wordsSome missing indexes have been found in your DB. Here are their details and the needed SQL statements to be executed with your favourite SQL interface to create all of them. Remember to backup your data first!
+After doing that, it\'s highly recommended to execute this utility again to check that no more missing indexes are found.
'; +$string['yeswrongdefaultsfound'] = 'Some inconsistent defaults have been found in your DB. Here are their details and the needed SQL statements to be executed with your favourite SQL interface to fix them all. Remember to backup your data first!
+After doing that, it\'s highly recommended to execute this utility again to check that no more inconsistent defaults are found.
'; +$string['yeswrongintsfound'] = 'Some wrong integers have been found in your DB. Here are their details and the needed SQL statements to be executed with your favourite SQL interface to create all them. Remember to backup your data first!
+After doing that, it\'s highly recommended to execute this utility again to check that no more wrong integers are found.
'; +$string['yeswrongoraclesemanticsfound'] = 'Some Oracle columns using BYTE semantics have been found in your DB. Here are their details and the needed SQL statements to be executed with your favourite SQL interface to create all them. Remember to backup your data first!
+After doing that, it\'s highly recommended to execute this utility again to check that no more wrong semantics are found.
'; diff --git a/blocks/settings/lang/en/block_settings.php b/blocks/settings/lang/en/block_settings.php index fd3f2b35eda1f..7442de8461119 100644 --- a/blocks/settings/lang/en/block_settings.php +++ b/blocks/settings/lang/en/block_settings.php @@ -27,4 +27,4 @@ $string['enabledock'] = 'Allow the user to dock this block'; $string['pluginname'] = 'Administration'; $string['settings:addinstance'] = 'Add a new administration block'; -$string['settings:myaddinstance'] = 'Add a new settings block to My home'; +$string['settings:myaddinstance'] = 'Add a new administration block to My home'; diff --git a/lang/en/admin.php b/lang/en/admin.php index 7006d1a930c84..3798b26dcafd2 100644 --- a/lang/en/admin.php +++ b/lang/en/admin.php @@ -89,7 +89,7 @@ $string['bookmarkadded'] = 'Bookmark added.'; $string['bookmarkalreadyexists'] = 'You have already bookmarked this page.'; $string['bookmarkdeleted'] = 'Bookmark deleted.'; -$string['bookmarkthispage'] = 'bookmark this page'; +$string['bookmarkthispage'] = 'Bookmark this page'; $string['cachejs'] = 'Cache Javascript'; $string['cachejs_help'] = 'Javascript caching and compression greatly improves page loading performance. it is strongly recommended for production sites. Developers will probably want to disable this feature.'; $string['cachetext'] = 'Text cache lifetime'; @@ -231,7 +231,7 @@ $string['configfullnamedisplay'] = 'This defines how names are shown when they are displayed in full. The default value, "language", leaves it to the string "fullnamedisplay" in the current language pack to decide. Some languages have different name display conventions. For most mono-lingual sites the most efficient setting is "firstname lastname", but you may choose to hide surnames altogether. Placeholders that can be used are: firstname, lastname, firstnamephonetic, lastnamephonetic, middlename, and alternatename.'; -$string['configgeoipfile'] = 'Location of GeoIP City binary data file. This file is not part of Moodle distribution and must be obtained separately from MaxMind. You can either buy a commercial version or use the free version.Your Moodle files have been changed, and you are about to automatically upgrade your server to this version:
+{$a}
+Once you do this you can not go back again. Please note that this process can take a long time.
+Are you sure you want to upgrade this server to this version?
'; $string['upgradetimedout'] = 'Upgrade timed out, please restart the upgrade.'; $string['upgrade197notice'] = 'Moodle 1.9.7 contains a number of security fixes to user passwords and backups to protect the user data on your site. As a result some of your settings and permissions relating to backups may have changed.
See the Moodle 1.9.7 release notes for full details.
You have been awarded a badge "%badgename%"!
+$string['messagebody'] = 'You have been awarded the badge "%badgename%"!
More information about this badge can be found at %badgelink%.
-If there is no badge attached to this email, you can manage and download it from {$a} page.
'; +You can manage and download the badge from {$a}.
'; $string['messagesubject'] = 'Congratulations! You just earned a badge!'; $string['method'] = 'This criterion is complete when...'; $string['mingrade'] = 'Minimum grade required'; diff --git a/lang/en/completion.php b/lang/en/completion.php index a6b1f3c634aeb..fc9bc9e66d8af 100644 --- a/lang/en/completion.php +++ b/lang/en/completion.php @@ -124,7 +124,7 @@ $string['err_nograde'] = 'A course pass grade has not been set for this course. To enable this criteria type you must create a pass grade for this course.'; $string['err_noroles'] = 'There are no roles with the capability moodle/course:markcomplete in this course.'; $string['err_nousers'] = 'There are no students on this course or group for whom completion information is displayed. (By default, completion information is displayed only for students, so if there are no students, you will see this error. Administrators can alter this option via the admin screens.)'; -$string['err_settingslocked'] = 'One or more students have already completed a criteria so the settings have been locked. Unlocking the completion criteria settings will delete any existing user data and may cause confusion.'; +$string['err_settingslocked'] = 'One or more students have already completed a criterion so the settings have been locked. Unlocking the completion criteria settings will delete any existing user data and may cause confusion.'; $string['err_system'] = 'An internal error occurred in the completion system. (System administrators can enable debugging information to see more detail.)'; $string['eventcoursecompleted'] = 'Course completed'; $string['eventcoursecompletionupdated'] = 'Course completion updated'; diff --git a/lang/en/error.php b/lang/en/error.php index 2739a36d9dbd8..b5c1c3c7fb0bd 100644 --- a/lang/en/error.php +++ b/lang/en/error.php @@ -194,8 +194,8 @@ $string['dbdriverproblem'] = 'Error: database driver problem detected
The site administrator should verify server configuration
{$a}
'; $string['dbsessionbroken'] = 'Serious database session problem detected.The download of the component to your server failed. Please verify proxy settings; the PHP cURL extension is highly recommended.
+You must download the {$a->url} file manually, copy it to "{$a->dest}" in your server and unzip it there.
'; $string['remotedownloadnotallowed'] = 'Download of components to your server isn\'t allowed (allow_url_fopen is disabled).Sorry, but your IP number seems to have changed from when you first logged in. This security feature prevents crackers stealing your identity while logged in to this site. You may see this error if you use wireless networks or if you are roaming between different networks. Please ask the site administrator for more help.
+If you want to continue please press F5 key to refresh this page.
'; $string['shortnametaken'] = 'Short name is already used for another course ({$a})'; $string['scheduledbackupsdisabled'] = 'Scheduled backups have been disabled by the server admin'; $string['socksnotsupported'] = 'SOCKS5 proxy is not supported in PHP4'; diff --git a/lang/en/grading.php b/lang/en/grading.php index 3be622d1972b3..589efa53338be 100644 --- a/lang/en/grading.php +++ b/lang/en/grading.php @@ -61,10 +61,10 @@ $string['searchtemplate'] = 'Grading forms search'; $string['searchtemplate_help'] = 'You can search for a grading form and use it as a template for the new grading form here. Simply type words that should appear somewhere in the form name, its description or the form body itself. To search for a phrase, wrap the whole query in double quotes. -By default, only the grading forms that have been saved as shared templates are included in the search results. You can also include all your own grading forms in the search results. This way, you can simply re-use your grading forms without sharing them. Only forms marked as \'Ready for usage\' can be re-used this way.'; +By default, only the grading forms that have been saved as shared templates are included in the search results. You can also include all your own grading forms in the search results. This way, you can simply re-use your grading forms without sharing them. Only forms marked as \'Ready for use\' can be re-used this way.'; $string['searchownforms'] = 'include my own forms'; $string['statusdraft'] = 'Draft'; -$string['statusready'] = 'Ready for usage'; +$string['statusready'] = 'Ready for use'; $string['templatedelete'] = 'Delete'; $string['templatedeleteconfirm'] = 'You are going to delete the shared template \'{$a}\'. Deleting a template does not affect existing forms that were created from it.'; $string['templateedit'] = 'Edit'; diff --git a/lang/en/group.php b/lang/en/group.php index beaab45a580c5..715634ef92084 100644 --- a/lang/en/group.php +++ b/lang/en/group.php @@ -58,7 +58,9 @@ $string['editgroupingsettings'] = 'Edit grouping settings'; $string['editgroupsettings'] = 'Edit group settings'; $string['enrolmentkey'] = 'Enrolment key'; -$string['enrolmentkey_help'] = 'An enrolment key enables access to the course to be restricted to only those who know the key. If a group enrolment key is specified, then not only will entering that key let the user into the course, but it will also automatically make them a member of this group.'; +$string['enrolmentkey_help'] = 'An enrolment key enables access to the course to be restricted to only those who know the key. If a group enrolment key is specified, then not only will entering that key let the user into the course, but it will also automatically make them a member of this group. + +Note: Group enrolment keys must be enabled in the self enrolment settings and an enrolment key for the course must also be specified.'; $string['erroraddremoveuser'] = 'Error adding/removing user {$a} to group'; $string['erroreditgroup'] = 'Error creating/updating group {$a}'; $string['erroreditgrouping'] = 'Error creating/updating grouping {$a}'; diff --git a/lang/en/moodle.php b/lang/en/moodle.php index 0f537a466c501..da2502e370e59 100644 --- a/lang/en/moodle.php +++ b/lang/en/moodle.php @@ -1573,7 +1573,12 @@ $string['searchbyemail'] = 'Search by email address'; $string['searchbyusername'] = 'Search by username'; $string['searchcourses'] = 'Search courses'; -$string['searchhelp'] = 'You can search for multiple words at once.You can search for multiple words at once and can refine your search as follows:
+Are you absolutely sure you want to delete the following questions?
+{$a}
'; $string['deletingbehaviour'] = 'Deleting question behaviour \'{$a}\''; $string['deletingqtype'] = 'Deleting question type \'{$a}\''; $string['didnotmatchanyanswer'] = '[Did not match any answer]'; diff --git a/lang/en/role.php b/lang/en/role.php index dcbb81b5da283..b089dfa08a86e 100644 --- a/lang/en/role.php +++ b/lang/en/role.php @@ -124,7 +124,7 @@ $string['course:bulkmessaging'] = 'Send a message to many people'; $string['course:create'] = 'Create courses'; $string['course:delete'] = 'Delete courses'; -$string['course:viewsuspendedusers'] = 'Can view suspended users.'; +$string['course:viewsuspendedusers'] = 'View suspended users'; $string['course:changecategory'] = 'Change course category'; $string['course:changefullname'] = 'Change course full name'; $string['course:changeidnumber'] = 'Change course ID number'; @@ -394,8 +394,8 @@ $string['user:manageownblocks'] = 'Manage blocks on own public user profile'; $string['user:manageownfiles'] = 'Manage files on own private file areas'; $string['user:managesyspages'] = 'Configure default page layout for public user profiles'; -$string['user:readuserblogs'] = 'See all user blogs'; -$string['user:readuserposts'] = 'See all user posts'; +$string['user:readuserblogs'] = 'View all user blogs'; +$string['user:readuserposts'] = 'View all user forum posts'; $string['user:update'] = 'Update user profiles'; $string['user:viewalldetails'] = 'View user full information'; $string['user:viewdetails'] = 'View user profiles'; diff --git a/lang/en/webservice.php b/lang/en/webservice.php index 52966b24e6a14..90c8d9e0bdf72 100644 --- a/lang/en/webservice.php +++ b/lang/en/webservice.php @@ -52,7 +52,7 @@ $string['createtokenforuserdescription'] = 'Create a token for the web services user.'; $string['createuser'] = 'Create a specific user'; $string['createuserdescription'] = 'A web services user is required to represent the system controlling Moodle.'; -$string['criteriaerror'] = 'Missing permissions to search on a criteria.'; +$string['criteriaerror'] = 'Missing permissions to search on a criterion.'; $string['default'] = 'Default to "{$a}"'; $string['deleteaservice'] = 'Delete service'; $string['deleteservice'] = 'Delete the service: {$a->name} (id: {$a->id})'; diff --git a/message/output/email/lang/en/message_email.php b/message/output/email/lang/en/message_email.php index 0f0ff8de7a7de..398c98dede38d 100644 --- a/message/output/email/lang/en/message_email.php +++ b/message/output/email/lang/en/message_email.php @@ -24,14 +24,14 @@ $string['allowattachments'] = 'Allow attachments'; $string['allowusermailcharset'] = 'Allow user to select character set'; -$string['configallowattachments'] = 'Enabling this setting will allow file attachments to be sent with email messages generated by various features across the site, such as blogs, forums, or badges'; -$string['configallowusermailcharset'] = 'Enabling this, every user in the site will be able to specify his own charset for email.'; +$string['configallowattachments'] = 'If enabled, emails sent from the site can have attachments, such as badges.'; +$string['configallowusermailcharset'] = 'If enabled, users can choose an email charset in their profile settings.'; $string['configmailnewline'] = 'Newline characters used in mail messages. CRLF is required according to RFC 822bis, some mail servers do automatic conversion from LF to CRLF, other mail servers do incorrect conversion from CRLF to CRCRLF, yet others reject mails with bare LF (qmail for example). Try changing this setting if you are having problems with undelivered emails or double newlines.'; $string['confignoreplyaddress'] = 'Emails are sometimes sent out on behalf of a user (eg forum posts). The email address you specify here will be used as the "From" address in those cases when the recipients should not be able to reply directly to the user (eg when a user chooses to keep their address private).'; -$string['configsitemailcharset'] = 'All the emails generated by your site will be sent in the charset specified here. Anyway, every individual user will be able to adjust it if the next setting is enabled.'; +$string['configsitemailcharset'] = 'This setting specifies the default charset for all emails sent from the site.'; $string['configsmtphosts'] = 'Give the full name of one or more local SMTP servers that Moodle should use to send mail (eg \'mail.a.com\' or \'mail.a.com;mail.b.com\'). To specify a non-default port (i.e other than port 25), you can use the [server]:[port] syntax (eg \'mail.a.com:587\'). For secure connections, port 465 is usually used with SSL, port 587 is usually used with TLS, specify security protocol below if required. If you leave this field blank, Moodle will use the PHP default method of sending mail.'; $string['configsmtpmaxbulk'] = 'Maximum number of messages sent per SMTP session. Grouping messages may speed up the sending of emails. Values lower than 2 force creation of new SMTP session for each email.'; -$string['configsmtpsecure'] = 'If smtp server requires secure connection, specify the correct protocol type.'; +$string['configsmtpsecure'] = 'If SMTP server requires secure connection, specify the correct protocol type.'; $string['configsmtpuser'] = 'If you have specified an SMTP server above, and the server requires authentication, then enter the username and password here.'; $string['email'] = 'Send email notifications to'; $string['ifemailleftempty'] = 'Leave empty to send notifications to {$a}'; diff --git a/mod/assign/lang/en/assign.php b/mod/assign/lang/en/assign.php index e54996a678763..6cce1c0aaf75e 100644 --- a/mod/assign/lang/en/assign.php +++ b/mod/assign/lang/en/assign.php @@ -60,9 +60,9 @@ You can see it appended to your assignment submission: {$a->url}'; -$string['assignmentmailhtml'] = '{$a->grader} has posted some feedback on your -assignment submission for \'{$a->assignment}\'{$a->grader} has posted some feedback on your +assignment submission for \'{$a->assignment}\'.
+You can see it appended to your assignment submission.
'; $string['assignmentmailsmall'] = '{$a->grader} has posted some feedback on your assignment submission for \'{$a->assignment}\' You can see it appended to your submission'; $string['assignmentname'] = 'Assignment name'; @@ -333,9 +333,9 @@ You can see the status of your assignment submission: {$a->url}'; -$string['submissioncopiedhtml'] = 'You have made a copy of your previous -assignment submission for \'{$a->assignment}\'You have made a copy of your previous +assignment submission for \'{$a->assignment}\'.
+You can see the status of your assignment submission.
'; $string['submissioncopiedsmall'] = 'You have copied your previous assignment submission for {$a->assignment}'; $string['submissiondrafts'] = 'Require students click submit button'; $string['submissiondrafts_help'] = 'If enabled, students will have to click a Submit button to declare their submission as final. This allows students to keep a draft version of the submission on the system. If this setting is changed from "No" to "Yes" after students have already submitted those submissions will be regarded as final.'; @@ -351,9 +351,8 @@ You can see the status of your assignment submission: {$a->url}'; -$string['submissionreceipthtml'] = 'You have submitted an -assignment submission for \'{$a->assignment}\'You have submitted an assignment submission for \'{$a->assignment}\'.
+You can see the status of your assignment submission.
'; $string['submissionreceiptsmall'] = 'You have submitted your assignment submission for {$a->assignment}'; $string['submissionslocked'] = 'This assignment is not accepting submissions'; $string['submissionslockedshort'] = 'Submission changes not allowed'; diff --git a/mod/assignment/lang/en/assignment.php b/mod/assignment/lang/en/assignment.php index 29c37facb999a..ad94134c1df48 100644 --- a/mod/assignment/lang/en/assignment.php +++ b/mod/assignment/lang/en/assignment.php @@ -44,9 +44,9 @@ You can see it appended to your assignment submission: {$a->url}'; -$string['assignmentmailhtml'] = '{$a->teacher} has posted some feedback on your -assignment submission for \'{$a->assignment}\'{$a->teacher} has posted some feedback on your +assignment submission for \'{$a->assignment}\'.
+You can see it appended to your assignment submission.
'; $string['assignmentmailsmall'] = '{$a->teacher} has posted some feedback on your assignment submission for \'{$a->assignment}\' You can see it appended to your submission'; $string['assignmentname'] = 'Assignment name'; @@ -88,9 +88,8 @@ It is available here: {$a->url}'; -$string['emailteachermailhtml'] = '{$a->username} has updated their assignment submission -for \'{$a->assignment}\' at {$a->timeupdated}{$a->username} has updated their assignment submission for \'{$a->assignment}\' at {$a->timeupdated}.
+It is available on the site.
'; $string['emailteachers'] = 'Email alerts to teachers'; $string['emailteachers_help'] = 'If enabled, teachers receive email notification whenever students add or update an assignment submission. diff --git a/mod/data/lang/en/data.php b/mod/data/lang/en/data.php index b31c9feccd670..eac7b4cb55d33 100644 --- a/mod/data/lang/en/data.php +++ b/mod/data/lang/en/data.php @@ -77,7 +77,7 @@ $string['csvimport_help'] = 'Entries may be imported via a plain text file with a list of field names as the first line, then the data, with one record per line.'; $string['csvwithselecteddelimiter'] = 'CSV text with selected delimiter:'; $string['data:addinstance'] = 'Add a new database'; -$string['data:approve'] = 'Approve unapproved entries, or disapprove approved ones'; +$string['data:approve'] = 'Approve and unapprove entries'; $string['data:comment'] = 'Write comments'; $string['data:exportallentries'] = 'Export all database entries'; $string['data:exportentry'] = 'Export a database entry'; @@ -110,7 +110,7 @@ $string['deletewarning'] = 'Are you sure you want to delete this preset?'; $string['descending'] = 'Descending'; $string['directorynotapreset'] = '{$a->directory} Not a preset: missing files: {$a->missing_files}'; -$string['disapprove'] = 'Disapprove'; +$string['disapprove'] = 'Unapprove'; $string['download'] = 'Download'; $string['edit'] = 'Edit'; $string['editcomment'] = 'Edit comment'; @@ -289,7 +289,7 @@ $string['radiobutton'] = 'Radio buttons'; $string['recordapproved'] = 'Entry approved'; $string['recorddeleted'] = 'Entry deleted'; -$string['recorddisapproved'] = 'Entry disapproved'; +$string['recorddisapproved'] = 'Entry unapproved'; $string['recordsnotsaved'] = 'No entry was saved. Please check the format of the uploaded file.'; $string['recordssaved'] = 'entries saved'; $string['requireapproval'] = 'Approval required'; diff --git a/mod/feedback/lang/en/feedback.php b/mod/feedback/lang/en/feedback.php index 077836e79733c..da42c53b6d6d6 100644 --- a/mod/feedback/lang/en/feedback.php +++ b/mod/feedback/lang/en/feedback.php @@ -47,7 +47,7 @@ $string['completed_feedbacks'] = 'Submitted answers'; $string['complete_the_form'] = 'Answer the questions...'; $string['completionsubmit'] = 'View as completed if the feedback is submitted'; -$string['configallowfullanonymous'] = 'If this option is set yes so the feedback can be completed without any preceding logon. It only affects feedbacks on the homepage.'; +$string['configallowfullanonymous'] = 'If set to \'yes\', users can complete a feedback activity on the front page without being required to log in.'; $string['confirmdeleteentry'] = 'Are you sure you want to delete this entry?'; $string['confirmdeleteitem'] = 'Are you sure you want to delete this element?'; $string['confirmdeletetemplate'] = 'Are you sure you want to delete this template?'; @@ -97,8 +97,8 @@ You can view it here: {$a->url}'; -$string['emailteachermailhtml'] = '{$a->username} has completed feedback activity : \'{$a->feedback}\'{$a->username} has completed feedback activity : \'{$a->feedback}\'.
+It is available on the site.
'; $string['entries_saved'] = 'Your answers have been saved. Thank you.'; $string['export_questions'] = 'Export questions'; $string['export_to_excel'] = 'Export to Excel'; diff --git a/mod/folder/lang/en/folder.php b/mod/folder/lang/en/folder.php index a3af3ee46c8d1..6c50511ecebb3 100644 --- a/mod/folder/lang/en/folder.php +++ b/mod/folder/lang/en/folder.php @@ -51,5 +51,5 @@ $string['displaypage'] = 'On a separate page'; $string['displayinline'] = 'Inline on a course page'; $string['noautocompletioninline'] = 'Automatic completion on viewing of activity can not be selected together with "Display inline" option'; -$string['showexpanded'] = 'Show sub-folders expanded'; -$string['showexpanded_help'] = 'If enabled, will display sub-folders expanded by default. Else, sub-folders will display collapsed.'; +$string['showexpanded'] = 'Show subfolders expanded'; +$string['showexpanded_help'] = 'If set to \'yes\', subfolders are shown expanded by default; otherwise they are shown collapsed.'; diff --git a/mod/glossary/lang/en/glossary.php b/mod/glossary/lang/en/glossary.php index 1bc2cc83bf6b8..353dae44f2b6e 100644 --- a/mod/glossary/lang/en/glossary.php +++ b/mod/glossary/lang/en/glossary.php @@ -108,7 +108,7 @@ $string['descending'] = 'descending'; $string['destination'] = 'Destination of imported entries'; $string['destination_help'] = 'Entries can either be imported and added to the current glossary or to a new glossary, in which case a new glossary will be created based on information in the XML file.'; -$string['disapprove'] = 'Disapprove'; +$string['disapprove'] = 'Unapprove'; $string['displayformat'] = 'Display format'; $string['displayformat_help'] = 'There are 7 display formats: @@ -174,7 +174,7 @@ $string['fullmatch'] = 'Match whole words only'; $string['fullmatch_help'] = 'This setting specifies whether only whole words will be linked, for example, a glossary entry named "construct" will not create a link inside the word "constructivism".'; $string['glossary:addinstance'] = 'Add a new glossary'; -$string['glossary:approve'] = 'Approve unapproved entries, or disapprove approved ones'; +$string['glossary:approve'] = 'Approve and unapprove entries'; $string['glossary:comment'] = 'Create comments'; $string['glossary:export'] = 'Export entries'; $string['glossary:exportentry'] = 'Export single entry'; diff --git a/mod/lesson/lang/en/lesson.php b/mod/lesson/lang/en/lesson.php index 6dc34e72a65cd..04eec0e7b7836 100644 --- a/mod/lesson/lang/en/lesson.php +++ b/mod/lesson/lang/en/lesson.php @@ -142,7 +142,9 @@ $string['displayofgrade'] = 'Display of grade (for students only)'; $string['displayreview'] = 'Provide option to try a question again'; $string['displayreview_help'] = 'If enabled, when a question is answered incorrectly, the student is given the option to try it again for no point credit, or continue with the lesson.'; -$string['displayscorewithessays'] = 'You earned {$a->score} out of {$a->tempmaxgrade} for the automatically graded questions.You earned {$a->score} out of {$a->tempmaxgrade} for the automatically graded questions.
+Your {$a->essayquestions} essay question(s) will be graded and added into your final score at a later date.
+Your current grade without the essay question(s) is {$a->score} out of {$a->grade}.
'; $string['displayscorewithoutessays'] = 'Your score is {$a->score} (out of {$a->grade}).'; $string['edit'] = 'Edit'; $string['editingquestionpage'] = 'Editing {$a} question page'; diff --git a/mod/lti/lang/en/lti.php b/mod/lti/lang/en/lti.php index 62a1fba633916..af2b9695da47a 100644 --- a/mod/lti/lang/en/lti.php +++ b/mod/lti/lang/en/lti.php @@ -229,13 +229,9 @@ $string['lti_launch_error_tool_request'] = 'To submit a request for an administrator to complete the tool configuration, click here.
'; -$string['lti_launch_error_unsigned_help'] = '- This error may be a result of a missing consumer key and shared secret for the tool provider. -
-
- If you have a consumer key and shared secret, you may enter it when editing the external tool instance (make sure advanced options are visible).
- Alternatively, you may create a course level tool provider configuration here.
-
This error may be a result of a missing consumer key and shared secret for the tool provider.
+If you have a consumer key and shared secret, you may enter it when editing the external tool instance (make sure advanced options are visible).
+Alternatively, you may create a course level tool provider configuration.
'; $string['lti_tool_request_added'] = 'Tool configuration request successfully submitted. You may need to contact an administrator to complete the tool configuration.'; $string['lti_tool_request_existing'] = 'A tool configuration for the tool domain has already been submitted.'; $string['ltiunknownserviceapicall'] = 'LTI unknown service API call.'; diff --git a/mod/quiz/lang/en/quiz.php b/mod/quiz/lang/en/quiz.php index fa89dcf65d619..10e8e4bc39f74 100644 --- a/mod/quiz/lang/en/quiz.php +++ b/mod/quiz/lang/en/quiz.php @@ -33,7 +33,8 @@ $string['addarandomquestion_help'] = 'When a random question is added, it results in a randomly-chosen question from the category being inserted into the quiz. This means that different students are likely to get a different selection of questions, and when a quiz allows multiple attempts then each attempt is likely to contain a new selection of questions.'; $string['adddescriptionlabel'] = 'Add description/label'; $string['addingquestion'] = 'Adding a question'; -$string['addingquestions'] = 'This side of the page is where you manage your database of questions. Questions are stored in categories to help you keep them organised, and can be used by any quiz in your course or even other courses if you choose to \'publish\' them.This side of the page is where you manage your database of questions. Questions are stored in categories to help you keep them organised, and can be used by any quiz in your course or even other courses if you choose to \'publish\' them.
+After you select or create a question category you will be able to create or edit questions. You can select any of these questions to add to your quiz over on the other side of this page.
'; $string['addmoreoverallfeedbacks'] = 'Add {no} more feedback fields'; $string['addnewgroupoverride'] = 'Add group override'; $string['addnewpagesafterselected'] = 'Add new pages after selected questions'; diff --git a/mod/scorm/lang/en/scorm.php b/mod/scorm/lang/en/scorm.php index bb48489358009..56bdd9d881116 100644 --- a/mod/scorm/lang/en/scorm.php +++ b/mod/scorm/lang/en/scorm.php @@ -234,14 +234,14 @@ $string['modulename_link'] = 'mod/scorm/view'; $string['modulenameplural'] = 'SCORM packages'; $string['nav'] = 'Show Navigation'; -$string['nav_help'] = 'This setting specifies wether to show or hide the navigation buttons and their position. +$string['nav_help'] = 'This setting specifies whether to show or hide the navigation buttons and their position. There are 3 options: -* No - Do not show the navigation buttons -* Under content - Show the navigation buttons under SCORM package content -* Float - Allows to manually specify the navigation buttons position from left and from top with respect to the window.'; -$string['navdesc'] = 'This setting specifies wether to show/hide navigation buttons and their position.'; +* No - Navigation buttons are not shown +* Under content - Navigation buttons are shown below the SCORM package content +* Floating - Navigation buttons are shown floating, with the postition from the top and from the left determined by the package.'; +$string['navdesc'] = 'This setting specifies whether to show or hide navigation buttons and their position.'; $string['navpositionleft'] = 'Position of navigation buttons from left in pixels.'; $string['navpositiontop'] = 'Position of navigation buttons from top in pixels.'; $string['newattempt'] = 'Start a new attempt'; diff --git a/portfolio/boxnet/lang/en/portfolio_boxnet.php b/portfolio/boxnet/lang/en/portfolio_boxnet.php index b1f94497937b6..8e71affd4da48 100644 --- a/portfolio/boxnet/lang/en/portfolio_boxnet.php +++ b/portfolio/boxnet/lang/en/portfolio_boxnet.php @@ -44,7 +44,7 @@ $string['pluginname'] = 'Box.net'; $string['sendfailed'] = 'Failed to send content to box.net: {$a}'; $string['setupinfo'] = 'Setup instructions'; -$string['setupinfodetails'] = 'To obtain a client ID and secret, log in to Box.net and visit their developers page. Follow \'Create new application\' and create new application for your Moodle site. The client ID ans secret are displayed in \'OAuth2 parameters\' section of the application edit form. Optionally, you can also provide other information about your Moodle site.'; +$string['setupinfodetails'] = 'To obtain a client ID and secret, log in to Box.net and visit the Box.net developers page. Follow \'Create new application\' and create a new application for your Moodle site. The client ID and secret are displayed in the \'OAuth2 parameters\' section of the application edit form. Optionally, you can also provide other information about your Moodle site.'; $string['sharedfolder'] = 'Shared'; $string['sharefile'] = 'Share this file?'; $string['sharefolder'] = 'Share this new folder?';