From fda41f4588affec95a1d3d7218e1b1a6a539f946 Mon Sep 17 00:00:00 2001 From: Helen Foster Date: Sat, 9 Nov 2019 06:35:22 +0100 Subject: [PATCH] MDL-67146 lang: Import fixed English strings (en_fix) Significant string changes: * configallowemojipicker,core_admin - including emoji picker button in Atto * viewconversation,mod_forum - 'conversation' changed to 'discussion' --- .../displayh5p/lang/en/filter_displayh5p.php | 4 ++- lang/en/admin.php | 2 +- lang/en/h5p.php | 26 +++++++++---------- .../atto/plugins/h5p/lang/en/atto_h5p.php | 2 +- mod/forum/lang/en/forum.php | 4 +-- 5 files changed, 20 insertions(+), 18 deletions(-) diff --git a/filter/displayh5p/lang/en/filter_displayh5p.php b/filter/displayh5p/lang/en/filter_displayh5p.php index dfb1f12c938cc..950324dfbd031 100644 --- a/filter/displayh5p/lang/en/filter_displayh5p.php +++ b/filter/displayh5p/lang/en/filter_displayh5p.php @@ -27,6 +27,8 @@ $string['allowedsourceslist'] = 'Allowed sources'; $string['allowedsourceslistdesc'] = 'A list of URLs from which users can embed H5P content. If none are specified, all URLs will remain as links and not be displayed as embedded H5P content. -\'[id]\' is a placeholder for the H5P content ID in the external source.'; +\'[id]\' is a placeholder for the H5P content ID in the external source. + +The wildcard character \'*\' may be used to specify subdomains. For example, *.example.com will allow embedded H5P content from any subdomain of example.com, but not from the example.com domain.'; $string['filtername'] = 'Display H5P'; $string['privacy:metadata'] = 'The display H5P filter does not store any personal data.'; diff --git a/lang/en/admin.php b/lang/en/admin.php index 602cb1aa5ed9b..400e094b72801 100644 --- a/lang/en/admin.php +++ b/lang/en/admin.php @@ -154,7 +154,7 @@ $string['configallowcoursethemes'] = 'If you enable this, then courses will be allowed to set their own themes. Course themes override all other theme choices (site, user, or session themes)'; $string['configallowedemaildomains'] = 'List email domains that are allowed to be disclosed in the "From" section of outgoing email. The default of "Empty" will use the No-reply address for all outgoing email. The use of wildcards is allowed e.g. *.example.com will allow emails sent from any subdomain of example.com, but not example.com itself. This will require separate entry.'; $string['configallowemailaddresses'] = 'To restrict new email addresses to particular domains, list them here separated by spaces. All other domains will be rejected. To allow subdomains, add the domain with a preceding \'.\'. To allow a root domain together with its subdomains, add the domain twice - once with a preceding \'.\' and once without e.g. .ourcollege.edu.au ourcollege.edu.au.'; -$string['configallowemojipicker'] = 'The emoji picker enables users to select emojis, such as smilies, to add to messages.'; +$string['configallowemojipicker'] = 'The emoji picker enables users to select emojis, such as smilies, to add to messages and other text areas via an emoji picker button in the Atto toolbar.'; $string['configallowemojipickerincompatible'] = 'Your current database configuration does not properly support emojis. In order to enable the emoji picker you will need to upgrade your database for full unicode support.'; $string['configallowguestmymoodle'] = 'If enabled guests can access Dashboard, otherwise guests are redirected to the site front page.'; $string['configallowobjectembed'] = 'As a default security measure, normal users are not allowed to embed multimedia (like Flash) within texts using explicit EMBED and OBJECT tags in their HTML (although it can still be done safely using the mediaplugins filter). If you wish to allow these tags then enable this option.'; diff --git a/lang/en/h5p.php b/lang/en/h5p.php index 221c3c42c6c52..016016de2d73e 100644 --- a/lang/en/h5p.php +++ b/lang/en/h5p.php @@ -32,7 +32,7 @@ $string['additionallicenseinfo'] = 'Any additional information about the license'; $string['author'] = 'Author'; $string['authorcomments'] = 'Author comments'; -$string['authorcommentsdescription'] = 'Comments for the editor of the content (This text will not be published as a part of copyright info)'; +$string['authorcommentsdescription'] = 'Comments for the editor of the content. (This text will not be published as a part of the copyright info.)'; $string['authorname'] = 'Author\'s name'; $string['authorrole'] = 'Author\'s role'; $string['by'] = 'by'; @@ -49,14 +49,14 @@ $string['changelog'] = 'Changelog'; $string['changeplaceholder'] = 'Photo cropped, text changed, etc.'; $string['close'] = 'Close'; -$string['confirmdialogbody'] = 'Please confirm that you wish to proceed. This action is not reversible.'; +$string['confirmdialogbody'] = 'Please confirm that you wish to proceed. This action cannot be undone.'; $string['confirmdialogheader'] = 'Confirm action'; $string['confirmlabel'] = 'Confirm'; -$string['connectionLost'] = 'Connection lost. Results will be stored and sent when you regain connection.'; +$string['connectionLost'] = 'Connection lost. Results will be stored and sent when the connection is reestablished.'; $string['connectionReestablished'] = 'Connection reestablished.'; $string['contentCopied'] = 'Content is copied to the clipboard'; $string['contentchanged'] = 'This content has changed since you last used it.'; -$string['contenttype'] = 'Content Type'; +$string['contenttype'] = 'Content type'; $string['copyright'] = 'Rights of use'; $string['copyrightinfo'] = 'Copyright information'; $string['copyrightstring'] = 'Copyright'; @@ -78,7 +78,7 @@ $string['fullscreen'] = 'Fullscreen'; $string['gpl'] = 'General Public License v3'; $string['h5p'] = 'H5P'; -$string['h5ptitle'] = 'Visit H5P.org to check out more cool content.'; +$string['h5ptitle'] = 'Visit h5p.org to check out more content.'; $string['h5pfilenotfound'] = 'H5P file not found'; $string['h5pinvalidurl'] = 'Invalid H5P content URL.'; $string['h5pprivatefile'] = 'This H5P content can\'t be displayed because you don\'t have access to the .h5p file.'; @@ -121,23 +121,23 @@ $string['licenseV2'] = 'Version 2'; $string['licenseV3'] = 'Version 3'; $string['licensee'] = 'Licensee'; -$string['licenseextras'] = 'License Extras'; -$string['licenseversion'] = 'License Version'; +$string['licenseextras'] = 'License extras'; +$string['licenseversion'] = 'License version'; $string['missingcontentfolder'] = 'A valid content folder is missing'; -$string['missingcoreversion'] = 'The system was unable to install the {$a->%component} component from the package, it requires a newer version of the H5P plugin. This site is currently running version {$a->%current}, whereas the required version is {$a->%required} or higher. You should consider upgrading and then try again.'; +$string['missingcoreversion'] = 'The system was unable to install the {$a->%component} component from the package, as it requires a newer version of the H5P plugin. This site is currently running version {$a->%current}, whereas the required version is {$a->%required} or higher. Please upgrade and then try again.'; $string['missingdependency'] = 'Missing dependency {$a->@dep} required by {$a->@lib}.'; $string['missinglibrary'] = 'Missing required library {$a->@library}'; $string['missinglibraryfile'] = 'The file "{$a->%file}" is missing from library: "{$a->%name}"'; $string['missinglibraryjson'] = 'Could not find library.json file with valid json format for library {$a->%name}'; $string['missinglibraryproperty'] = 'The required property {$a->%property} is missing from {$a->%library}'; -$string['missingmbstring'] = 'The mbstring PHP extension is not loaded. H5P need this to function properly'; -$string['missinguploadpermissions'] = 'Note that the libraries may exist in the file you uploaded, but you\'re not allowed to upload new libraries. Contact the site administrator about this.'; +$string['missingmbstring'] = 'The mbstring PHP extension is not loaded. It is required for H5P to function properly.'; +$string['missinguploadpermissions'] = 'Note that the libraries may exist in the file you uploaded, but you\'re not allowed to upload new libraries. Please contact your administrator.'; $string['nocopyright'] = 'No copyright information available for this content.'; -$string['noextension'] = 'The file you uploaded is not a valid HTML5 Package (It does not have the .h5p file extension)'; +$string['noextension'] = 'The file you uploaded is not a valid HTML5 Package. (It doesn\'t have the .h5p file extension.)'; $string['nopermissiontodeploy'] = 'This file can\'t be displayed because it has been uploaded by a user without the required capability to deploy H5P content.'; $string['nojson'] = 'The main h5p.json file is not valid'; $string['notrustablefile'] = 'This file can\'t be displayed because it has been uploaded by a user without the capability to update H5P content types. Please contact your administrator to ask for the content type to be installed.'; -$string['nounzip'] = 'The file you uploaded is not a valid HTML5 Package (We are unable to unzip it)'; +$string['nounzip'] = 'The file you uploaded is not a valid HTML5 Package. (It is not possible to unzip it.)'; $string['offlineDialogBody'] = 'We were unable to send information about your completion of this task. Please check your internet connection.'; $string['offlineDialogHeader'] = 'Your connection to the server was lost'; $string['offlineDialogRetryButtonLabel'] = 'Retry now'; @@ -152,7 +152,7 @@ $string['resizescript'] = 'Include this script on your website if you want dynamic sizing of the embedded content:'; $string['resubmitScores'] = 'Attempting to submit stored results.'; $string['reuse'] = 'Reuse'; -$string['reuseContent'] = 'Reuse Content'; +$string['reuseContent'] = 'Reuse content'; $string['reuseDescription'] = 'Reuse this content.'; $string['showadvanced'] = 'Show advanced'; $string['showless'] = 'Show less'; diff --git a/lib/editor/atto/plugins/h5p/lang/en/atto_h5p.php b/lib/editor/atto/plugins/h5p/lang/en/atto_h5p.php index 382ba5f90ca0f..feefb27e26ad5 100644 --- a/lib/editor/atto/plugins/h5p/lang/en/atto_h5p.php +++ b/lib/editor/atto/plugins/h5p/lang/en/atto_h5p.php @@ -27,7 +27,7 @@ $string['downloadbutton'] = 'Allow download'; $string['either'] = 'Either'; $string['embedbutton'] = 'Embed button'; -$string['enterurl'] = 'URL or Embed code'; +$string['enterurl'] = 'URL or embed code'; $string['h5p:addembed'] = 'Add embedded H5P'; $string['h5pfile'] = 'H5P file upload'; $string['h5poptions'] = 'H5P options'; diff --git a/mod/forum/lang/en/forum.php b/mod/forum/lang/en/forum.php index 8efd14f4931f7..ad90b32617057 100644 --- a/mod/forum/lang/en/forum.php +++ b/mod/forum/lang/en/forum.php @@ -285,7 +285,7 @@ $string['forum:canoverridecutoff'] = 'Post to forums after their cut-off date'; $string['forum:canoverridediscussionlock'] = 'Reply to locked discussions'; $string['forum:cantogglefavourite'] = 'Star discussions'; -$string['forum:grade'] = 'Grade other users'; +$string['forum:grade'] = 'Grade forum'; $string['forumauthorhidden'] = 'Author (hidden)'; $string['forumblockingalmosttoomanyposts'] = 'You are approaching the posting threshold. You have posted {$a->numposts} times in the last {$a->blockperiod} and the limit is {$a->blockafter} posts.'; $string['forumbodyhidden'] = 'This post cannot be viewed by you, probably because you have not posted in the discussion, the maximum editing time hasn\'t passed yet, the discussion has not started or the discussion has expired.'; @@ -737,7 +737,7 @@ $string['gradeusers'] = 'Grade users'; $string['forumgrader'] = 'Forum grader'; $string['grading'] = 'Grading'; -$string['viewconversation'] = 'View conversation'; +$string['viewconversation'] = 'View discussion'; $string['grade_forum_header'] = 'Whole forum grading'; $string['grade_forum_title'] = 'Grade';