From c3f4867a417ad7592038ed0a1b37350ee40800e9 Mon Sep 17 00:00:00 2001 From: Helen Foster Date: Tue, 2 Jul 2013 11:51:45 +0200 Subject: [PATCH] MDL-40439 Merge English strings from the en_fix language pack --- admin/tool/langimport/lang/en/tool_langimport.php | 2 +- enrol/self/lang/en/enrol_self.php | 4 ++-- lang/en/admin.php | 2 +- lang/en/error.php | 2 +- lang/en/moodle.php | 8 ++++---- lang/en/portfolio.php | 2 +- lang/en/role.php | 2 +- repository/filesystem/lang/en/repository_filesystem.php | 6 +++--- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/admin/tool/langimport/lang/en/tool_langimport.php b/admin/tool/langimport/lang/en/tool_langimport.php index a5ead161828..e194219e0dd 100644 --- a/admin/tool/langimport/lang/en/tool_langimport.php +++ b/admin/tool/langimport/lang/en/tool_langimport.php @@ -37,7 +37,7 @@ $string['missinglangparent'] = 'Missing parent language {$a->parent} of $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 can not connect to download.moodle.org, we are unable to do language pack installation automatically. Please download the appropriate zip file(s) from http://download.moodle.org, copy them to your {$a} directory and unzip them manually.'; +$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['uninstall'] = 'Uninstall selected language pack'; $string['uninstallconfirm'] = 'You are about to completely uninstall language pack {$a}, are you sure?'; $string['updatelangs'] = 'Update all installed language packs'; diff --git a/enrol/self/lang/en/enrol_self.php b/enrol/self/lang/en/enrol_self.php index 10e41ccc0ed..47f1b0664ef 100644 --- a/enrol/self/lang/en/enrol_self.php +++ b/enrol/self/lang/en/enrol_self.php @@ -60,9 +60,9 @@ This is a notification that your enrolment in the course \'{$a->course}\' is due If you need help, please contact {$a->enroller}.'; $string['groupkey'] = 'Use group enrolment keys'; $string['groupkey_desc'] = 'Use group enrolment keys by default.'; -$string['groupkey_help'] = 'In addition to restricting access to the course to only those who know the key, use of a group enrolment key means users are automatically added to the group when they enrol in the course. +$string['groupkey_help'] = 'In addition to restricting access to the course to only those who know the key, use of group enrolment keys means users are automatically added to groups when they enrol in the course. -To use a group enrolment key, an enrolment key must be specified in the course settings as well as the group enrolment key in the group settings.'; +Note: An enrolment key for the course must be specified in the self enrolment settings as well as group enrolment keys in the group settings.'; $string['longtimenosee'] = 'Unenrol inactive after'; $string['longtimenosee_help'] = 'If users haven\'t accessed a course for a long time, then they are automatically unenrolled. This parameter specifies that time limit.'; $string['maxenrolled'] = 'Max enrolled users'; diff --git a/lang/en/admin.php b/lang/en/admin.php index 801bcd9caec..d99e721afd5 100644 --- a/lang/en/admin.php +++ b/lang/en/admin.php @@ -189,7 +189,7 @@ $string['configenabledevicedetection'] = 'Enables detection of mobiles, smartpho $string['configdisableuserimages'] = 'Disable the ability for users to change user profile images.'; $string['configdisplayloginfailures'] = 'This will display information to selected users about previous failed logins.'; $string['configdndallowtextandlinks'] = 'Enable or disable the dragging and dropping of text and links onto a course page, alongside the dragging and dropping of files. Note that the dragging of text into Firefox or between different browsers is unreliable and may result in no data being uploaded, or corrupted text being uploaded.'; -$string['configdocroot'] = 'Defines the path to the Moodle Docs. You can change this if you wish to have your own custom online documentation. However, if you do that make sure that the paths in your documentation follow the same format as http://docs.moodle.org.'; +$string['configdocroot'] = 'Defines the path to the Moodle Docs for providing context-specific documentation via \'Moodle Docs for this page\' links in the footer of each page. If the field is left blank, links will not be displayed.'; $string['configdoctonewwindow'] = 'If you enable this, then links to Moodle Docs will be shown in a new window.'; $string['configeditordictionary'] = 'This value will be used if aspell doesn\'t have dictionary for users own language.'; $string['configeditorfontlist'] = 'Select the fonts that should appear in the editor\'s drop-down list.'; diff --git a/lang/en/error.php b/lang/en/error.php index 2f2623ec657..5acbece280e 100644 --- a/lang/en/error.php +++ b/lang/en/error.php @@ -171,7 +171,7 @@ $string['courseformatnotfound'] = 'The course format \'{$a}\' doesn\'t exist or $string['coursegroupunknown'] = 'Course corresponding to group {$a} not specified'; $string['courseidnotfound'] = 'Course id doesn\'t exist'; $string['coursemisconf'] = 'Course is misconfigured'; -$string['courserequestdisabled'] = 'Sorry, but requesting courses has been disabled by the administrator'; +$string['courserequestdisabled'] = 'Sorry, but course requests have been disabled by the administrator.'; $string['csvcolumnduplicates'] = 'Duplicate columns detected'; $string['csvemptyfile'] = 'The CSV file is empty'; $string['csvfewcolumns'] = 'Not enough columns, please verify the delimiter setting'; diff --git a/lang/en/moodle.php b/lang/en/moodle.php index 88054233d66..96c01a052dc 100644 --- a/lang/en/moodle.php +++ b/lang/en/moodle.php @@ -347,7 +347,7 @@ $string['courserequestdetails'] = 'Details of the course you are requesting'; $string['courserequestfailed'] = 'For some reason, your course request could not be saved'; $string['courserequestintro'] = 'Use this form to request a course to be created for you.
Try and fill in as much information as you can to allow
the administrators to understand your reasons for wanting this course.'; $string['courserequestreason'] = 'Reasons for wanting this course'; -$string['courserequestsuccess'] = 'Successfully saved your course request. Expect an email within a few days with the outcome'; +$string['courserequestsuccess'] = 'Your course request has been saved successfully. You will be sent an email to inform you whether your request was approved.'; $string['courserequestsupport'] = 'Supporting information to help the administrator evaluate this request'; $string['courserestore'] = 'Course restore'; $string['courses'] = 'Courses'; @@ -1156,7 +1156,7 @@ line at the top of your web browser window. Cheers from the \'{$a->sitename}\' administrator, {$a->signoff}'; $string['newusers'] = 'New users'; -$string['newwindow'] = 'new window'; +$string['newwindow'] = 'New window'; $string['next'] = 'Next'; $string['nextsection'] = 'Next section'; $string['no'] = 'No'; @@ -1492,7 +1492,7 @@ $string['selectaregion'] = 'Select a region'; $string['selctauser'] = 'Select a user'; $string['selectall'] = 'Select all'; $string['selectamodule'] = 'Please select an activity module'; -$string['selectanoptions'] = 'Select an options'; +$string['selectanoptions'] = 'Select an option'; $string['selectdefault'] = 'Select default'; $string['selectedfile'] = 'Selected file'; $string['selectednowmove'] = '{$a} files selected for moving. Now go into the destination folder and press \'Move files to here\''; @@ -1500,7 +1500,7 @@ $string['selectfiles'] = 'Select files'; $string['selectmoduletoviewhelp'] = 'Select an activity or resource to view its help. Double-click on an activity or resource name to quickly add it.'; -$string['selectnos'] = 'Select all \'no\''; +$string['selectnos'] = 'Select all \'No\''; $string['selectperiod'] = 'Select period'; $string['senddetails'] = 'Send my details via email'; $string['separate'] = 'Separate'; diff --git a/lang/en/portfolio.php b/lang/en/portfolio.php index d0bf89a6755..2a5cfc6e21c 100644 --- a/lang/en/portfolio.php +++ b/lang/en/portfolio.php @@ -52,7 +52,7 @@ $string['displayexpiry'] = 'Transfer expiry time'; $string['displayinfo'] = 'Export info'; $string['dontwait'] = 'Don\'t wait'; $string['enabled'] = 'Enable portfolios'; -$string['enableddesc'] = 'This will allow administrators to configure remote systems for users to export content to'; +$string['enableddesc'] = 'If enabled, users can export content, such as forum posts and assignment submissions, to external portfolios or HTML pages.'; $string['err_uniquename'] = 'Portfolio name must be unique (per plugin)'; $string['exportalreadyfinished'] = 'Portfolio export complete!'; $string['exportalreadyfinisheddesc'] = 'Portfolio export complete!'; diff --git a/lang/en/role.php b/lang/en/role.php index 7628b48c90b..e488a068495 100644 --- a/lang/en/role.php +++ b/lang/en/role.php @@ -198,7 +198,7 @@ $string['grade:view'] = 'View own grades'; $string['grade:viewall'] = 'View grades of other users'; $string['grade:viewhidden'] = 'View hidden grades for owner'; $string['hidden'] = 'Hidden'; -$string['highlightedcellsshowdefault'] = 'The permissions selected in the table below are the defaults for the role archetype selected above.'; +$string['highlightedcellsshowdefault'] = 'The permissions highlighted in the table below are the defaults for the role archetype currently selected above.'; $string['highlightedcellsshowinherit'] = 'The highlighted cells in the table below show the permission (if any) that will be inherited. Apart from the capabilities whose permission you actually want to alter, you should leave everything set to Inherit.'; $string['checkglobalpermissions'] = 'Check system permissions'; $string['checkpermissions'] = 'Check permissions'; diff --git a/repository/filesystem/lang/en/repository_filesystem.php b/repository/filesystem/lang/en/repository_filesystem.php index 1a1de4a5262..ab323933b92 100644 --- a/repository/filesystem/lang/en/repository_filesystem.php +++ b/repository/filesystem/lang/en/repository_filesystem.php @@ -24,7 +24,7 @@ */ $string['blockedpath'] = 'Blocked root path'; -$string['configplugin'] = 'Setup repository on file system'; +$string['configplugin'] = 'Configuration for file system repository'; $string['donotusesysdir'] = 'Don\'t use system directory as repository, including'; $string['filesystem:view'] = 'View file system repository'; $string['information'] = 'These folders are within the {$a} directory.'; @@ -34,5 +34,5 @@ $string['root'] = 'Root'; $string['nosubdir'] = 'You need to create at least one folder inside the {$a} directory so you can select it here.'; $string['pluginname_help'] = 'Create repository from local directory'; $string['pluginname'] = 'File system'; -$string['enablecourseinstances'] = 'Allow users to add a repository instance into the course (can be configured only by admins)'; -$string['enableuserinstances'] = 'Allow users to add a repository instance into the user context (can be configured only by admins)'; +$string['enablecourseinstances'] = 'Allow admins to add a file system repository instance to a course (configurable only by admins)'; +$string['enableuserinstances'] = 'Allow admins to add a file system repository instance for personal use (configurable only by admins)';