Merge branch 'MDL-37993-quiz-completion-pass-attempts' of git://github.com/MorrisR2...

diff --combined mod/quiz/lang/en/quiz.php
index 2ebae5f,e846254..22d4784
--- 1/mod/quiz/lang/en/quiz.php
--- 2/mod/quiz/lang/en/quiz.php
+++ b/mod/quiz/lang/en/quiz.php
@@@ -152,6 -152,10 +152,10 @@@ $string['comment'] = 'Comment'
  $string['commentorgrade'] = 'Make comment or override grade';
  $string['comments'] = 'Comments';
  $string['completedon'] = 'Completed on';
+ $string['completionpass'] = 'Require passing grade';
+ $string['completionpass_help'] = 'If enabled, this activity is considered complete when the student receives a passing grade, with the pass grade set in the gradebook.';
+ $string['completionattemptsexhausted'] = 'Or all available attempts completed';
+ $string['completionattemptsexhausted_help'] = 'Mark quiz complete when the student has exhausted the maximum number of attempts.';
  $string['configadaptive'] = 'If you choose Yes for this option then the student will be allowed multiple responses to a question even within the same attempt at the quiz.';
  $string['configattemptsallowed'] = 'Restriction on the number of attempts students are allowed at the quiz.';
  $string['configdecimaldigits'] = 'Number of digits that should be shown after the decimal point when displaying grades.';
@@@ -709,7 -713,6 +713,7 @@@ $string['reportregrade'] = 'Regrade att
  $string['reportresponses'] = 'Detailed responses';
  $string['reports'] = 'Reports';
  $string['reportshowonly'] = 'Show only attempts';
 +$string['reportshowonlyfinished'] = 'Show at most one finished attempt per user ({$a})';
  $string['reportsimplestat'] = 'Simple statistics';
  $string['reportusersall'] = 'all users who have attempted the quiz';
  $string['reportuserswith'] = 'enrolled users who have attempted the quiz';