Merge branch MDL-29187-master of git://github.com/samhemelryk/moodle

  - resolved conflict.

diff --cc backup/util/ui/renderer.php
Simple merge

diff --cc blocks/course_list/block_course_list.php
index e835657,7ea2ff6..3c773a6
--- 1/blocks/course_list/block_course_list.php
--- 2/blocks/course_list/block_course_list.php
+++ b/blocks/course_list/block_course_list.php
@@@ -75,9 -74,9 +76,9 @@@ class block_course_list extends block_l
                          $linkcss = $course->visible ? "" : " class=\"dimmed\" ";
  
                          $this->content->items[]="<a $linkcss title=\""
 -                                   . format_string($course->shortname)."\" ".
 +                                   . format_string($course->shortname, true, array('context' => $coursecontext))."\" ".
                                     "href=\"$CFG->wwwroot/course/view.php?id=$course->id\">"
-                                    .$icon. format_string($course->fullname) . "</a>";
+                                    .$icon. format_string($course->fullname, true, array('context' => get_context_instance(CONTEXT_COURSE, $course->id))) . "</a>";
                      }
                  /// If we can update any course of the view all isn't hidden, show the view all courses link
                      if (has_capability('moodle/course:update', get_context_instance(CONTEXT_SYSTEM)) || empty($CFG->block_course_list_hideallcourseslink)) {

diff --cc course/delete.php
index 3a4eb2f,a59a4e8..b0c1c31
--- 1/course/delete.php
--- 2/course/delete.php
+++ b/course/delete.php
@@@ -30,13 -30,13 +30,14 @@@
      }
  
      $category = $DB->get_record("course_categories", array("id"=>$course->category));
 +    $courseshortname = format_string($course->shortname, true, array('context' => get_context_instance(CONTEXT_COURSE, $course->id)));
+     $categoryname = format_string($category->name, true, array('context' => get_context_instance(CONTEXT_COURSECAT, $category->id)));
  
      $PAGE->navbar->add($stradministration, new moodle_url('/admin/index.php/'));
      $PAGE->navbar->add($strcategories, new moodle_url('/course/index.php'));
-     $PAGE->navbar->add($category->name, new moodle_url('/course/category.php', array('id'=>$course->category)));
+     $PAGE->navbar->add($categoryname, new moodle_url('/course/category.php', array('id'=>$course->category)));
      if (! $delete) {
 -        $strdeletecheck = get_string("deletecheck", "", $course->shortname);
 +        $strdeletecheck = get_string("deletecheck", "", $courseshortname);
          $strdeletecoursecheck = get_string("deletecoursecheck");
  
          $PAGE->navbar->add($strdeletecheck);

diff --cc course/lib.php
Simple merge

diff --cc lib/accesslib.php
Simple merge

diff --cc lib/navigationlib.php
Simple merge

diff --cc mod/feedback/item/info/lib.php
Simple merge