Merge branch 'MDL-27789-qe2plugins' of git://github.com/mudrd8mz/moodle

lang/en/plugin.php

@@ -86,6 +86,8 @@ $string['type_portfolio'] = 'Portfolio';
 $string['type_portfolio_plural'] = 'Portfolios';
 $string['type_profilefield'] = 'Profile field type';
 $string['type_profilefield_plural'] = 'Profile field types';
+$string['type_qbehaviour'] = 'Question behaviour';
+$string['type_qbehaviour_plural'] = 'Question behaviours';
 $string['type_qformat'] = 'Question import/export format';
 $string['type_qformat_plural'] = 'Question import/export formats';
 $string['type_qtype'] = 'Question type';

lib/pluginlib.php

@@ -289,6 +289,7 @@ class plugin_manager {
             ),
 
             'local' => array(
+                'qeupgradehelper'
             ),
 
             'message' => array(
@@ -316,6 +317,13 @@ class plugin_manager {
                 'checkbox', 'datetime', 'menu', 'text', 'textarea'
             ),
 
+            'qbehaviour' => array(
+                'adaptive', 'adaptivenopenalty', 'deferredcbm',
+                'deferredfeedback', 'immediatecbm', 'immediatefeedback',
+                'informationitem', 'interactive', 'interactivecountback',
+                'manualgraded', 'missing'
+            ),
+
             'qformat' => array(
                 'aiken', 'blackboard', 'blackboard_six', 'examview', 'gift',
                 'learnwise', 'missingword', 'multianswer', 'qti_two', 'webct',

question/behaviour/missing/lang/en/qbehaviour_missing.php

@@ -23,4 +23,5 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+$string['pluginname'] = 'Missing behaviour';
 $string['questionusedunknownmodel'] = 'This question was attempted with an behaviour that is not currently availalbe. We are attempting to show the question, but there may be problems.';