Merge branch 'MDL-26165' of git://github.com/timhunt/moodle

diff --combined mod/quiz/accessrules.php
index 054fdb9,bbb04e0..107eae6
--- 1/mod/quiz/accessrules.php
--- 2/mod/quiz/accessrules.php
+++ b/mod/quiz/accessrules.php
@@@ -231,7 -231,8 +231,8 @@@ class quiz_access_manager 
          if (!$unfinished) {
              $strconfirmstartattempt = $this->confirm_start_attempt_message();
              if ($strconfirmstartattempt) {
-                 $button->add_confirm_action($strconfirmstartattempt);
+                 $button->add_action(new confirm_action($strconfirmstartattempt, null,
+                         get_string('startattempt', 'quiz')));
              }
          }
  
@@@ -490,7 -491,7 +491,7 @@@ abstract class quiz_access_rule_base 
      }
  
      /**
 -     * If, becuase of this rule, the user has to finish their attempt by a certain time,
 +     * If, because of this rule, the user has to finish their attempt by a certain time,
       * you should override this method to return the amount of time left in seconds.
       * @param object $attempt the current attempt
       * @param int $timenow the time now. We don't use $this->_timenow, so we can

diff --combined mod/quiz/lang/en/quiz.php
index deaf6a7,dfc596f..479579c
--- 1/mod/quiz/lang/en/quiz.php
--- 2/mod/quiz/lang/en/quiz.php
+++ b/mod/quiz/lang/en/quiz.php
@@@ -175,7 -175,7 +175,7 @@@ $string['configshufflewithin'] = 'If yo
  $string['configtimelimit'] = 'Default time limit for quizzes in minutes. 0 mean no time limit.';
  $string['configtimelimitsec'] = 'Default time limit for quizzes in seconds. 0 mean no time limit.';
  $string['configurerandomquestion'] = 'Configure question';
- $string['confirmclose'] = 'You are about to close this attempt. Once you close the attempt you will no longer be able to change your answers.';
+ $string['confirmclose'] = 'Once you submit, you will no longer be able to change your answers for this attempt.';
  $string['confirmserverdelete'] = 'Are you sure you want to remove the server <b>{$a}</b> from the list?';
  $string['confirmstartattemptlimit'] = 'Number of attempts allowed:  {$a}. You are about to start a new attempt.  Do you wish to proceed?';
  $string['confirmstartattempttimelimit'] = 'This quiz has a time limit and is limited to {$a} attempt(s). You are about to start a new attempt.  Do you wish to proceed?';
@@@ -256,7 -256,7 +256,7 @@@ Thank you for submitting your answers t
  in course \'{$a->coursename}\'
  at {$a->submissiontime}.
  
 -This email confirms that we have safely received your answers.
 +This message confirms that we have safely received your answers.
  
  You can access this quiz at {$a->quizurl}.';
  $string['emailconfirmsmall'] = 'Thank you for submitting your answers to \'{$a->quizname}\'';
@@@ -550,8 -550,8 +550,8 @@@ $string['quizclosed'] = 'This quiz clos
  $string['quizcloses'] = 'Quiz closes';
  $string['quizcloseson'] = 'This quiz will close at {$a}';
  $string['quiz:deleteattempts'] = 'Delete quiz attempts';
 -$string['quiz:emailconfirmsubmission'] = 'Get email confirmation when submitting';
 -$string['quiz:emailnotifysubmission'] = 'Get email notification of submissions';
 +$string['quiz:emailconfirmsubmission'] = 'Get a confirmation message when submitting';
 +$string['quiz:emailnotifysubmission'] = 'Get a notification message when an attempt is submitted';
  $string['quiz:grade'] = 'Grade quizzes manually';
  $string['quiz:ignoretimelimits'] = 'Ignores time limit on quizzes';
  $string['quizisclosed'] = 'This quiz is closed';
@@@ -719,6 -719,7 +719,7 @@@ $string['sorttypealpha'] = 'Sort by typ
  $string['specificapathnotonquestion'] = 'The specified file path is not on the specified question';
  $string['specificquestionnotonquiz'] = 'Specified question is not on the specified quiz';
  $string['startagain'] = 'Start again';
+ $string['startattempt'] = 'Start attempt';
  $string['startedon'] = 'Started on';
  $string['startnewpreview'] = 'Start a new preview';
  $string['statenotloaded'] = 'The state for question {$a} has not been loaded from the database';