From a84e3767b71f0dad7c75190553405d300a536f1d Mon Sep 17 00:00:00 2001 From: Helen Foster Date: Mon, 27 Jun 2016 23:12:43 +0200 Subject: [PATCH] MDL-55002 lang: Merge English strings from the en_fix language pack --- lang/en/backup.php | 14 +++++++------- lang/en/badges.php | 2 +- lang/en/question.php | 2 +- mod/forum/lang/en/forum.php | 8 ++++---- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lang/en/backup.php b/lang/en/backup.php index dc12e736873..4b877b8c973 100644 --- a/lang/en/backup.php +++ b/lang/en/backup.php @@ -76,11 +76,11 @@ $string['backuptypesection'] = 'Section'; $string['backupversion'] = 'Backup version'; $string['cannotfindassignablerole'] = 'The {$a} role in the backup file cannot be mapped to any of the roles that you are allowed to assign.'; $string['choosefilefromcoursebackup'] = 'Course backup area'; -$string['choosefilefromcoursebackup_help'] = 'When backup courses using default settings, backup files will be stored here'; +$string['choosefilefromcoursebackup_help'] = 'Course backups made using default settings are stored here.'; $string['choosefilefromuserbackup'] = 'User private backup area'; -$string['choosefilefromuserbackup_help'] = 'When backup courses with "Anonymize user information" option ticked, backup files will be stored here'; +$string['choosefilefromuserbackup_help'] = 'Backup files with anonymized user information are stored here.'; $string['choosefilefromactivitybackup'] = 'Activity backup area'; -$string['choosefilefromactivitybackup_help'] = 'When backup activities using default settings, backup files will be stored here'; +$string['choosefilefromactivitybackup_help'] = 'Activity backups made using default settings are stored here.'; $string['choosefilefromautomatedbackup'] = 'Automated backups'; $string['choosefilefromautomatedbackup_help'] = 'Contains automatically generated backups.'; $string['configgeneralactivities'] = 'Sets the default for including activities in a backup.'; @@ -130,9 +130,9 @@ $string['filealiasesrestorefailures_help'] = 'Aliases are symbolic links to othe More details and the actual reason of the failure can be found in the restore log file.'; $string['filealiasesrestorefailures_link'] = 'restore/filealiases'; -$string['filereferencesincluded'] = 'File references to external contents included in backup package, they won\'t work on other sites.'; -$string['filereferencessamesite'] = 'Backup is from the same site, file references can be restored'; -$string['filereferencesnotsamesite'] = 'Backup is from other site, file references cannot be restored'; +$string['filereferencesincluded'] = 'File references to external contents are included in the backup file. These won\'t work if the backup is restored on a different site.'; +$string['filereferencessamesite'] = 'The backup file is from this site, and so file references can be restored.'; +$string['filereferencesnotsamesite'] = 'The backup file is from a different site, and so file references cannot be restored.'; $string['generalactivities'] = 'Include activities and resources'; $string['generalanonymize'] = 'Anonymise information'; $string['generalbackdefaults'] = 'General backup defaults'; @@ -180,7 +180,7 @@ $string['lockedbyconfig'] = 'This setting has been locked by the default backup $string['lockedbyhierarchy'] = 'Locked by dependencies'; $string['loglifetime'] = 'Keep logs for'; $string['managefiles'] = 'Manage backup files'; -$string['missingfilesinpool'] = 'Some files could not be saved during the backup, it won\'t be possible to restore them.'; +$string['missingfilesinpool'] = 'Some files could not be saved during the backup, and so it will not be possible to restore them.'; $string['moodleversion'] = 'Moodle version'; $string['moreresults'] = 'There are too many results, enter a more specific search.'; $string['nomatchingcourses'] = 'There are no courses to display'; diff --git a/lang/en/badges.php b/lang/en/badges.php index abf487a7990..1077607fa9f 100644 --- a/lang/en/badges.php +++ b/lang/en/badges.php @@ -87,7 +87,7 @@ $string['backpackdetails'] = 'Backpack settings'; $string['backpackemail'] = 'Email address'; $string['backpackemail_help'] = 'The email address associated with your backpack. While you are connected, any badges earned on this site will be associated with this email address.'; $string['personaconnection'] = 'Sign in with your email'; -$string['personaconnection_help'] = 'Persona is a system for identifying yourself across the web, using an email address that you own. The Open Badges backpack uses Persona as a login system, so to be able to connect to a backpack you with need a Persona account. +$string['personaconnection_help'] = 'Persona is a system for identifying yourself across the web, using an email address that you own. The Open Badges backpack uses Persona as a login system, so to be able to connect to a backpack you will need a Persona account. For more information about Persona visit https://login.persona.org/about.'; $string['backpackimport'] = 'Badge import settings'; diff --git a/lang/en/question.php b/lang/en/question.php index 78b328584ce..68d2c842c0d 100644 --- a/lang/en/question.php +++ b/lang/en/question.php @@ -65,7 +65,7 @@ $string['categorycurrent'] = 'Current category'; $string['categorycurrentuse'] = 'Use this category'; $string['categorydoesnotexist'] = 'This category does not exist'; $string['categoryinfo'] = 'Category info'; -$string['categorymove'] = 'The category \'{$a->name}\' contains {$a->count} questions (some of them may be old, hidden, questions, or Random questions that are still in use in some existing quizzes). Please choose another category to move them to.'; +$string['categorymove'] = 'The category \'{$a->name}\' contains {$a->count} questions (some of which may be hidden questions or random questions that are still in use in a quiz). Please choose another category to move them to.'; $string['categorymoveto'] = 'Save in category'; $string['categorynamecantbeblank'] = 'The category name cannot be blank.'; $string['clickflag'] = 'Flag question'; diff --git a/mod/forum/lang/en/forum.php b/mod/forum/lang/en/forum.php index 46584e8f8de..adba33ca6bf 100644 --- a/mod/forum/lang/en/forum.php +++ b/mod/forum/lang/en/forum.php @@ -497,11 +497,11 @@ $string['trackingoff'] = 'Off'; $string['trackingon'] = 'Forced'; $string['trackingoptional'] = 'Optional'; $string['trackingtype'] = 'Read tracking'; -$string['trackingtype_help'] = 'If enabled, participants can track read and unread posts in the forum and in discussions. There are three options: +$string['trackingtype_help'] = 'Read tracking enables participants to easily check which posts they have not yet seen by highlighting any new posts. -* Optional - Participants can choose whether to turn tracking on or off via a link in the administration block. Forum tracking must also be enabled in the user\'s profile settings. -* Forced - Tracking is always on, regardless of user setting. Available depending on administrative setting. -* Off - Read and unread posts are not tracked.'; +If set to optional, participants can choose whether to turn tracking on or off via a link in the administration block. (Users must also enable forum tracking in their forum preferences.) + +If \'Allow forced read tracking\' is enabled in the site administration, then a further option is available - forced. This means that tracking is always on, regardless of users\' forum preferences.'; $string['unread'] = 'Unread'; $string['unreadposts'] = 'Unread posts'; $string['unreadpostsnumber'] = '{$a} unread posts';