Merge branch 'MDL-11369_m32v2' of https://github.com/sbourget/moodle

diff --combined mod/choice/lang/en/choice.php
index bdfa60a,8d8b209..8e259b0
--- 1/mod/choice/lang/en/choice.php
--- 2/mod/choice/lang/en/choice.php
+++ b/mod/choice/lang/en/choice.php
@@@ -27,6 -27,8 +27,8 @@@ $string['addmorechoices'] = 'Add more c
  $string['allowupdate'] = 'Allow choice to be updated';
  $string['allowmultiple'] = 'Allow more than one choice to be selected';
  $string['answered'] = 'Answered';
+ $string['calendarend'] = 'Choice {$a} closes';
+ $string['calendarstart'] = 'Choice {$a} opens';
  $string['cannotsubmit'] = 'Sorry, there was a problem submitting your choice. Please try again.';
  $string['closebeforeopen'] = 'You have specified a close date before the open date.';
  $string['completionsubmit'] = 'Show as complete when user makes a choice';
@@@ -63,7 -65,6 +65,7 @@@ If limits are disabled then any number 
  $string['choice:readresponses'] = 'View responses';
  $string['choicesaved'] = 'Your choice has been saved';
  $string['choicetext'] = 'Choice text';
 +$string['choice:view'] = 'View choice activity';
  $string['chooseaction'] = 'Choose an action ...';
  $string['description'] = 'Description';
  $string['includeinactive'] = 'Include responses from inactive/suspended users';