From 70a102385f59854bfdb188c4e9e19194f816c53e Mon Sep 17 00:00:00 2001
From: Sam Hemelryk <sam@moodle.com>
Date: Thu, 26 Aug 2010 05:17:46 +0000
Subject: [PATCH] backup MDL-23918 Fixed up wording in the backup and restore
 stages.

---
 backup/moodle2/restore_section_task.class.php | 6 ++++++
 backup/util/ui/backup_ui_stage.class.php      | 2 +-
 lang/en/backup.php                            | 7 ++++---
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/backup/moodle2/restore_section_task.class.php b/backup/moodle2/restore_section_task.class.php
index 48b9d2289b2..454487cb53a 100644
--- a/backup/moodle2/restore_section_task.class.php
+++ b/backup/moodle2/restore_section_task.class.php
@@ -145,6 +145,12 @@ class restore_section_task extends restore_task {
         // Define section_included (to decide if the whole task must be really executed)
         $settingname = $settingprefix . 'included';
         $section_included = new restore_section_included_setting($settingname, base_setting::IS_BOOLEAN, true);
+        if (is_number($this->info->title)) {
+            $label = get_string('includesection', 'backup', $this->info->title);
+        } else {
+            $label = $this->info->title;
+        }
+        $section_included->get_ui()->set_label($label);
         $this->add_setting($section_included);
 
         // Define section_userinfo. Dependent of:
diff --git a/backup/util/ui/backup_ui_stage.class.php b/backup/util/ui/backup_ui_stage.class.php
index 2ac8c95f2ca..1d3a69952d5 100644
--- a/backup/util/ui/backup_ui_stage.class.php
+++ b/backup/util/ui/backup_ui_stage.class.php
@@ -346,7 +346,7 @@ class backup_ui_stage_confirmation extends backup_ui_stage {
                     $form->add_heading('rootsettings', get_string('rootsettings', 'backup'));
                 } else if (!$courseheading) {
                     // we havn't already add a course heading
-                    $form->add_heading('coursesettings', get_string('includeactivities', 'backup'));
+                    $form->add_heading('coursesettings', get_string('includeditems', 'backup'));
                     $courseheading = true;
                 }
                 // Iterate all settings, doesnt need to happen by reference
diff --git a/lang/en/backup.php b/lang/en/backup.php
index b339721c528..f5eaf636575 100644
--- a/lang/en/backup.php
+++ b/lang/en/backup.php
@@ -109,9 +109,10 @@ $string['importcurrentstage16'] = 'Complete';
 $string['importdeleting'] = 'Import deleting';
 $string['importdeletingdesc'] = 'Delete the contents of this course and then import the selected course';
 $string['importsuccess'] = 'Import complete. Click continue to return to the course.';
-$string['includeactivities'] = 'Choose activities to include';
-$string['includesection'] = 'Include section {$a}';
-$string['includeuserinfo'] = 'Include user information';
+$string['includeactivities'] = 'Include:';
+$string['includeditems'] = 'Included items:';
+$string['includesection'] = 'Section {$a}';
+$string['includeuserinfo'] = 'User data';
 $string['locked'] = 'Locked';
 $string['lockedbypermission'] = 'You don\'t have sufficient permissions to change this setting';
 $string['lockedbyconfig'] = 'This setting has been locked by the default backup settings';
-- 
2.17.1