diff --git a/admin/lib.php b/admin/lib.php index 7b4331961ca..ac698737e0a 100644 --- a/admin/lib.php +++ b/admin/lib.php @@ -35,5 +35,16 @@ function admin_page_type_list($pagetype, $parentcontext, $currentcontext) { 'admin-*' => get_string('page-admin-x', 'pagetype'), $pagetype => get_string('page-admin-current', 'pagetype') ); + // Add the missing * (any page) option for them. MDL-30340 + // TODO: These pages are really 'pagetype-varying' - MDL-30564 - + // and some day we should stop behaving that way, so proper pagetypes + // can be specified for it (like course-category-* or so). + // Luckly... the option we are introducing '*' is independent + // of that varying behavior, so will work. + if ($pagetype == 'admin-course-category') { + $array += array( + '*' => get_string('page-x', 'pagetype') + ); + } return $array; -} \ No newline at end of file +} diff --git a/admin/roles/admins.php b/admin/roles/admins.php index 450d432028e..1f5a8fe7217 100644 --- a/admin/roles/admins.php +++ b/admin/roles/admins.php @@ -67,6 +67,26 @@ if (optional_param('add', false, PARAM_BOOL) and confirm_sesskey()) { } } +} else if (optional_param('main', false, PARAM_BOOL) and confirm_sesskey()) { + if ($newmain = $admisselector->get_selected_users()) { + $newmain = reset($newmain); + $newmain = $newmain->id; + $admins = array(); + foreach(explode(',', $CFG->siteadmins) as $admin) { + $admin = (int)$admin; + if ($admin) { + $admins[$admin] = $admin; + } + } + + if (isset($admins[$newmain])) { + unset($admins[$newmain]); + array_unshift($admins, $newmain); + set_config('siteadmins', implode(',', $admins)); + redirect($PAGE->url); + } + } + } else if ($confirmadd and confirm_sesskey()) { $admins = array(); foreach(explode(',', $CFG->siteadmins) as $admin) { @@ -115,6 +135,7 @@ echo $OUTPUT->header();


+

diff --git a/admin/roles/lib.php b/admin/roles/lib.php index b09ed4f688a..68a3c8bb1c7 100644 --- a/admin/roles/lib.php +++ b/admin/roles/lib.php @@ -1584,13 +1584,31 @@ class admins_existing_selector extends user_selector_base { return array(); } - if ($search) { - $groupname = get_string('extusersmatching', 'role', $search); - } else { - $groupname = get_string('extusers', 'role'); + $mainadmin = array(); + $adminids = explode(',', $CFG->siteadmins); + foreach ($adminids as $id) { + if (isset($availableusers[$id])) { + $mainadmin = array($id=>$availableusers[$id]); + unset($availableusers[$id]); + break; + } } - return array($groupname => $availableusers); + $result = array(); + if ($mainadmin) { + $result[get_string('mainadmin', 'role')] = $mainadmin; + } + + if ($availableusers) { + if ($search) { + $groupname = get_string('extusersmatching', 'role', $search); + } else { + $groupname = get_string('extusers', 'role'); + } + $result[$groupname] = $availableusers; + } + + return $result; } protected function get_options() { diff --git a/admin/settings/security.php b/admin/settings/security.php index de44e51835f..382f3f26ea1 100644 --- a/admin/settings/security.php +++ b/admin/settings/security.php @@ -81,6 +81,7 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page $temp->add(new admin_setting_configcheckbox('cookiesecure', get_string('cookiesecure', 'admin'), get_string('configcookiesecure', 'admin'), 0)); $temp->add(new admin_setting_configcheckbox('cookiehttponly', get_string('cookiehttponly', 'admin'), get_string('configcookiehttponly', 'admin'), 0)); $temp->add(new admin_setting_configcheckbox('allowframembedding', get_string('allowframembedding', 'admin'), get_string('allowframembedding_help', 'admin'), 0)); + $temp->add(new admin_setting_configcheckbox('loginpasswordautocomplete', get_string('loginpasswordautocomplete', 'admin'), get_string('loginpasswordautocomplete_help', 'admin'), 0)); $ADMIN->add('security', $temp); diff --git a/admin/tool/customlang/db/upgrade.php b/admin/tool/customlang/db/upgrade.php index b0516b1df66..72792f4811f 100644 --- a/admin/tool/customlang/db/upgrade.php +++ b/admin/tool/customlang/db/upgrade.php @@ -29,7 +29,8 @@ function xmldb_tool_customlang_upgrade($oldversion) { $dbman = $DB->get_manager(); - + // Moodle v2.2.0 release upgrade line + // Put any upgrade step following this return true; } diff --git a/auth/manual/db/upgrade.php b/auth/manual/db/upgrade.php index 20348569075..21fead8086b 100644 --- a/auth/manual/db/upgrade.php +++ b/auth/manual/db/upgrade.php @@ -48,5 +48,8 @@ function xmldb_auth_manual_upgrade($oldversion) { // Moodle v2.1.0 release upgrade line // Put any upgrade step following this + // Moodle v2.2.0 release upgrade line + // Put any upgrade step following this + return true; } diff --git a/auth/mnet/db/upgrade.php b/auth/mnet/db/upgrade.php index 824d873e8e6..43d279162c0 100644 --- a/auth/mnet/db/upgrade.php +++ b/auth/mnet/db/upgrade.php @@ -46,5 +46,8 @@ function xmldb_auth_mnet_upgrade($oldversion) { // Moodle v2.1.0 release upgrade line // Put any upgrade step following this + // Moodle v2.2.0 release upgrade line + // Put any upgrade step following this + return true; } diff --git a/blocks/community/db/upgrade.php b/blocks/community/db/upgrade.php index d9b398fe8a0..8468201c666 100644 --- a/blocks/community/db/upgrade.php +++ b/blocks/community/db/upgrade.php @@ -76,5 +76,8 @@ function xmldb_block_community_upgrade($oldversion) { // Moodle v2.1.0 release upgrade line // Put any upgrade step following this + // Moodle v2.2.0 release upgrade line + // Put any upgrade step following this + return true; } \ No newline at end of file diff --git a/blocks/edit_form.php b/blocks/edit_form.php index 80b361ea3bf..9b7198c0c50 100644 --- a/blocks/edit_form.php +++ b/blocks/edit_form.php @@ -93,24 +93,44 @@ class block_edit_form extends moodleform { $mform->addElement('static', 'bui_homecontext', get_string('createdat', 'block'), print_context_name($parentcontext)); $mform->addHelpButton('bui_homecontext', 'createdat', 'block'); + // For pre-calculated (fixed) pagetype lists + $pagetypelist = array(); + // parse pagetype patterns $bits = explode('-', $this->page->pagetype); - $contextoptions = array(); - if ( ($parentcontext->contextlevel == CONTEXT_COURSE && $parentcontext->instanceid == SITEID) || - ($parentcontext->contextlevel == CONTEXT_SYSTEM)) { // Home page - if ($bits[0] == 'tag' || $bits[0] == 'admin') { - // tag and admin pages always use system context - // the contexts options don't make differences, so we use - // page type patterns only - $mform->addElement('hidden', 'bui_contexts', BUI_CONTEXTS_ENTIRE_SITE); - } else { - $contextoptions[BUI_CONTEXTS_FRONTPAGE_ONLY] = get_string('showonfrontpageonly', 'block'); - $contextoptions[BUI_CONTEXTS_FRONTPAGE_SUBS] = get_string('showonfrontpageandsubs', 'block'); - $contextoptions[BUI_CONTEXTS_ENTIRE_SITE] = get_string('showonentiresite', 'block'); - $mform->addElement('select', 'bui_contexts', get_string('contexts', 'block'), $contextoptions); - $mform->addHelpButton('bui_contexts', 'contexts', 'block'); - } + // First of all, check if we are editing blocks @ front-page or no and + // make some dark magic if so (MDL-30340) because each page context + // implies one (and only one) harcoded page-type that will be set later + // when processing the form data at {@link block_manager::process_url_edit()} + + // There are some conditions to check related to contexts + $ctxconditions = $this->page->context->contextlevel == CONTEXT_COURSE && + $this->page->context->instanceid == get_site()->id; + // And also some pagetype conditions + $pageconditions = isset($bits[0]) && isset($bits[1]) && $bits[0] == 'site' && $bits[1] == 'index'; + // So now we can be 100% sure if edition is happening at frontpage + $editingatfrontpage = $ctxconditions && $pageconditions; + + // Let the form to know about that, can be useful later + $mform->addElement('hidden', 'bui_editingatfrontpage', (int)$editingatfrontpage); + + // Front page, show the page-contexts element and set $pagetypelist to 'any page' (*) + // as unique option. Processign the form will do any change if needed + if ($editingatfrontpage) { + $contextoptions = array(); + $contextoptions[BUI_CONTEXTS_FRONTPAGE_ONLY] = get_string('showonfrontpageonly', 'block'); + $contextoptions[BUI_CONTEXTS_FRONTPAGE_SUBS] = get_string('showonfrontpageandsubs', 'block'); + $contextoptions[BUI_CONTEXTS_ENTIRE_SITE] = get_string('showonentiresite', 'block'); + $mform->addElement('select', 'bui_contexts', get_string('contexts', 'block'), $contextoptions); + $mform->addHelpButton('bui_contexts', 'contexts', 'block'); + $pagetypelist['*'] = '*'; // This is not going to be shown ever, it's an unique option + + // Any other system context block, hide the page-contexts element, + // it's always system-wide BUI_CONTEXTS_ENTIRE_SITE + } else if ($parentcontext->contextlevel == CONTEXT_SYSTEM) { + $mform->addElement('hidden', 'bui_contexts', BUI_CONTEXTS_ENTIRE_SITE); + } else if ($parentcontext->contextlevel == CONTEXT_COURSE) { // 0 means display on current context only, not child contexts // but if course managers select mod-* as pagetype patterns, block system will overwrite this option @@ -126,12 +146,10 @@ class block_edit_form extends moodleform { $mform->addElement('select', 'bui_contexts', get_string('contexts', 'block'), $contextoptions); } - $displaypagetypewarning = false; - if ($this->page->pagetype == 'site-index') { // No need for pagetype list on home page - $pagetypelist = array('*'=>get_string('page-x', 'pagetype')); - } else { - // Generate pagetype patterns by callbacks + // Generate pagetype patterns by callbacks if necessary (has not been set specifically) + if (empty($pagetypelist)) { $pagetypelist = generate_page_type_patterns($this->page->pagetype, $parentcontext, $this->page->context); + $displaypagetypewarning = false; if (!array_key_exists($this->block->instance->pagetypepattern, $pagetypelist)) { // Pushing block's existing page type pattern $pagetypestringname = 'page-'.str_replace('*', 'x', $this->block->instance->pagetypepattern); @@ -156,6 +174,25 @@ class block_edit_form extends moodleform { } else { $value = array_pop(array_keys($pagetypelist)); $mform->addElement('hidden', 'bui_pagetypepattern', $value); + // Now we are really hiding a lot (both page-contexts and page-type-patterns), + // specially in some systemcontext pages having only one option (my/user...) + // so, until it's decided if we are going to add the 'bring-back' pattern to + // all those pages or no (see MDL-30574), we are going to show the unique + // element statically + // TODO: Revisit this once MDL-30574 has been decided and implemented, although + // perhaps it's not bad to always show this statically when only one pattern is + // available. + if (!$editingatfrontpage) { + // Try to beautify it + $strvalue = $value; + $strkey = 'page-'.str_replace('*', 'x', $strvalue); + if (get_string_manager()->string_exists($strkey, 'pagetype')) { + $strvalue = get_string($strkey, 'pagetype'); + } + // Show as static (hidden has been set already) + $mform->addElement('static', 'bui_staticpagetypepattern', + get_string('restrictpagetypes','block'), $strvalue); + } } if ($this->page->subpage) { diff --git a/blocks/html/db/upgrade.php b/blocks/html/db/upgrade.php index 66e0a598778..3c4ba15c31d 100644 --- a/blocks/html/db/upgrade.php +++ b/blocks/html/db/upgrade.php @@ -66,5 +66,8 @@ function xmldb_block_html_upgrade($oldversion) { // Moodle v2.1.0 release upgrade line // Put any upgrade step following this + // Moodle v2.2.0 release upgrade line + // Put any upgrade step following this + return true; } diff --git a/blocks/login/block_login.php b/blocks/login/block_login.php index 0fc1f94c7ed..03868888fcb 100644 --- a/blocks/login/block_login.php +++ b/blocks/login/block_login.php @@ -48,7 +48,12 @@ class block_login extends block_base { $this->content->text .= ''; $this->content->text .= '
'; - $this->content->text .= '
'; + + if (!empty($CFG->loginpasswordautocomplete)) { + $this->content->text .= ''; + } else { + $this->content->text .= ''; + } if (isset($CFG->rememberusername) and $CFG->rememberusername == 2) { $checked = $username ? 'checked="checked"' : ''; diff --git a/blocks/navigation/db/upgrade.php b/blocks/navigation/db/upgrade.php index 60a5dad43f1..874fdfd5238 100644 --- a/blocks/navigation/db/upgrade.php +++ b/blocks/navigation/db/upgrade.php @@ -75,5 +75,8 @@ function xmldb_block_navigation_upgrade($oldversion, $block) { // Moodle v2.1.0 release upgrade line // Put any upgrade step following this + // Moodle v2.2.0 release upgrade line + // Put any upgrade step following this + return true; } \ No newline at end of file diff --git a/blocks/settings/db/upgrade.php b/blocks/settings/db/upgrade.php index 865fefc2b42..f4925369a9d 100644 --- a/blocks/settings/db/upgrade.php +++ b/blocks/settings/db/upgrade.php @@ -75,5 +75,8 @@ function xmldb_block_settings_upgrade($oldversion, $block) { // Moodle v2.1.0 release upgrade line // Put any upgrade step following this + // Moodle v2.2.0 release upgrade line + // Put any upgrade step following this + return true; } \ No newline at end of file diff --git a/course/format/scorm/version.php b/course/format/scorm/version.php new file mode 100644 index 00000000000..834435de436 --- /dev/null +++ b/course/format/scorm/version.php @@ -0,0 +1,30 @@ +. + +/** + * Version details + * + * @package format + * @subpackage scorm + * @copyright 1999 onwards Martin Dougiamas (http://dougiamas.com) + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ + +defined('MOODLE_INTERNAL') || die(); + +$plugin->version = 2011120100; // The current plugin version (Date: YYYYMMDDXX) +$plugin->requires = 2011120100; // Requires this Moodle version +$plugin->component = 'format_scorm'; // Full name of the plugin (used for diagnostics) diff --git a/course/format/social/version.php b/course/format/social/version.php new file mode 100644 index 00000000000..3096753b19c --- /dev/null +++ b/course/format/social/version.php @@ -0,0 +1,30 @@ +. + +/** + * Version details + * + * @package format + * @subpackage social + * @copyright 1999 onwards Martin Dougiamas (http://dougiamas.com) + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ + +defined('MOODLE_INTERNAL') || die(); + +$plugin->version = 2011120100; // The current plugin version (Date: YYYYMMDDXX) +$plugin->requires = 2011120100; // Requires this Moodle version +$plugin->component = 'format_social'; // Full name of the plugin (used for diagnostics) diff --git a/course/format/topics/version.php b/course/format/topics/version.php new file mode 100644 index 00000000000..fa0cfaac557 --- /dev/null +++ b/course/format/topics/version.php @@ -0,0 +1,30 @@ +. + +/** + * Version details + * + * @package format + * @subpackage topics + * @copyright 1999 onwards Martin Dougiamas (http://dougiamas.com) + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ + +defined('MOODLE_INTERNAL') || die(); + +$plugin->version = 2011120100; // The current plugin version (Date: YYYYMMDDXX) +$plugin->requires = 2011120100; // Requires this Moodle version +$plugin->component = 'format_topics'; // Full name of the plugin (used for diagnostics) diff --git a/course/format/weeks/version.php b/course/format/weeks/version.php new file mode 100644 index 00000000000..cf80a61ed36 --- /dev/null +++ b/course/format/weeks/version.php @@ -0,0 +1,30 @@ +. + +/** + * Version details + * + * @package format + * @subpackage weeks + * @copyright 1999 onwards Martin Dougiamas (http://dougiamas.com) + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ + +defined('MOODLE_INTERNAL') || die(); + +$plugin->version = 2011120100; // The current plugin version (Date: YYYYMMDDXX) +$plugin->requires = 2011120100; // Requires this Moodle version +$plugin->component = 'format_weeks'; // Full name of the plugin (used for diagnostics) diff --git a/enrol/authorize/db/upgrade.php b/enrol/authorize/db/upgrade.php index 51ff315d35f..3b33091dde7 100644 --- a/enrol/authorize/db/upgrade.php +++ b/enrol/authorize/db/upgrade.php @@ -96,5 +96,8 @@ function xmldb_enrol_authorize_upgrade($oldversion) { // Moodle v2.1.0 release upgrade line // Put any upgrade step following this + // Moodle v2.2.0 release upgrade line + // Put any upgrade step following this + return true; } diff --git a/enrol/database/db/upgrade.php b/enrol/database/db/upgrade.php index a29c338ed03..d140bca1852 100644 --- a/enrol/database/db/upgrade.php +++ b/enrol/database/db/upgrade.php @@ -39,5 +39,8 @@ function xmldb_enrol_database_upgrade($oldversion) { } + // Moodle v2.2.0 release upgrade line + // Put any upgrade step following this + return true; } diff --git a/enrol/database/lib.php b/enrol/database/lib.php index 306f8b353a9..33ddad47fce 100644 --- a/enrol/database/lib.php +++ b/enrol/database/lib.php @@ -185,7 +185,7 @@ class enrol_database_plugin extends enrol_plugin { $existing = array(); foreach ($current as $r) { - if (in_array($r->id, $roles)) { + if (in_array($r->roleid, $roles)) { $existing[$r->roleid] = $r->roleid; } else { role_unassign($r->roleid, $user->id, $context->id, 'enrol_database', $instance->id); diff --git a/enrol/flatfile/db/upgrade.php b/enrol/flatfile/db/upgrade.php index 2cb5a4c724b..03a5e0f8ea3 100644 --- a/enrol/flatfile/db/upgrade.php +++ b/enrol/flatfile/db/upgrade.php @@ -62,6 +62,8 @@ function xmldb_enrol_flatfile_upgrade($oldversion) { upgrade_plugin_savepoint(true, 2010091400, 'enrol', 'flatfile'); } + // Moodle v2.2.0 release upgrade line + // Put any upgrade step following this return $result; } diff --git a/enrol/guest/db/upgrade.php b/enrol/guest/db/upgrade.php new file mode 100644 index 00000000000..b19b5a6dc7b --- /dev/null +++ b/enrol/guest/db/upgrade.php @@ -0,0 +1,46 @@ +. + +/** + * This file keeps track of upgrades to the guest enrolment plugin + * + * @package enrol + * @subpackage guest + * @copyright 2011 Petr Skoda {@link http://skodak.org + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ + +defined('MOODLE_INTERNAL') || die(); + +function xmldb_enrol_guest_upgrade($oldversion) { + global $CFG, $DB, $OUTPUT; + + $dbman = $DB->get_manager(); + + // Moodle v2.2.0 release upgrade line + // Put any upgrade step following this + + if ($oldversion < 2011112901) { + // convert all null passwords to empty strings + $DB->set_field('enrol', 'password', '', array('enrol'=>'guest', 'password'=>null)); + + upgrade_plugin_savepoint(true, 2011112901, 'enrol', 'guest'); + } + + return true; +} + + diff --git a/enrol/guest/lib.php b/enrol/guest/lib.php index ac4a5cf8963..da1d2f16800 100644 --- a/enrol/guest/lib.php +++ b/enrol/guest/lib.php @@ -327,6 +327,22 @@ class enrol_guest_plugin extends enrol_plugin { } } + /** + * Add new instance of enrol plugin. + * @param object $course + * @param array instance fields + * @return int id of new instance, null if can not be created + */ + public function add_instance($course, array $fields = NULL) { + $fields = (array)$fields; + + if (!isset($fields['password'])) { + $fields['password'] = ''; + } + + return parent::add_instance($course, $fields); + } + /** * Add new instance of enrol plugin with default settings. * @param object $course diff --git a/enrol/guest/version.php b/enrol/guest/version.php index 0f235c6a0d6..125592f212b 100644 --- a/enrol/guest/version.php +++ b/enrol/guest/version.php @@ -25,6 +25,6 @@ defined('MOODLE_INTERNAL') || die(); -$plugin->version = 2011112900; // The current plugin version (Date: YYYYMMDDXX) +$plugin->version = 2011112901; // The current plugin version (Date: YYYYMMDDXX) $plugin->requires = 2011112900; // Requires this Moodle version $plugin->component = 'enrol_guest'; // Full name of the plugin (used for diagnostics) diff --git a/enrol/imsenterprise/db/upgrade.php b/enrol/imsenterprise/db/upgrade.php index 36291c56e21..526eafa2761 100644 --- a/enrol/imsenterprise/db/upgrade.php +++ b/enrol/imsenterprise/db/upgrade.php @@ -83,6 +83,9 @@ function xmldb_enrol_imsenterprise_upgrade($oldversion) { // Moodle v2.1.0 release upgrade line // Put any upgrade step following this + // Moodle v2.2.0 release upgrade line + // Put any upgrade step following this + return true; } diff --git a/enrol/imsenterprise/lib.php b/enrol/imsenterprise/lib.php index 2dec772c251..e9e90fad343 100644 --- a/enrol/imsenterprise/lib.php +++ b/enrol/imsenterprise/lib.php @@ -403,6 +403,10 @@ function process_group_tag($tagcontents) { $courseid = $DB->insert_record('course', $course); + // Setup default enrolment plugins + $course->id = $courseid; + enrol_course_updated(true, $course, null); + // Setup the blocks $course = $DB->get_record('course', array('id' => $courseid)); blocks_add_default_course_blocks($course); diff --git a/enrol/mnet/db/upgrade.php b/enrol/mnet/db/upgrade.php index 536eebd12a9..df424b48cfd 100644 --- a/enrol/mnet/db/upgrade.php +++ b/enrol/mnet/db/upgrade.php @@ -39,5 +39,8 @@ function xmldb_enrol_mnet_upgrade($oldversion) { // Moodle v2.1.0 release upgrade line // Put any upgrade step following this + // Moodle v2.2.0 release upgrade line + // Put any upgrade step following this + return true; } diff --git a/enrol/paypal/db/upgrade.php b/enrol/paypal/db/upgrade.php index 61d30a185e7..44cd8832951 100644 --- a/enrol/paypal/db/upgrade.php +++ b/enrol/paypal/db/upgrade.php @@ -62,5 +62,8 @@ function xmldb_enrol_paypal_upgrade($oldversion) { // Moodle v2.1.0 release upgrade line // Put any upgrade step following this + // Moodle v2.2.0 release upgrade line + // Put any upgrade step following this + return true; } diff --git a/filter/emailprotect/vesion.php b/filter/emailprotect/version.php similarity index 100% rename from filter/emailprotect/vesion.php rename to filter/emailprotect/version.php diff --git a/filter/mediaplugin/db/upgrade.php b/filter/mediaplugin/db/upgrade.php index 4de8809e341..9aee35bd738 100644 --- a/filter/mediaplugin/db/upgrade.php +++ b/filter/mediaplugin/db/upgrade.php @@ -46,5 +46,8 @@ function xmldb_filter_mediaplugin_upgrade($oldversion) { // Moodle v2.1.0 release upgrade line // Put any upgrade step following this + // Moodle v2.2.0 release upgrade line + // Put any upgrade step following this + return true; } diff --git a/filter/tex/db/upgrade.php b/filter/tex/db/upgrade.php index b9f7497772b..33d41bd0ddf 100644 --- a/filter/tex/db/upgrade.php +++ b/filter/tex/db/upgrade.php @@ -41,5 +41,8 @@ function xmldb_filter_tex_upgrade($oldversion) { // Moodle v2.1.0 release upgrade line // Put any upgrade step following this + // Moodle v2.2.0 release upgrade line + // Put any upgrade step following this + return true; } diff --git a/grade/grading/form/rubric/db/upgrade.php b/grade/grading/form/rubric/db/upgrade.php index 3afebbd3db0..e60160dad1a 100644 --- a/grade/grading/form/rubric/db/upgrade.php +++ b/grade/grading/form/rubric/db/upgrade.php @@ -35,5 +35,8 @@ function xmldb_gradingform_rubric_upgrade($oldversion) { $dbman = $DB->get_manager(); + // Moodle v2.2.0 release upgrade line + // Put any upgrade step following this + return true; } diff --git a/grade/report/user/index.php b/grade/report/user/index.php index a452a333721..2802c9d59ca 100644 --- a/grade/report/user/index.php +++ b/grade/report/user/index.php @@ -103,7 +103,7 @@ if (has_capability('moodle/grade:viewall', $context)) { //Teachers will see all if ($user_selector) { $renderer = $PAGE->get_renderer('gradereport_user'); - echo $renderer->graded_users_selector('user', $course, $userid, $currentgroup, false); + echo $renderer->graded_users_selector('user', $course, $userid, $currentgroup, true); } while ($userdata = $gui->next_user()) { diff --git a/index.php b/index.php index d6424a52b8c..232abdcd01d 100644 --- a/index.php +++ b/index.php @@ -58,7 +58,7 @@ // Redirect logged-in users to My Moodle overview if required if (optional_param('setdefaulthome', false, PARAM_BOOL)) { set_user_preference('user_home_page_preference', HOMEPAGE_SITE); - } else if ($CFG->defaulthomepage == HOMEPAGE_MY && (optional_param('redirect', true, PARAM_BOOL) || !$hassiteconfig)) { + } else if ($CFG->defaulthomepage == HOMEPAGE_MY && optional_param('redirect', 1, PARAM_BOOL) === 1) { redirect($CFG->wwwroot .'/my/'); } else if (!empty($CFG->defaulthomepage) && $CFG->defaulthomepage == HOMEPAGE_USER) { $PAGE->settingsnav->get('usercurrentsettings')->add(get_string('makethismyhome'), new moodle_url('/', array('setdefaulthome'=>true)), navigation_node::TYPE_SETTING); diff --git a/install/lang/af/admin.php b/install/lang/af/admin.php index 8f2317035e2..3e7e0eed674 100644 --- a/install/lang/af/admin.php +++ b/install/lang/af/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/af/langconfig.php b/install/lang/af/langconfig.php index 9ec41baa9c2..7e4d4fd4058 100644 --- a/install/lang/af/langconfig.php +++ b/install/lang/af/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/am/install.php b/install/lang/am/install.php index 711048a9c39..0d25e3e4842 100644 --- a/install/lang/am/install.php +++ b/install/lang/am/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/am/langconfig.php b/install/lang/am/langconfig.php index 2184283f5d3..6448a2b7869 100644 --- a/install/lang/am/langconfig.php +++ b/install/lang/am/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/am/moodle.php b/install/lang/am/moodle.php index ff3a3927ca8..9b94e9c61cf 100644 --- a/install/lang/am/moodle.php +++ b/install/lang/am/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ar/admin.php b/install/lang/ar/admin.php index 833772e360a..8b7cfb96b57 100644 --- a/install/lang/ar/admin.php +++ b/install/lang/ar/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ar/error.php b/install/lang/ar/error.php index f287e93fce8..c374dffab3b 100644 --- a/install/lang/ar/error.php +++ b/install/lang/ar/error.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ar/install.php b/install/lang/ar/install.php index 8ec2c489863..d422ea0fcf5 100644 --- a/install/lang/ar/install.php +++ b/install/lang/ar/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ar/langconfig.php b/install/lang/ar/langconfig.php index d57f6789691..5e241fda978 100644 --- a/install/lang/ar/langconfig.php +++ b/install/lang/ar/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ar/moodle.php b/install/lang/ar/moodle.php index a31788f02dd..4f69811de7a 100644 --- a/install/lang/ar/moodle.php +++ b/install/lang/ar/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ast/admin.php b/install/lang/ast/admin.php index c6f7f60fe36..2e732d283a2 100644 --- a/install/lang/ast/admin.php +++ b/install/lang/ast/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ast/error.php b/install/lang/ast/error.php index 049e3a04bae..128aba82158 100644 --- a/install/lang/ast/error.php +++ b/install/lang/ast/error.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ast/install.php b/install/lang/ast/install.php index 11da8374274..0c21e014975 100644 --- a/install/lang/ast/install.php +++ b/install/lang/ast/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ast/langconfig.php b/install/lang/ast/langconfig.php index cbfa52a796c..0c8a1e5608e 100644 --- a/install/lang/ast/langconfig.php +++ b/install/lang/ast/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ast/moodle.php b/install/lang/ast/moodle.php index 3658f3d72a2..0877bd2ddca 100644 --- a/install/lang/ast/moodle.php +++ b/install/lang/ast/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/az/admin.php b/install/lang/az/admin.php index 3ae8cae6b78..49b0e3072f0 100644 --- a/install/lang/az/admin.php +++ b/install/lang/az/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/az/error.php b/install/lang/az/error.php index e7fa541f285..986fc6d361c 100644 --- a/install/lang/az/error.php +++ b/install/lang/az/error.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/az/install.php b/install/lang/az/install.php index 7b0a16a4001..65c5e2d7f23 100644 --- a/install/lang/az/install.php +++ b/install/lang/az/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/az/langconfig.php b/install/lang/az/langconfig.php index 924503224b4..884423cb005 100644 --- a/install/lang/az/langconfig.php +++ b/install/lang/az/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/be/langconfig.php b/install/lang/be/langconfig.php index ecad0ad626a..5fd35d7993e 100644 --- a/install/lang/be/langconfig.php +++ b/install/lang/be/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/be/moodle.php b/install/lang/be/moodle.php index 71e43e5d806..974405214d7 100644 --- a/install/lang/be/moodle.php +++ b/install/lang/be/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/bg/admin.php b/install/lang/bg/admin.php index 24f114d4cdf..b35cc865085 100644 --- a/install/lang/bg/admin.php +++ b/install/lang/bg/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/bg/error.php b/install/lang/bg/error.php index d761ca504da..22c14b2bdb4 100644 --- a/install/lang/bg/error.php +++ b/install/lang/bg/error.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/bg/install.php b/install/lang/bg/install.php index 716717efe68..c4c402cd02e 100644 --- a/install/lang/bg/install.php +++ b/install/lang/bg/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/bg/langconfig.php b/install/lang/bg/langconfig.php index 60eaad648e8..f46055556ec 100644 --- a/install/lang/bg/langconfig.php +++ b/install/lang/bg/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/bg/moodle.php b/install/lang/bg/moodle.php index 218a3f914cd..bbcbdb6faf8 100644 --- a/install/lang/bg/moodle.php +++ b/install/lang/bg/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/bn/admin.php b/install/lang/bn/admin.php index 5d4de96b1b2..e8eb4917203 100644 --- a/install/lang/bn/admin.php +++ b/install/lang/bn/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/bn/install.php b/install/lang/bn/install.php index fa5129f24d7..d3eb440844c 100644 --- a/install/lang/bn/install.php +++ b/install/lang/bn/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/bn/langconfig.php b/install/lang/bn/langconfig.php index c3b92d3d772..97e85c1f8f1 100644 --- a/install/lang/bn/langconfig.php +++ b/install/lang/bn/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/bn/moodle.php b/install/lang/bn/moodle.php index 6ffbb53cd6d..d4737f7f21f 100644 --- a/install/lang/bn/moodle.php +++ b/install/lang/bn/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/bs/install.php b/install/lang/bs/install.php index 99230a88de2..47fc65ce27f 100644 --- a/install/lang/bs/install.php +++ b/install/lang/bs/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/bs/langconfig.php b/install/lang/bs/langconfig.php index b622e39a2bd..1cc76f6060b 100644 --- a/install/lang/bs/langconfig.php +++ b/install/lang/bs/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ca/admin.php b/install/lang/ca/admin.php index 573916f357d..ffb19b6cb7e 100644 --- a/install/lang/ca/admin.php +++ b/install/lang/ca/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ca/error.php b/install/lang/ca/error.php index b6dc99d3a45..19bf2ce59c3 100644 --- a/install/lang/ca/error.php +++ b/install/lang/ca/error.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ca/install.php b/install/lang/ca/install.php index 19a10aaabc2..f8cef2b133b 100644 --- a/install/lang/ca/install.php +++ b/install/lang/ca/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ca/langconfig.php b/install/lang/ca/langconfig.php index c5c29f7c705..8672b5715c6 100644 --- a/install/lang/ca/langconfig.php +++ b/install/lang/ca/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ca/moodle.php b/install/lang/ca/moodle.php index 6c7ea38d91f..1c76f6d8383 100644 --- a/install/lang/ca/moodle.php +++ b/install/lang/ca/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ckb/langconfig.php b/install/lang/ckb/langconfig.php index 4901cd2c400..fcfc54d074f 100644 --- a/install/lang/ckb/langconfig.php +++ b/install/lang/ckb/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/cs/admin.php b/install/lang/cs/admin.php index b620dd42b56..d66e30f805d 100644 --- a/install/lang/cs/admin.php +++ b/install/lang/cs/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/cs/error.php b/install/lang/cs/error.php index 7077ab649ca..1dcb28bd165 100644 --- a/install/lang/cs/error.php +++ b/install/lang/cs/error.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/cs/install.php b/install/lang/cs/install.php index 8463281ccce..c63205bee14 100644 --- a/install/lang/cs/install.php +++ b/install/lang/cs/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was @@ -34,12 +34,14 @@ $string['admindirname'] = 'Adresář se soubory pro správu serveru'; $string['availablelangs'] = 'Dostupné jazykové balíčky'; $string['chooselanguagehead'] = 'Vyberte jazyk'; $string['chooselanguagesub'] = 'Zvolte si jazyk tohoto průvodce instalací. Vybraný jazyk bude též nastaven jako výchozí jazyk stránek, ale to půjde případně později změnit.'; +$string['clialreadyconfigured'] = 'Soubor config.php již existuje. Spusťte admin/cli/install_database.php, pokud chcete provést instalaci databáze.'; $string['clialreadyinstalled'] = 'Soubor config.php již existuje. Spusťte admin/cli/upgrade.php, pokud chcete provést upgrade vašich stránek.'; $string['cliinstallheader'] = 'Moodle {$a} - průvodce instalací z příkazové řádky'; $string['databasehost'] = 'Databázový server'; $string['databasename'] = 'Název databáze'; $string['databasetypehead'] = 'Vyberte databázový ovladač'; $string['dataroot'] = 'Datový adresář'; +$string['datarootpermission'] = 'Přístupová práva k datovému adresáři'; $string['dbprefix'] = 'Předpona tabulek'; $string['dirroot'] = 'Adresář Moodlu'; $string['environmenthead'] = 'Kontrola programového prostředí...'; diff --git a/install/lang/cs/langconfig.php b/install/lang/cs/langconfig.php index 76dc93a0c52..09613c57037 100644 --- a/install/lang/cs/langconfig.php +++ b/install/lang/cs/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/cs/moodle.php b/install/lang/cs/moodle.php index 4fe8128dc2d..469d73765e3 100644 --- a/install/lang/cs/moodle.php +++ b/install/lang/cs/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/cy/admin.php b/install/lang/cy/admin.php index 32d176ccbf0..ef0f3bb373e 100644 --- a/install/lang/cy/admin.php +++ b/install/lang/cy/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/cy/error.php b/install/lang/cy/error.php index eefeb401a7b..3ba3d5014d9 100644 --- a/install/lang/cy/error.php +++ b/install/lang/cy/error.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/cy/install.php b/install/lang/cy/install.php index 7925c840ef9..08593603419 100644 --- a/install/lang/cy/install.php +++ b/install/lang/cy/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/cy/langconfig.php b/install/lang/cy/langconfig.php index 06bddd52f74..8d3783d83cc 100644 --- a/install/lang/cy/langconfig.php +++ b/install/lang/cy/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/cy/moodle.php b/install/lang/cy/moodle.php index a68ee936df8..f2f4b6b5ce4 100644 --- a/install/lang/cy/moodle.php +++ b/install/lang/cy/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/da/admin.php b/install/lang/da/admin.php index aecb5bef218..c11ac3879fe 100644 --- a/install/lang/da/admin.php +++ b/install/lang/da/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/da/error.php b/install/lang/da/error.php index 614fa44840b..ebe9f4e6d50 100644 --- a/install/lang/da/error.php +++ b/install/lang/da/error.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/da/install.php b/install/lang/da/install.php index d3c4cd1b500..dc5d0fed022 100644 --- a/install/lang/da/install.php +++ b/install/lang/da/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was @@ -34,7 +34,7 @@ $string['admindirname'] = 'Admin-mappe'; $string['availablelangs'] = 'Tilgængelige sprogpakker'; $string['chooselanguagehead'] = 'Vælg et sprog'; $string['chooselanguagesub'] = 'Vælg et sprog til brug under installationen. Dette sprog vil også blive brugt som standardsprog på webstedet, men det kan altid ændres til et andet sprog.'; -$string['clialreadyinstalled'] = 'Filen config.php eksisterer allerede, brug venligst admin/cli/upgrade.php hvis du ønsker at opgradere dit websted.'; +$string['clialreadyinstalled'] = 'Filen config.php eksisterer allerede, brug venligst admin/cli/upgrade.php hvis du ønsker at opgradere dette websted.'; $string['cliinstallheader'] = 'Moodle {$a} kommandolinje-installationsprogram'; $string['databasehost'] = 'Databasevært'; $string['databasename'] = 'Databasenavn'; diff --git a/install/lang/da/langconfig.php b/install/lang/da/langconfig.php index 0caf23935cf..765da062091 100644 --- a/install/lang/da/langconfig.php +++ b/install/lang/da/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/da/moodle.php b/install/lang/da/moodle.php index 3c9559aa708..ec55822838d 100644 --- a/install/lang/da/moodle.php +++ b/install/lang/da/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/de/admin.php b/install/lang/de/admin.php index 18ee033036a..91b80c0bdc8 100644 --- a/install/lang/de/admin.php +++ b/install/lang/de/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/de/error.php b/install/lang/de/error.php index 8e068f11205..ddd00515b7f 100644 --- a/install/lang/de/error.php +++ b/install/lang/de/error.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/de/install.php b/install/lang/de/install.php index 6e1bd1b0569..76421c3c6ef 100644 --- a/install/lang/de/install.php +++ b/install/lang/de/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/de/langconfig.php b/install/lang/de/langconfig.php index 5f3329eae72..ff65bd4a3dd 100644 --- a/install/lang/de/langconfig.php +++ b/install/lang/de/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/de/moodle.php b/install/lang/de/moodle.php index 7a48a53dca3..04db977c202 100644 --- a/install/lang/de/moodle.php +++ b/install/lang/de/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/de_du/error.php b/install/lang/de_du/error.php index 91489f3be7f..323ec56e3b6 100644 --- a/install/lang/de_du/error.php +++ b/install/lang/de_du/error.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/de_du/install.php b/install/lang/de_du/install.php index fc0f5b30fc9..8f803a6ef18 100644 --- a/install/lang/de_du/install.php +++ b/install/lang/de_du/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/de_du/langconfig.php b/install/lang/de_du/langconfig.php index 860366b0409..f5b15115d8d 100644 --- a/install/lang/de_du/langconfig.php +++ b/install/lang/de_du/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/de_kids/langconfig.php b/install/lang/de_kids/langconfig.php index 202a890f60b..454dc479ede 100644 --- a/install/lang/de_kids/langconfig.php +++ b/install/lang/de_kids/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/dv/admin.php b/install/lang/dv/admin.php index f63370b0570..cebfe87828b 100644 --- a/install/lang/dv/admin.php +++ b/install/lang/dv/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/dv/error.php b/install/lang/dv/error.php index 066eb28ff0e..ee7a3e76c9b 100644 --- a/install/lang/dv/error.php +++ b/install/lang/dv/error.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/dv/install.php b/install/lang/dv/install.php index 21edf30d74a..4aa4caf5cc9 100644 --- a/install/lang/dv/install.php +++ b/install/lang/dv/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/dv/langconfig.php b/install/lang/dv/langconfig.php index 430cb8004b0..d73f6674b7a 100644 --- a/install/lang/dv/langconfig.php +++ b/install/lang/dv/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/dv/moodle.php b/install/lang/dv/moodle.php index 938708b61c6..e1f80faaa5d 100644 --- a/install/lang/dv/moodle.php +++ b/install/lang/dv/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/el/admin.php b/install/lang/el/admin.php index eef32ef7a87..4bdc3a36c0b 100644 --- a/install/lang/el/admin.php +++ b/install/lang/el/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/el/error.php b/install/lang/el/error.php index 4c9ab55e1f7..1a0ca356851 100644 --- a/install/lang/el/error.php +++ b/install/lang/el/error.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/el/install.php b/install/lang/el/install.php index e60b7af4e0d..5ce4da5696c 100644 --- a/install/lang/el/install.php +++ b/install/lang/el/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/el/langconfig.php b/install/lang/el/langconfig.php index c3e337cfb88..647c9b65ad4 100644 --- a/install/lang/el/langconfig.php +++ b/install/lang/el/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/el/moodle.php b/install/lang/el/moodle.php index eab715b690f..932b3598dfb 100644 --- a/install/lang/el/moodle.php +++ b/install/lang/el/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/en/admin.php b/install/lang/en/admin.php index 07394712ce6..a1b495ecd68 100644 --- a/install/lang/en/admin.php +++ b/install/lang/en/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/en/error.php b/install/lang/en/error.php index 7b9c71391fc..9dd01780393 100644 --- a/install/lang/en/error.php +++ b/install/lang/en/error.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/en/install.php b/install/lang/en/install.php index 652120c257e..474907a5166 100644 --- a/install/lang/en/install.php +++ b/install/lang/en/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/en/langconfig.php b/install/lang/en/langconfig.php index f53d7e11200..00b9943d555 100644 --- a/install/lang/en/langconfig.php +++ b/install/lang/en/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/en/moodle.php b/install/lang/en/moodle.php index af0a936b0ce..deea583d4d6 100644 --- a/install/lang/en/moodle.php +++ b/install/lang/en/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/en_us/install.php b/install/lang/en_us/install.php index a06bdd56a42..7297a550cb1 100644 --- a/install/lang/en_us/install.php +++ b/install/lang/en_us/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/en_us/langconfig.php b/install/lang/en_us/langconfig.php index e1e807c5985..6c32e579e45 100644 --- a/install/lang/en_us/langconfig.php +++ b/install/lang/en_us/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/es/admin.php b/install/lang/es/admin.php index 0d23d2f53c5..cf8b468bdf3 100644 --- a/install/lang/es/admin.php +++ b/install/lang/es/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/es/error.php b/install/lang/es/error.php index 545c1240410..753173310f3 100644 --- a/install/lang/es/error.php +++ b/install/lang/es/error.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/es/install.php b/install/lang/es/install.php index f834135d680..caf44907a1f 100644 --- a/install/lang/es/install.php +++ b/install/lang/es/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was @@ -34,7 +34,8 @@ $string['admindirname'] = 'Directorio Admin'; $string['availablelangs'] = 'Lista de idiomas disponibles'; $string['chooselanguagehead'] = 'Seleccionar idioma'; $string['chooselanguagesub'] = 'Por favor, seleccione un idioma para el proceso de instalación. Este idioma se usará también como idioma por defecto del sitio, si bien puede cambiarse más adelante.'; -$string['clialreadyinstalled'] = 'El archivo config.php ya existe, por favor, utilice admin/cli/upgrade.php si desea actualizar su sitio web.'; +$string['clialreadyconfigured'] = 'El archivo config.php ya existe. Por favor, utilice admin/cli/upgrade.php si desea actualizar su sitio web.'; +$string['clialreadyinstalled'] = 'El archivo config.php ya existe. Por favor, utilice admin/cli/upgrade.php si desea actualizar su sitio web.'; $string['cliinstallheader'] = 'Programa de instalación Moodle de línea de comando {$a}'; $string['databasehost'] = 'Servidor de la base de datos'; $string['databasename'] = 'Nombre de la base de datos'; @@ -71,9 +72,9 @@ $string['pathsrodataroot'] = 'El directorio dataroot no tiene permisos de escrit $string['pathsroparentdataroot'] = 'El directorio padre ({$a->parent}) no tiene permisos de escritura. El directorio de los datos ({$a->dataroot}) no puede ser creado por el instalador.'; $string['pathssubadmindir'] = 'Muy pocos servidores web usan /admin como un URL especial para acceder a un panel de control o algo similar. Lamentablemente, esto entra en conflicto con la ubicación estándar para las páginas de administración de Moodle. Usted puede solucionar este problema, renombrando el directorio admin en su instalación Moodle, poniendo un nuevo nombre aquí. Por ejemplo: moodleadmin . Esto solucionará los enlaces de administración en instalación Moodle.'; -$string['pathssubdataroot'] = 'Usted necesita un lugar donde Moodle puede guardar los archivos subidos. Este directorio debe ser leíble Y ESCRIBIBLE por el usuario del servidor web (por lo general \'nobody\', \'apache\' o \'www-data\'), pero este lugar no debe ser accesible directamente a través de la web. El instalador tratará crearlo si no existe.'; +$string['pathssubdataroot'] = 'Usted necesita un espacio donde Moodle puede guardar los archivos subidos. En este directorio debe poder LEER y ESCRIBIR el usuario del servidor web (por lo general \'nobody\', \'apache\' o \'www-data\'), pero no debe poderse acceder a esta carpeta directamente a través de la web. El instalador tratará de crearla si no existe.'; $string['pathssubdirroot'] = 'Ruta completa del directorio de instalación de Moodle.'; -$string['pathssubwwwroot'] = 'Dirección web completa donde Moodle será accesado. No es posible acceder a Moodle utilizando múltiples direcciones. Si su sitio tiene varias direcciones públicas debe configurar redirecciones permanentes en todos ellas, excepto en ésta. Si su sitio web es accesible tanto desde una intranet y la Internet, utilice la dirección pública aquí y configure su DNS para que los usuarios de su intranet puedan utilizar la dirección pública también.'; +$string['pathssubwwwroot'] = 'Dirección web completa para acceder a Moodle. No es posible acceder a Moodle utilizando múltiples direcciones. Si su sitio tiene varias direcciones públicas debe configurar redirecciones permanentes en todas ellas, excepto en ésta. Si su sitio web es accesible tanto desde una intranet como desde Internet, escriba aquí la dirección pública y configure su DNS para que los usuarios de su intranet puedan también utilizar la dirección pública.'; $string['pathsunsecuredataroot'] = 'La ubicación de dataroot no es segura'; $string['pathswrongadmindir'] = 'El directorio admin no existe'; $string['phpextension'] = 'Extensión PHP {$a}'; diff --git a/install/lang/es/langconfig.php b/install/lang/es/langconfig.php index 4f668e979a2..6fefc1784f0 100644 --- a/install/lang/es/langconfig.php +++ b/install/lang/es/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/es/moodle.php b/install/lang/es/moodle.php index ded914a6ecb..fd0543cce01 100644 --- a/install/lang/es/moodle.php +++ b/install/lang/es/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/es_ar/langconfig.php b/install/lang/es_ar/langconfig.php index a4f84a5b08f..fc5c484046e 100644 --- a/install/lang/es_ar/langconfig.php +++ b/install/lang/es_ar/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/es_es/langconfig.php b/install/lang/es_es/langconfig.php index 58ae4eb877a..dbc154cf565 100644 --- a/install/lang/es_es/langconfig.php +++ b/install/lang/es_es/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/es_mx/langconfig.php b/install/lang/es_mx/langconfig.php index 42d02285747..05f1ebd0321 100644 --- a/install/lang/es_mx/langconfig.php +++ b/install/lang/es_mx/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/et/admin.php b/install/lang/et/admin.php index ee2521a177a..90e4a675bd1 100644 --- a/install/lang/et/admin.php +++ b/install/lang/et/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/et/error.php b/install/lang/et/error.php index eaf101c6e6d..b3d0fe65d01 100644 --- a/install/lang/et/error.php +++ b/install/lang/et/error.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/et/install.php b/install/lang/et/install.php index f29e2fbecc0..5ec8b1972fe 100644 --- a/install/lang/et/install.php +++ b/install/lang/et/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/et/langconfig.php b/install/lang/et/langconfig.php index 93336927844..2299cf355be 100644 --- a/install/lang/et/langconfig.php +++ b/install/lang/et/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/et/moodle.php b/install/lang/et/moodle.php index 6a18b7bb74e..7b822604f54 100644 --- a/install/lang/et/moodle.php +++ b/install/lang/et/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/eu/admin.php b/install/lang/eu/admin.php index cbd7ac5a221..29f9180147b 100644 --- a/install/lang/eu/admin.php +++ b/install/lang/eu/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/eu/error.php b/install/lang/eu/error.php index dd1fffca7e2..baf17490972 100644 --- a/install/lang/eu/error.php +++ b/install/lang/eu/error.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/eu/install.php b/install/lang/eu/install.php index ee310d7e29b..1708adf8f42 100644 --- a/install/lang/eu/install.php +++ b/install/lang/eu/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/eu/langconfig.php b/install/lang/eu/langconfig.php index fedb7c087ea..66f2f201e5f 100644 --- a/install/lang/eu/langconfig.php +++ b/install/lang/eu/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/eu/moodle.php b/install/lang/eu/moodle.php index 412b55ed18e..bfab1ba5c35 100644 --- a/install/lang/eu/moodle.php +++ b/install/lang/eu/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/fa/admin.php b/install/lang/fa/admin.php index 3ff1beabaa4..c59c89c69f3 100644 --- a/install/lang/fa/admin.php +++ b/install/lang/fa/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/fa/install.php b/install/lang/fa/install.php index c34d2ccb0d8..2ec22533bf0 100644 --- a/install/lang/fa/install.php +++ b/install/lang/fa/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/fa/langconfig.php b/install/lang/fa/langconfig.php index 4753d1c638e..cc9eac6c8db 100644 --- a/install/lang/fa/langconfig.php +++ b/install/lang/fa/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/fa/moodle.php b/install/lang/fa/moodle.php index 219462bf7e0..7be18cdfdb1 100644 --- a/install/lang/fa/moodle.php +++ b/install/lang/fa/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/fi/admin.php b/install/lang/fi/admin.php index 01abe657979..fb7a7754204 100644 --- a/install/lang/fi/admin.php +++ b/install/lang/fi/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/fi/error.php b/install/lang/fi/error.php index 29e448a54b7..73f001a2ca0 100644 --- a/install/lang/fi/error.php +++ b/install/lang/fi/error.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/fi/install.php b/install/lang/fi/install.php index aadc09ac8d6..00e9eb9c4aa 100644 --- a/install/lang/fi/install.php +++ b/install/lang/fi/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/fi/langconfig.php b/install/lang/fi/langconfig.php index 79e7e09ee43..86b7b7c0828 100644 --- a/install/lang/fi/langconfig.php +++ b/install/lang/fi/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/fi/moodle.php b/install/lang/fi/moodle.php index 4156d14f766..20f77f99bf8 100644 --- a/install/lang/fi/moodle.php +++ b/install/lang/fi/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/fil/langconfig.php b/install/lang/fil/langconfig.php index 7b485243175..ecabec030ea 100644 --- a/install/lang/fil/langconfig.php +++ b/install/lang/fil/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/fil/moodle.php b/install/lang/fil/moodle.php index 382357cf110..3a359d09932 100644 --- a/install/lang/fil/moodle.php +++ b/install/lang/fil/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/fj/langconfig.php b/install/lang/fj/langconfig.php index b85a8454e22..86774b7ba0d 100644 --- a/install/lang/fj/langconfig.php +++ b/install/lang/fj/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/fr/admin.php b/install/lang/fr/admin.php index cd78f6fe89a..fc690dd56a9 100644 --- a/install/lang/fr/admin.php +++ b/install/lang/fr/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/fr/error.php b/install/lang/fr/error.php index 589a483462a..877fc16a79d 100644 --- a/install/lang/fr/error.php +++ b/install/lang/fr/error.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/fr/install.php b/install/lang/fr/install.php index 10da099f985..3c3df5f1596 100644 --- a/install/lang/fr/install.php +++ b/install/lang/fr/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/fr/langconfig.php b/install/lang/fr/langconfig.php index 09c799d2b61..ef21459ba0b 100644 --- a/install/lang/fr/langconfig.php +++ b/install/lang/fr/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/fr/moodle.php b/install/lang/fr/moodle.php index 085eb8d21cb..dc9847622f1 100644 --- a/install/lang/fr/moodle.php +++ b/install/lang/fr/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/fr_ca/install.php b/install/lang/fr_ca/install.php index fdbd30edf60..374567cfe84 100644 --- a/install/lang/fr_ca/install.php +++ b/install/lang/fr_ca/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/fr_ca/langconfig.php b/install/lang/fr_ca/langconfig.php index 27f2043f6a6..95516888ef8 100644 --- a/install/lang/fr_ca/langconfig.php +++ b/install/lang/fr_ca/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/fr_ca/moodle.php b/install/lang/fr_ca/moodle.php index 1434e1496e1..4f71d44f43b 100644 --- a/install/lang/fr_ca/moodle.php +++ b/install/lang/fr_ca/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ga/langconfig.php b/install/lang/ga/langconfig.php index 54faef1ecf3..5fbf52592a2 100644 --- a/install/lang/ga/langconfig.php +++ b/install/lang/ga/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/gd/langconfig.php b/install/lang/gd/langconfig.php index 8d186e34ce9..84921cc9939 100644 --- a/install/lang/gd/langconfig.php +++ b/install/lang/gd/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/gl/admin.php b/install/lang/gl/admin.php index 3ac17b29f7a..400f2bfe8e8 100644 --- a/install/lang/gl/admin.php +++ b/install/lang/gl/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/gl/error.php b/install/lang/gl/error.php index 62ae424755a..dcdba565b78 100644 --- a/install/lang/gl/error.php +++ b/install/lang/gl/error.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/gl/install.php b/install/lang/gl/install.php index f75497b1578..2d3518df35e 100644 --- a/install/lang/gl/install.php +++ b/install/lang/gl/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/gl/langconfig.php b/install/lang/gl/langconfig.php index 16bfbf5e51d..52c1df5946b 100644 --- a/install/lang/gl/langconfig.php +++ b/install/lang/gl/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/gl/moodle.php b/install/lang/gl/moodle.php index a1d68a1d604..e5474c7ba73 100644 --- a/install/lang/gl/moodle.php +++ b/install/lang/gl/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/gu/error.php b/install/lang/gu/error.php index c8a9be4d5cc..4c168c06a0b 100644 --- a/install/lang/gu/error.php +++ b/install/lang/gu/error.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/gu/langconfig.php b/install/lang/gu/langconfig.php index 6d3e577cff6..58e1446dc54 100644 --- a/install/lang/gu/langconfig.php +++ b/install/lang/gu/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/gu/moodle.php b/install/lang/gu/moodle.php index bafc206a0af..c0a353ae65c 100644 --- a/install/lang/gu/moodle.php +++ b/install/lang/gu/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/he/admin.php b/install/lang/he/admin.php index 6faa8c4926e..5baee6027b6 100644 --- a/install/lang/he/admin.php +++ b/install/lang/he/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/he/error.php b/install/lang/he/error.php index bb76ddf90f5..4f967f6b902 100644 --- a/install/lang/he/error.php +++ b/install/lang/he/error.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/he/install.php b/install/lang/he/install.php index c9842a670ba..e279c29e9a1 100644 --- a/install/lang/he/install.php +++ b/install/lang/he/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/he/langconfig.php b/install/lang/he/langconfig.php index bf129c7bc1f..1f14bf5449f 100644 --- a/install/lang/he/langconfig.php +++ b/install/lang/he/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/he/moodle.php b/install/lang/he/moodle.php index b5643964897..44dc4393a6d 100644 --- a/install/lang/he/moodle.php +++ b/install/lang/he/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/hi/langconfig.php b/install/lang/hi/langconfig.php index 17eccf7bc41..7581cfa65d5 100644 --- a/install/lang/hi/langconfig.php +++ b/install/lang/hi/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/hi/moodle.php b/install/lang/hi/moodle.php index e7685439bcd..18843e4bebe 100644 --- a/install/lang/hi/moodle.php +++ b/install/lang/hi/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/hr/admin.php b/install/lang/hr/admin.php index 4f3034db9d5..a0291208036 100644 --- a/install/lang/hr/admin.php +++ b/install/lang/hr/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/hr/error.php b/install/lang/hr/error.php index 696936efe67..a88b87bae40 100644 --- a/install/lang/hr/error.php +++ b/install/lang/hr/error.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/hr/install.php b/install/lang/hr/install.php index 230b2cda6aa..068abc67442 100644 --- a/install/lang/hr/install.php +++ b/install/lang/hr/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/hr/langconfig.php b/install/lang/hr/langconfig.php index 27706053342..d7ccfa50fca 100644 --- a/install/lang/hr/langconfig.php +++ b/install/lang/hr/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/hr/moodle.php b/install/lang/hr/moodle.php index d0635d6ca37..77ad7d9ecbe 100644 --- a/install/lang/hr/moodle.php +++ b/install/lang/hr/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/hu/admin.php b/install/lang/hu/admin.php index daeec52c3e5..00c38511bed 100644 --- a/install/lang/hu/admin.php +++ b/install/lang/hu/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/hu/error.php b/install/lang/hu/error.php index 07db7834a65..6805dcae58a 100644 --- a/install/lang/hu/error.php +++ b/install/lang/hu/error.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/hu/install.php b/install/lang/hu/install.php index 85b4ce00b26..771029f75d3 100644 --- a/install/lang/hu/install.php +++ b/install/lang/hu/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/hu/langconfig.php b/install/lang/hu/langconfig.php index efdc231496e..7a7b36bc090 100644 --- a/install/lang/hu/langconfig.php +++ b/install/lang/hu/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/hu/moodle.php b/install/lang/hu/moodle.php index c647042c158..f1a4a64c550 100644 --- a/install/lang/hu/moodle.php +++ b/install/lang/hu/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/hy/admin.php b/install/lang/hy/admin.php index 36a9d1b7398..670aeb17050 100644 --- a/install/lang/hy/admin.php +++ b/install/lang/hy/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/hy/error.php b/install/lang/hy/error.php index b151010d7e6..d2b51c688df 100644 --- a/install/lang/hy/error.php +++ b/install/lang/hy/error.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/hy/install.php b/install/lang/hy/install.php index 636ccac34f3..2ff3b58ce9e 100644 --- a/install/lang/hy/install.php +++ b/install/lang/hy/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/hy/langconfig.php b/install/lang/hy/langconfig.php index f63f5080aec..061c876ddc3 100644 --- a/install/lang/hy/langconfig.php +++ b/install/lang/hy/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/hy/moodle.php b/install/lang/hy/moodle.php index 5d32c09288c..5fe0ddb0688 100644 --- a/install/lang/hy/moodle.php +++ b/install/lang/hy/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/id/langconfig.php b/install/lang/id/langconfig.php index 086608fa739..a630a6dbe13 100644 --- a/install/lang/id/langconfig.php +++ b/install/lang/id/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/id/moodle.php b/install/lang/id/moodle.php index cbda5142521..8a6e42f2364 100644 --- a/install/lang/id/moodle.php +++ b/install/lang/id/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/is/admin.php b/install/lang/is/admin.php index ddca999c953..71556d01267 100644 --- a/install/lang/is/admin.php +++ b/install/lang/is/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/is/error.php b/install/lang/is/error.php index 1152df1f019..cf9e7d65ff4 100644 --- a/install/lang/is/error.php +++ b/install/lang/is/error.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/is/install.php b/install/lang/is/install.php index b29a29a2206..0f3cab85e57 100644 --- a/install/lang/is/install.php +++ b/install/lang/is/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/is/langconfig.php b/install/lang/is/langconfig.php index 64588d53aa0..0541eb3ecea 100644 --- a/install/lang/is/langconfig.php +++ b/install/lang/is/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/is/moodle.php b/install/lang/is/moodle.php index 1fdb0dbe7f8..fffa488a486 100644 --- a/install/lang/is/moodle.php +++ b/install/lang/is/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/it/admin.php b/install/lang/it/admin.php index def976dd14e..ab9874e3bea 100644 --- a/install/lang/it/admin.php +++ b/install/lang/it/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/it/error.php b/install/lang/it/error.php index b4489668ceb..b11282781eb 100644 --- a/install/lang/it/error.php +++ b/install/lang/it/error.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/it/install.php b/install/lang/it/install.php index ce85affe2b9..fe3aced3080 100644 --- a/install/lang/it/install.php +++ b/install/lang/it/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/it/langconfig.php b/install/lang/it/langconfig.php index c28a8fef179..86a2d7b783b 100644 --- a/install/lang/it/langconfig.php +++ b/install/lang/it/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/it/moodle.php b/install/lang/it/moodle.php index 9f963a9331a..7e8e9b0b0c0 100644 --- a/install/lang/it/moodle.php +++ b/install/lang/it/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ja/admin.php b/install/lang/ja/admin.php index 03588c05f80..fcf6b2ef9d5 100644 --- a/install/lang/ja/admin.php +++ b/install/lang/ja/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ja/error.php b/install/lang/ja/error.php index 9d16358f794..6ceff15ce48 100644 --- a/install/lang/ja/error.php +++ b/install/lang/ja/error.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ja/install.php b/install/lang/ja/install.php index f5944c904bb..a8704d0a5ce 100644 --- a/install/lang/ja/install.php +++ b/install/lang/ja/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ja/langconfig.php b/install/lang/ja/langconfig.php index a15b24214ef..ff4aaa23067 100644 --- a/install/lang/ja/langconfig.php +++ b/install/lang/ja/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ja/moodle.php b/install/lang/ja/moodle.php index 61990e124b9..98f5c60c699 100644 --- a/install/lang/ja/moodle.php +++ b/install/lang/ja/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ka/admin.php b/install/lang/ka/admin.php index 38307ea24f9..7877d346fb0 100644 --- a/install/lang/ka/admin.php +++ b/install/lang/ka/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ka/install.php b/install/lang/ka/install.php index 3d6418977b8..1a3fc916062 100644 --- a/install/lang/ka/install.php +++ b/install/lang/ka/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ka/langconfig.php b/install/lang/ka/langconfig.php index 9c0df3c0fbf..0525f02b590 100644 --- a/install/lang/ka/langconfig.php +++ b/install/lang/ka/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/kk/install.php b/install/lang/kk/install.php index 25b4b64b357..021a0bc826b 100644 --- a/install/lang/kk/install.php +++ b/install/lang/kk/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/kk/langconfig.php b/install/lang/kk/langconfig.php index f060faa679b..7179f07fab2 100644 --- a/install/lang/kk/langconfig.php +++ b/install/lang/kk/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/kk/moodle.php b/install/lang/kk/moodle.php index 83acf64b0b2..91c32c86fa1 100644 --- a/install/lang/kk/moodle.php +++ b/install/lang/kk/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/km/admin.php b/install/lang/km/admin.php index 52ab3795d85..f81de8120a1 100644 --- a/install/lang/km/admin.php +++ b/install/lang/km/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/km/error.php b/install/lang/km/error.php index 2b5e4a182c9..b46f53cf694 100644 --- a/install/lang/km/error.php +++ b/install/lang/km/error.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/km/install.php b/install/lang/km/install.php index 7f953173249..7a4519e24a4 100644 --- a/install/lang/km/install.php +++ b/install/lang/km/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/km/langconfig.php b/install/lang/km/langconfig.php index d8fc6906480..7e6932bcd9f 100644 --- a/install/lang/km/langconfig.php +++ b/install/lang/km/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/km/moodle.php b/install/lang/km/moodle.php index 2f060391661..d0997229469 100644 --- a/install/lang/km/moodle.php +++ b/install/lang/km/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/kn/langconfig.php b/install/lang/kn/langconfig.php index 5196e37a529..3f3f0f6d8b3 100644 --- a/install/lang/kn/langconfig.php +++ b/install/lang/kn/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ko/admin.php b/install/lang/ko/admin.php index 393d4004eb8..e2c335b9eb3 100644 --- a/install/lang/ko/admin.php +++ b/install/lang/ko/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ko/error.php b/install/lang/ko/error.php index 3d1d72f0bdd..03d8b5f6a20 100644 --- a/install/lang/ko/error.php +++ b/install/lang/ko/error.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ko/install.php b/install/lang/ko/install.php index 9b7fd02749c..ecf2c08b66c 100644 --- a/install/lang/ko/install.php +++ b/install/lang/ko/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ko/langconfig.php b/install/lang/ko/langconfig.php index a740f43a725..7f44172282c 100644 --- a/install/lang/ko/langconfig.php +++ b/install/lang/ko/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ko/moodle.php b/install/lang/ko/moodle.php index 5fec62beac2..50241c9401e 100644 --- a/install/lang/ko/moodle.php +++ b/install/lang/ko/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/la/langconfig.php b/install/lang/la/langconfig.php index 9a4685879c7..cdc18ca8216 100644 --- a/install/lang/la/langconfig.php +++ b/install/lang/la/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/la/moodle.php b/install/lang/la/moodle.php index 90559633e70..350d11cd98e 100644 --- a/install/lang/la/moodle.php +++ b/install/lang/la/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/lo/admin.php b/install/lang/lo/admin.php index 874ffd1a1a0..a38334e5cc6 100644 --- a/install/lang/lo/admin.php +++ b/install/lang/lo/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/lo/install.php b/install/lang/lo/install.php index 8bd5c1b0f9e..1e551c1f995 100644 --- a/install/lang/lo/install.php +++ b/install/lang/lo/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/lo/langconfig.php b/install/lang/lo/langconfig.php index 5b9a31d0981..1a377171505 100644 --- a/install/lang/lo/langconfig.php +++ b/install/lang/lo/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/lo/moodle.php b/install/lang/lo/moodle.php index 6dd8d606891..1e2006ecc65 100644 --- a/install/lang/lo/moodle.php +++ b/install/lang/lo/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/lt/langconfig.php b/install/lang/lt/langconfig.php index f2a2f318807..a43e3653d91 100644 --- a/install/lang/lt/langconfig.php +++ b/install/lang/lt/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/lt/moodle.php b/install/lang/lt/moodle.php index e063502d10f..9a015b41b98 100644 --- a/install/lang/lt/moodle.php +++ b/install/lang/lt/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/lv/admin.php b/install/lang/lv/admin.php index c66a70f809c..b5a846e4916 100644 --- a/install/lang/lv/admin.php +++ b/install/lang/lv/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/lv/error.php b/install/lang/lv/error.php index f97d7b64736..c181e48f293 100644 --- a/install/lang/lv/error.php +++ b/install/lang/lv/error.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/lv/install.php b/install/lang/lv/install.php index be3e4cd1387..83200d68928 100644 --- a/install/lang/lv/install.php +++ b/install/lang/lv/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/lv/langconfig.php b/install/lang/lv/langconfig.php index 6a08d0b22bd..8357875cb30 100644 --- a/install/lang/lv/langconfig.php +++ b/install/lang/lv/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/lv/moodle.php b/install/lang/lv/moodle.php index 8dd053efdfa..e09039ed812 100644 --- a/install/lang/lv/moodle.php +++ b/install/lang/lv/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/mi_tn/langconfig.php b/install/lang/mi_tn/langconfig.php index ff172dee70c..27a572c7215 100644 --- a/install/lang/mi_tn/langconfig.php +++ b/install/lang/mi_tn/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/mi_tn/moodle.php b/install/lang/mi_tn/moodle.php index 2fd52c9feeb..b754d16bf04 100644 --- a/install/lang/mi_tn/moodle.php +++ b/install/lang/mi_tn/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/mi_wwow/admin.php b/install/lang/mi_wwow/admin.php index 91e00e01955..bbc6dca2949 100644 --- a/install/lang/mi_wwow/admin.php +++ b/install/lang/mi_wwow/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/mi_wwow/error.php b/install/lang/mi_wwow/error.php index 16a840c347e..76f481f4d15 100644 --- a/install/lang/mi_wwow/error.php +++ b/install/lang/mi_wwow/error.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/mi_wwow/install.php b/install/lang/mi_wwow/install.php index b596dc9ec8e..1e8331fee36 100644 --- a/install/lang/mi_wwow/install.php +++ b/install/lang/mi_wwow/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/mi_wwow/langconfig.php b/install/lang/mi_wwow/langconfig.php index 9c4ce6e3595..debdd13e09c 100644 --- a/install/lang/mi_wwow/langconfig.php +++ b/install/lang/mi_wwow/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/mi_wwow/moodle.php b/install/lang/mi_wwow/moodle.php index 0c620ad0f35..5310575943a 100644 --- a/install/lang/mi_wwow/moodle.php +++ b/install/lang/mi_wwow/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/mk/admin.php b/install/lang/mk/admin.php index 8312cfdf7c6..c40d02a0ca4 100644 --- a/install/lang/mk/admin.php +++ b/install/lang/mk/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/mk/error.php b/install/lang/mk/error.php index 41334dc1178..16a667b6334 100644 --- a/install/lang/mk/error.php +++ b/install/lang/mk/error.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/mk/install.php b/install/lang/mk/install.php index 1dd15cbd52d..a8167d75d1e 100644 --- a/install/lang/mk/install.php +++ b/install/lang/mk/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/mk/langconfig.php b/install/lang/mk/langconfig.php index d67efe825a6..b3ace417b97 100644 --- a/install/lang/mk/langconfig.php +++ b/install/lang/mk/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/mk/moodle.php b/install/lang/mk/moodle.php index 806bb80b0a0..a8e9874aded 100644 --- a/install/lang/mk/moodle.php +++ b/install/lang/mk/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ml/langconfig.php b/install/lang/ml/langconfig.php index 0f03f105e71..b35661f8c87 100644 --- a/install/lang/ml/langconfig.php +++ b/install/lang/ml/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ml/moodle.php b/install/lang/ml/moodle.php index 7c4f03f9ada..1bec73a6b0b 100644 --- a/install/lang/ml/moodle.php +++ b/install/lang/ml/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/mn/admin.php b/install/lang/mn/admin.php index 0d0a4859f2c..ce30732f0c1 100644 --- a/install/lang/mn/admin.php +++ b/install/lang/mn/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/mn/error.php b/install/lang/mn/error.php index 1acfd63a231..98fc6eac362 100644 --- a/install/lang/mn/error.php +++ b/install/lang/mn/error.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/mn/install.php b/install/lang/mn/install.php index 9cd66446f7f..482b10f68b2 100644 --- a/install/lang/mn/install.php +++ b/install/lang/mn/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/mn/langconfig.php b/install/lang/mn/langconfig.php index dff90d293dc..88ed237a5ae 100644 --- a/install/lang/mn/langconfig.php +++ b/install/lang/mn/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/mn/moodle.php b/install/lang/mn/moodle.php index 049a1236a5e..5f241ce40b7 100644 --- a/install/lang/mn/moodle.php +++ b/install/lang/mn/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/mr/admin.php b/install/lang/mr/admin.php index de8bb359b38..ba539db4130 100644 --- a/install/lang/mr/admin.php +++ b/install/lang/mr/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/mr/error.php b/install/lang/mr/error.php index 4f1364319e3..9264715fbbe 100644 --- a/install/lang/mr/error.php +++ b/install/lang/mr/error.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/mr/install.php b/install/lang/mr/install.php index 2358d3bbe99..48d33dc9c31 100644 --- a/install/lang/mr/install.php +++ b/install/lang/mr/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/mr/langconfig.php b/install/lang/mr/langconfig.php index e0e6385b3b9..6eee6931331 100644 --- a/install/lang/mr/langconfig.php +++ b/install/lang/mr/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/mr/moodle.php b/install/lang/mr/moodle.php index 9031b308d84..1164e4d894b 100644 --- a/install/lang/mr/moodle.php +++ b/install/lang/mr/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ms/langconfig.php b/install/lang/ms/langconfig.php index 63fb4592925..38e9c978883 100644 --- a/install/lang/ms/langconfig.php +++ b/install/lang/ms/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ne/langconfig.php b/install/lang/ne/langconfig.php index b8d3c4f6358..5642f464a9f 100644 --- a/install/lang/ne/langconfig.php +++ b/install/lang/ne/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/nl/admin.php b/install/lang/nl/admin.php index dc42c4f3b14..73dc271a02a 100644 --- a/install/lang/nl/admin.php +++ b/install/lang/nl/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/nl/error.php b/install/lang/nl/error.php index dc20c3e11cb..438515c9597 100644 --- a/install/lang/nl/error.php +++ b/install/lang/nl/error.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/nl/install.php b/install/lang/nl/install.php index fe929e8076d..5c93c66ba49 100644 --- a/install/lang/nl/install.php +++ b/install/lang/nl/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/nl/langconfig.php b/install/lang/nl/langconfig.php index 16dc1329dca..116df4e7b5d 100644 --- a/install/lang/nl/langconfig.php +++ b/install/lang/nl/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/nl/moodle.php b/install/lang/nl/moodle.php index e20d490a2d6..077af25432b 100644 --- a/install/lang/nl/moodle.php +++ b/install/lang/nl/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/nn/langconfig.php b/install/lang/nn/langconfig.php index 1450c22e089..3e5523b5a9b 100644 --- a/install/lang/nn/langconfig.php +++ b/install/lang/nn/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/nn/moodle.php b/install/lang/nn/moodle.php index 0811db1d910..c2d36f78429 100644 --- a/install/lang/nn/moodle.php +++ b/install/lang/nn/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/no/admin.php b/install/lang/no/admin.php index b8964ac3716..9740caf125b 100644 --- a/install/lang/no/admin.php +++ b/install/lang/no/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/no/error.php b/install/lang/no/error.php index a6b1d32b1f8..a021c9c5e3c 100644 --- a/install/lang/no/error.php +++ b/install/lang/no/error.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/no/install.php b/install/lang/no/install.php index 29f06f0a820..8abb31663f5 100644 --- a/install/lang/no/install.php +++ b/install/lang/no/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/no/langconfig.php b/install/lang/no/langconfig.php index 6282d155c11..c84842c2d2f 100644 --- a/install/lang/no/langconfig.php +++ b/install/lang/no/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/no/moodle.php b/install/lang/no/moodle.php index dc7c2d14c95..de0b76b8233 100644 --- a/install/lang/no/moodle.php +++ b/install/lang/no/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/no_gr/langconfig.php b/install/lang/no_gr/langconfig.php index 5cc55aabab6..76a8d7ce88a 100644 --- a/install/lang/no_gr/langconfig.php +++ b/install/lang/no_gr/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/no_gr/moodle.php b/install/lang/no_gr/moodle.php index 0811db1d910..c2d36f78429 100644 --- a/install/lang/no_gr/moodle.php +++ b/install/lang/no_gr/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/oc_es/langconfig.php b/install/lang/oc_es/langconfig.php index 9d0e05ca262..88cf31be0af 100644 --- a/install/lang/oc_es/langconfig.php +++ b/install/lang/oc_es/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/pl/admin.php b/install/lang/pl/admin.php index 0719d5690f2..f2b094ba870 100644 --- a/install/lang/pl/admin.php +++ b/install/lang/pl/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/pl/error.php b/install/lang/pl/error.php index 2040799b063..de40896d73b 100644 --- a/install/lang/pl/error.php +++ b/install/lang/pl/error.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/pl/install.php b/install/lang/pl/install.php index 37461d07ce9..630bf341d24 100644 --- a/install/lang/pl/install.php +++ b/install/lang/pl/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/pl/langconfig.php b/install/lang/pl/langconfig.php index d3153651010..5e459b9a2ac 100644 --- a/install/lang/pl/langconfig.php +++ b/install/lang/pl/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/pl/moodle.php b/install/lang/pl/moodle.php index cfb07fa06bc..46052e60c33 100644 --- a/install/lang/pl/moodle.php +++ b/install/lang/pl/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/pt/admin.php b/install/lang/pt/admin.php index 02d4d932c3b..e27070f5d65 100644 --- a/install/lang/pt/admin.php +++ b/install/lang/pt/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/pt/error.php b/install/lang/pt/error.php index ec15c7ff4c5..56500777015 100644 --- a/install/lang/pt/error.php +++ b/install/lang/pt/error.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/pt/install.php b/install/lang/pt/install.php index 402d60531a5..de7b066dad0 100644 --- a/install/lang/pt/install.php +++ b/install/lang/pt/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/pt/langconfig.php b/install/lang/pt/langconfig.php index 1ab27592c83..3d56fad87da 100644 --- a/install/lang/pt/langconfig.php +++ b/install/lang/pt/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/pt/moodle.php b/install/lang/pt/moodle.php index 39f4aec3693..d1cd360e2dc 100644 --- a/install/lang/pt/moodle.php +++ b/install/lang/pt/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/pt_br/admin.php b/install/lang/pt_br/admin.php index a5d44099d11..be6e4898240 100644 --- a/install/lang/pt_br/admin.php +++ b/install/lang/pt_br/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/pt_br/error.php b/install/lang/pt_br/error.php index c9e0731b21c..3aaddcd658d 100644 --- a/install/lang/pt_br/error.php +++ b/install/lang/pt_br/error.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/pt_br/install.php b/install/lang/pt_br/install.php index d5f54a9c07b..2139371eea9 100644 --- a/install/lang/pt_br/install.php +++ b/install/lang/pt_br/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/pt_br/langconfig.php b/install/lang/pt_br/langconfig.php index 68409d69618..76d3da6ca2d 100644 --- a/install/lang/pt_br/langconfig.php +++ b/install/lang/pt_br/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/pt_br/moodle.php b/install/lang/pt_br/moodle.php index 2ba82dd43d5..31546fd3e7b 100644 --- a/install/lang/pt_br/moodle.php +++ b/install/lang/pt_br/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ro/admin.php b/install/lang/ro/admin.php index 6cbb4340dcd..58cf468901d 100644 --- a/install/lang/ro/admin.php +++ b/install/lang/ro/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ro/error.php b/install/lang/ro/error.php index 0367f6cec61..b5480c05071 100644 --- a/install/lang/ro/error.php +++ b/install/lang/ro/error.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ro/install.php b/install/lang/ro/install.php index eb0d43881e0..9b9959573b3 100644 --- a/install/lang/ro/install.php +++ b/install/lang/ro/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ro/langconfig.php b/install/lang/ro/langconfig.php index 198de0d021c..faa53393f5e 100644 --- a/install/lang/ro/langconfig.php +++ b/install/lang/ro/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ro/moodle.php b/install/lang/ro/moodle.php index 305b845393d..f4d13adf55a 100644 --- a/install/lang/ro/moodle.php +++ b/install/lang/ro/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ru/admin.php b/install/lang/ru/admin.php index 14ca1e5c9b6..ad3d6090bc8 100644 --- a/install/lang/ru/admin.php +++ b/install/lang/ru/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ru/error.php b/install/lang/ru/error.php index 048c4a07469..64a4f6eccdb 100644 --- a/install/lang/ru/error.php +++ b/install/lang/ru/error.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ru/install.php b/install/lang/ru/install.php index 080ad00dc89..c715ae48451 100644 --- a/install/lang/ru/install.php +++ b/install/lang/ru/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ru/langconfig.php b/install/lang/ru/langconfig.php index 4657c455251..19a9c10a6ac 100644 --- a/install/lang/ru/langconfig.php +++ b/install/lang/ru/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ru/moodle.php b/install/lang/ru/moodle.php index be4f3ae3a0d..6e1b9d13985 100644 --- a/install/lang/ru/moodle.php +++ b/install/lang/ru/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/si/admin.php b/install/lang/si/admin.php index 6d3e3de9c35..28681964815 100644 --- a/install/lang/si/admin.php +++ b/install/lang/si/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/si/error.php b/install/lang/si/error.php index ad9f42cecc2..04140c1d1a0 100644 --- a/install/lang/si/error.php +++ b/install/lang/si/error.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/si/install.php b/install/lang/si/install.php index 627da123b77..ab7767f23c3 100644 --- a/install/lang/si/install.php +++ b/install/lang/si/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/si/langconfig.php b/install/lang/si/langconfig.php index dd21b638eff..37abe0656ff 100644 --- a/install/lang/si/langconfig.php +++ b/install/lang/si/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/si/moodle.php b/install/lang/si/moodle.php index 4bb9edd88e7..e0f206b27f8 100644 --- a/install/lang/si/moodle.php +++ b/install/lang/si/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/sk/admin.php b/install/lang/sk/admin.php index fbfa2fefe7d..881eabba17e 100644 --- a/install/lang/sk/admin.php +++ b/install/lang/sk/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/sk/error.php b/install/lang/sk/error.php index b640e898513..5bd03dcfacc 100644 --- a/install/lang/sk/error.php +++ b/install/lang/sk/error.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/sk/install.php b/install/lang/sk/install.php index 6ed494a85e7..2875473bb7d 100644 --- a/install/lang/sk/install.php +++ b/install/lang/sk/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/sk/langconfig.php b/install/lang/sk/langconfig.php index f369c0332f8..4bbd9d209b6 100644 --- a/install/lang/sk/langconfig.php +++ b/install/lang/sk/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/sk/moodle.php b/install/lang/sk/moodle.php index 0f054d552dc..e931ea95323 100644 --- a/install/lang/sk/moodle.php +++ b/install/lang/sk/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/sl/admin.php b/install/lang/sl/admin.php index d119e43940d..8138129c8f8 100644 --- a/install/lang/sl/admin.php +++ b/install/lang/sl/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/sl/error.php b/install/lang/sl/error.php index 39650c17f24..8ff9b996f9b 100644 --- a/install/lang/sl/error.php +++ b/install/lang/sl/error.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/sl/install.php b/install/lang/sl/install.php index 40b8d38c56f..c32d5bb6da8 100644 --- a/install/lang/sl/install.php +++ b/install/lang/sl/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/sl/langconfig.php b/install/lang/sl/langconfig.php index bfe8670d74c..b56401c1478 100644 --- a/install/lang/sl/langconfig.php +++ b/install/lang/sl/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/sl/moodle.php b/install/lang/sl/moodle.php index 13f9fe8f088..a69df7df337 100644 --- a/install/lang/sl/moodle.php +++ b/install/lang/sl/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/sm/install.php b/install/lang/sm/install.php index 040da6ee8eb..0a3b2bcaf73 100644 --- a/install/lang/sm/install.php +++ b/install/lang/sm/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/sm/langconfig.php b/install/lang/sm/langconfig.php index b139021fdaa..0592d526a1c 100644 --- a/install/lang/sm/langconfig.php +++ b/install/lang/sm/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/sm/moodle.php b/install/lang/sm/moodle.php index e958e8f585d..2f238c4aa7f 100644 --- a/install/lang/sm/moodle.php +++ b/install/lang/sm/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/so/admin.php b/install/lang/so/admin.php index 392718c460c..e9af0418ba3 100644 --- a/install/lang/so/admin.php +++ b/install/lang/so/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/so/install.php b/install/lang/so/install.php index d3610dfc834..80a739ede15 100644 --- a/install/lang/so/install.php +++ b/install/lang/so/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/so/langconfig.php b/install/lang/so/langconfig.php index f4144a6ffc0..dd03a15490f 100644 --- a/install/lang/so/langconfig.php +++ b/install/lang/so/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/so/moodle.php b/install/lang/so/moodle.php index fe337afe719..73748ee11b7 100644 --- a/install/lang/so/moodle.php +++ b/install/lang/so/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/sq/langconfig.php b/install/lang/sq/langconfig.php index 83a6df4b193..bde27b295cd 100644 --- a/install/lang/sq/langconfig.php +++ b/install/lang/sq/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/sq/moodle.php b/install/lang/sq/moodle.php index ebf3509a12c..323341fb945 100644 --- a/install/lang/sq/moodle.php +++ b/install/lang/sq/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/sr/langconfig.php b/install/lang/sr/langconfig.php index b876e1ad6f9..30e226f6f26 100644 --- a/install/lang/sr/langconfig.php +++ b/install/lang/sr/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/sr_cr/admin.php b/install/lang/sr_cr/admin.php index 67278534820..77617b08d1b 100644 --- a/install/lang/sr_cr/admin.php +++ b/install/lang/sr_cr/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/sr_cr/error.php b/install/lang/sr_cr/error.php index 6710ac06808..6be0f2a9c5a 100644 --- a/install/lang/sr_cr/error.php +++ b/install/lang/sr_cr/error.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/sr_cr/install.php b/install/lang/sr_cr/install.php index 20b921b3963..203db3647a4 100644 --- a/install/lang/sr_cr/install.php +++ b/install/lang/sr_cr/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/sr_cr/langconfig.php b/install/lang/sr_cr/langconfig.php index b876e1ad6f9..30e226f6f26 100644 --- a/install/lang/sr_cr/langconfig.php +++ b/install/lang/sr_cr/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/sr_cr/moodle.php b/install/lang/sr_cr/moodle.php index 6da23a04aea..480124825c8 100644 --- a/install/lang/sr_cr/moodle.php +++ b/install/lang/sr_cr/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/sr_cr_bo/langconfig.php b/install/lang/sr_cr_bo/langconfig.php index b876e1ad6f9..30e226f6f26 100644 --- a/install/lang/sr_cr_bo/langconfig.php +++ b/install/lang/sr_cr_bo/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/sr_lt/admin.php b/install/lang/sr_lt/admin.php index b3a781e9028..f153e8d6392 100644 --- a/install/lang/sr_lt/admin.php +++ b/install/lang/sr_lt/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/sr_lt/error.php b/install/lang/sr_lt/error.php index 0f3abe478ee..d27e5d1087f 100644 --- a/install/lang/sr_lt/error.php +++ b/install/lang/sr_lt/error.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/sr_lt/install.php b/install/lang/sr_lt/install.php index 0fe8658dd63..06a1be08432 100644 --- a/install/lang/sr_lt/install.php +++ b/install/lang/sr_lt/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/sr_lt/langconfig.php b/install/lang/sr_lt/langconfig.php index d5c798c71c3..b87e54f8ad4 100644 --- a/install/lang/sr_lt/langconfig.php +++ b/install/lang/sr_lt/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/sr_lt/moodle.php b/install/lang/sr_lt/moodle.php index ccf4a378531..8151bfb7898 100644 --- a/install/lang/sr_lt/moodle.php +++ b/install/lang/sr_lt/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/sv/admin.php b/install/lang/sv/admin.php index c71e0c10c7d..1d59617dee2 100644 --- a/install/lang/sv/admin.php +++ b/install/lang/sv/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/sv/error.php b/install/lang/sv/error.php index cae13d6fb24..f87bedcd9be 100644 --- a/install/lang/sv/error.php +++ b/install/lang/sv/error.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/sv/install.php b/install/lang/sv/install.php index 257e92d35e5..a5a26b37943 100644 --- a/install/lang/sv/install.php +++ b/install/lang/sv/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/sv/langconfig.php b/install/lang/sv/langconfig.php index 7b4ca4148f2..6fbbae96255 100644 --- a/install/lang/sv/langconfig.php +++ b/install/lang/sv/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/sv/moodle.php b/install/lang/sv/moodle.php index 39c1bed6067..c289684f510 100644 --- a/install/lang/sv/moodle.php +++ b/install/lang/sv/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/sv_fi/langconfig.php b/install/lang/sv_fi/langconfig.php index 7e897d51f64..0548e4f004e 100644 --- a/install/lang/sv_fi/langconfig.php +++ b/install/lang/sv_fi/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/sw/admin.php b/install/lang/sw/admin.php index e8884e64680..f54a6f7e93f 100644 --- a/install/lang/sw/admin.php +++ b/install/lang/sw/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ta/admin.php b/install/lang/ta/admin.php index 874ffd1a1a0..a38334e5cc6 100644 --- a/install/lang/ta/admin.php +++ b/install/lang/ta/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ta/error.php b/install/lang/ta/error.php index 1ced79f8268..e1feb8869f8 100644 --- a/install/lang/ta/error.php +++ b/install/lang/ta/error.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ta/install.php b/install/lang/ta/install.php index c013fb5736d..4d4eee7f10a 100644 --- a/install/lang/ta/install.php +++ b/install/lang/ta/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ta/langconfig.php b/install/lang/ta/langconfig.php index ecf82993393..b737c566504 100644 --- a/install/lang/ta/langconfig.php +++ b/install/lang/ta/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ta/moodle.php b/install/lang/ta/moodle.php index b2a6fe8ce78..de3e4a4a89e 100644 --- a/install/lang/ta/moodle.php +++ b/install/lang/ta/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ta_lk/admin.php b/install/lang/ta_lk/admin.php index 364e77b79ca..333fce76bfe 100644 --- a/install/lang/ta_lk/admin.php +++ b/install/lang/ta_lk/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ta_lk/error.php b/install/lang/ta_lk/error.php index 7997b05e1f2..d8a0f52848c 100644 --- a/install/lang/ta_lk/error.php +++ b/install/lang/ta_lk/error.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ta_lk/install.php b/install/lang/ta_lk/install.php index 7d8efa6cff7..06f4810c169 100644 --- a/install/lang/ta_lk/install.php +++ b/install/lang/ta_lk/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ta_lk/langconfig.php b/install/lang/ta_lk/langconfig.php index a9818991f42..6dbeb793207 100644 --- a/install/lang/ta_lk/langconfig.php +++ b/install/lang/ta_lk/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ta_lk/moodle.php b/install/lang/ta_lk/moodle.php index 7c8ad2dc63f..8fc23f94651 100644 --- a/install/lang/ta_lk/moodle.php +++ b/install/lang/ta_lk/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/te/admin.php b/install/lang/te/admin.php index 794313a806e..38497c99c05 100644 --- a/install/lang/te/admin.php +++ b/install/lang/te/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/te/langconfig.php b/install/lang/te/langconfig.php index bc821307b54..602a9e4c7f0 100644 --- a/install/lang/te/langconfig.php +++ b/install/lang/te/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/te/moodle.php b/install/lang/te/moodle.php index c7f9fc35d11..fc372ba409c 100644 --- a/install/lang/te/moodle.php +++ b/install/lang/te/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/th/admin.php b/install/lang/th/admin.php index dfe08b3e650..d1799c8ed9f 100644 --- a/install/lang/th/admin.php +++ b/install/lang/th/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/th/install.php b/install/lang/th/install.php index 63d2e77404c..ffbfb560aab 100644 --- a/install/lang/th/install.php +++ b/install/lang/th/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/th/langconfig.php b/install/lang/th/langconfig.php index 898a8fb08b4..d85dd0e853b 100644 --- a/install/lang/th/langconfig.php +++ b/install/lang/th/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/th/moodle.php b/install/lang/th/moodle.php index 0de9d093975..8a1004ab51a 100644 --- a/install/lang/th/moodle.php +++ b/install/lang/th/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ti/langconfig.php b/install/lang/ti/langconfig.php index 70f2db82334..252174a6e43 100644 --- a/install/lang/ti/langconfig.php +++ b/install/lang/ti/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ti/moodle.php b/install/lang/ti/moodle.php index 224bcadef4a..166bef902a8 100644 --- a/install/lang/ti/moodle.php +++ b/install/lang/ti/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/tl/admin.php b/install/lang/tl/admin.php index f62997504c9..de61ce18f93 100644 --- a/install/lang/tl/admin.php +++ b/install/lang/tl/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/tl/error.php b/install/lang/tl/error.php index 5a2359861f9..c9959093e74 100644 --- a/install/lang/tl/error.php +++ b/install/lang/tl/error.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/tl/install.php b/install/lang/tl/install.php index 164241a8bfd..20e086cda93 100644 --- a/install/lang/tl/install.php +++ b/install/lang/tl/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/tl/langconfig.php b/install/lang/tl/langconfig.php index 8dd2095fa26..7798dd177df 100644 --- a/install/lang/tl/langconfig.php +++ b/install/lang/tl/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/tl/moodle.php b/install/lang/tl/moodle.php index 1643e938fab..c6470dc8c23 100644 --- a/install/lang/tl/moodle.php +++ b/install/lang/tl/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/to/install.php b/install/lang/to/install.php index d5e8e5f66f4..fab3b5b524a 100644 --- a/install/lang/to/install.php +++ b/install/lang/to/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/to/langconfig.php b/install/lang/to/langconfig.php index 2eb38c9e07d..a1cf9715778 100644 --- a/install/lang/to/langconfig.php +++ b/install/lang/to/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/to/moodle.php b/install/lang/to/moodle.php index 9fcac3239f0..597d7952922 100644 --- a/install/lang/to/moodle.php +++ b/install/lang/to/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/tr/admin.php b/install/lang/tr/admin.php index 2828dee280b..93caba60222 100644 --- a/install/lang/tr/admin.php +++ b/install/lang/tr/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/tr/error.php b/install/lang/tr/error.php index 118b5f3240b..83117198e3b 100644 --- a/install/lang/tr/error.php +++ b/install/lang/tr/error.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/tr/install.php b/install/lang/tr/install.php index 24ea290d452..70d65a3744a 100644 --- a/install/lang/tr/install.php +++ b/install/lang/tr/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/tr/langconfig.php b/install/lang/tr/langconfig.php index 13b21abc504..bb838ca7b78 100644 --- a/install/lang/tr/langconfig.php +++ b/install/lang/tr/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/tr/moodle.php b/install/lang/tr/moodle.php index e95625a6df6..c94fc9373f7 100644 --- a/install/lang/tr/moodle.php +++ b/install/lang/tr/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/uk/langconfig.php b/install/lang/uk/langconfig.php index 4756a47bfb8..30b9d8c4433 100644 --- a/install/lang/uk/langconfig.php +++ b/install/lang/uk/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/uk/moodle.php b/install/lang/uk/moodle.php index 8b686a2fdb8..bd24cd4cc32 100644 --- a/install/lang/uk/moodle.php +++ b/install/lang/uk/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ur/install.php b/install/lang/ur/install.php index 46fa461d336..670e16a6d16 100644 --- a/install/lang/ur/install.php +++ b/install/lang/ur/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ur/langconfig.php b/install/lang/ur/langconfig.php index ec1b5ac88a3..f82e3a9059f 100644 --- a/install/lang/ur/langconfig.php +++ b/install/lang/ur/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/ur/moodle.php b/install/lang/ur/moodle.php index 6bc40101cad..2170fcc74d0 100644 --- a/install/lang/ur/moodle.php +++ b/install/lang/ur/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/uz/install.php b/install/lang/uz/install.php index 2eba7f402f0..e40642f43d4 100644 --- a/install/lang/uz/install.php +++ b/install/lang/uz/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/uz/langconfig.php b/install/lang/uz/langconfig.php index dd8b4a12fe6..67359289b93 100644 --- a/install/lang/uz/langconfig.php +++ b/install/lang/uz/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/uz/moodle.php b/install/lang/uz/moodle.php index 7ff71b5754f..758704aa01b 100644 --- a/install/lang/uz/moodle.php +++ b/install/lang/uz/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/vi/admin.php b/install/lang/vi/admin.php index 8a0f338f486..31767ca7c32 100644 --- a/install/lang/vi/admin.php +++ b/install/lang/vi/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/vi/install.php b/install/lang/vi/install.php index 3c4dab528be..3d3f5a902d6 100644 --- a/install/lang/vi/install.php +++ b/install/lang/vi/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/vi/langconfig.php b/install/lang/vi/langconfig.php index 6246f8a9547..65a9ecb70d4 100644 --- a/install/lang/vi/langconfig.php +++ b/install/lang/vi/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/vi/moodle.php b/install/lang/vi/moodle.php index cfbba8fcef0..62c35464b1e 100644 --- a/install/lang/vi/moodle.php +++ b/install/lang/vi/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/wo/langconfig.php b/install/lang/wo/langconfig.php index 1811ecc6b04..cf5af52f0ae 100644 --- a/install/lang/wo/langconfig.php +++ b/install/lang/wo/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/zh_cn/admin.php b/install/lang/zh_cn/admin.php index 5683df7b122..19f04d83405 100644 --- a/install/lang/zh_cn/admin.php +++ b/install/lang/zh_cn/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/zh_cn/error.php b/install/lang/zh_cn/error.php index 92bcddcbdcb..b233b303dab 100644 --- a/install/lang/zh_cn/error.php +++ b/install/lang/zh_cn/error.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/zh_cn/install.php b/install/lang/zh_cn/install.php index 37e8b7eaf04..8580f19aa9c 100644 --- a/install/lang/zh_cn/install.php +++ b/install/lang/zh_cn/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was @@ -40,6 +40,7 @@ $string['databasehost'] = '数据库主机'; $string['databasename'] = '数据库名'; $string['databasetypehead'] = '选择数据库驱动'; $string['dataroot'] = '数据目录'; +$string['datarootpermission'] = '数据目录权限'; $string['dbprefix'] = '表格名称前缀'; $string['dirroot'] = 'Moodle目录'; $string['environmenthead'] = '检测您的运行环境...'; diff --git a/install/lang/zh_cn/langconfig.php b/install/lang/zh_cn/langconfig.php index 67f3e6ab23e..8772823d6f3 100644 --- a/install/lang/zh_cn/langconfig.php +++ b/install/lang/zh_cn/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/zh_cn/moodle.php b/install/lang/zh_cn/moodle.php index 70080e42c06..bc48d070964 100644 --- a/install/lang/zh_cn/moodle.php +++ b/install/lang/zh_cn/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/zh_tw/admin.php b/install/lang/zh_tw/admin.php index 5fdf9d4e940..f54f682cf55 100644 --- a/install/lang/zh_tw/admin.php +++ b/install/lang/zh_tw/admin.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/zh_tw/error.php b/install/lang/zh_tw/error.php index 63780589532..2371760a937 100644 --- a/install/lang/zh_tw/error.php +++ b/install/lang/zh_tw/error.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/zh_tw/install.php b/install/lang/zh_tw/install.php index 5d67d9fb7f4..20ecf9733ba 100644 --- a/install/lang/zh_tw/install.php +++ b/install/lang/zh_tw/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/zh_tw/langconfig.php b/install/lang/zh_tw/langconfig.php index 8c1a9ab5dfd..67f88e09277 100644 --- a/install/lang/zh_tw/langconfig.php +++ b/install/lang/zh_tw/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/zh_tw/moodle.php b/install/lang/zh_tw/moodle.php index 3b25e8f92d4..7e04cc821d6 100644 --- a/install/lang/zh_tw/moodle.php +++ b/install/lang/zh_tw/moodle.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/zu/error.php b/install/lang/zu/error.php index 92aab5b5f9a..81f611aca5f 100644 --- a/install/lang/zu/error.php +++ b/install/lang/zu/error.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/zu/install.php b/install/lang/zu/install.php index 79cbcdb20d6..b62de397201 100644 --- a/install/lang/zu/install.php +++ b/install/lang/zu/install.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/install/lang/zu/langconfig.php b/install/lang/zu/langconfig.php index d2b79ae72d7..9b0850a3a77 100644 --- a/install/lang/zu/langconfig.php +++ b/install/lang/zu/langconfig.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * Automatically generated strings for Moodle 2.2beta installer + * Automatically generated strings for Moodle 2.3dev installer * * Do not edit this file manually! It contains just a subset of strings * needed during the very first steps of installation. This file was diff --git a/lang/en/admin.php b/lang/en/admin.php index 578d965f10e..f648a3dbdd8 100644 --- a/lang/en/admin.php +++ b/lang/en/admin.php @@ -613,6 +613,8 @@ $string['logguests_help'] = 'This setting enables logging of actions by guest ac $string['loginhttps'] = 'Use HTTPS for logins'; $string['loginpageautofocus'] = 'Autofocus login page form'; $string['loginpageautofocus_help'] = 'Enabling this option improves usability of the login page, but automatically focusing fields may be considered an accessibility issue.'; +$string['loginpasswordautocomplete'] = 'Prevent password autocompletion on login form.'; +$string['loginpasswordautocomplete_help'] = 'Having this off will let users save their account password in their browser. Switching this setting on will result in your site no longer following XHTML strict validation rules.'; $string['loglifetime'] = 'Keep logs for'; $string['longtimewarning'] = 'Please note that this process can take a long time.'; $string['maintenancemode'] = 'In maintenance mode'; diff --git a/lang/en/question.php b/lang/en/question.php index 947fbbc3858..1d82d2323e2 100644 --- a/lang/en/question.php +++ b/lang/en/question.php @@ -270,6 +270,7 @@ $string['reviewresponse'] = 'Review response'; $string['saveflags'] = 'Save the state of the flags'; $string['selectacategory'] = 'Select a category:'; $string['selectaqtypefordescription'] = 'Select a question type to see its description.'; +$string['selectcategoryabove'] = 'Select a category above'; $string['selectquestionsforbulk'] = 'Select questions for bulk actions'; $string['shareincontext'] = 'Share in context for {$a}'; $string['stoponerror'] = 'Stop on error'; diff --git a/lang/en/role.php b/lang/en/role.php index 2bf28ccfee1..971722c4fb2 100644 --- a/lang/en/role.php +++ b/lang/en/role.php @@ -212,6 +212,8 @@ $string['legacytype'] = 'Legacy role type'; $string['legacy:user'] = 'LEGACY ROLE: Authenticated user'; $string['listallroles'] = 'List all roles'; $string['localroles'] = 'Locally assigned roles'; +$string['mainadmin'] = 'Main administrator'; +$string['mainadminset'] = 'Set main admin'; $string['manageadmins'] = 'Manage site administrators'; $string['manager'] = 'Manager'; $string['managerdescription'] = 'Managers can access course and modify them, they usually do not participate in courses.'; diff --git a/lang/en/webservice.php b/lang/en/webservice.php index 512c195f113..74f84c8f764 100644 --- a/lang/en/webservice.php +++ b/lang/en/webservice.php @@ -163,7 +163,7 @@ $string['selectspecificuserdescription'] = 'Add the web services user as an auth $string['service'] = 'Service'; $string['servicehelpexplanation'] = 'A service is a set of functions. A service can be accessed by all users or just specified users.'; $string['servicename'] = 'Service name'; -$string['servicenotavailable'] = 'the web service is not available (it does not exist or it is disabled)'; +$string['servicenotavailable'] = 'Web service is not available (it doesn\'t exist or might be disabled)'; $string['servicesbuiltin'] = 'Built-in services'; $string['servicescustom'] = 'Custom services'; $string['serviceusers'] = 'Authorised users'; diff --git a/lib/blocklib.php b/lib/blocklib.php index df617cb4e04..d5d1c3b1372 100644 --- a/lib/blocklib.php +++ b/lib/blocklib.php @@ -1061,9 +1061,6 @@ class block_manager { /** * Process any block actions that were specified in the URL. * - * This can only be done given a valid $page object. - * - * @param moodle_page $page the page to add blocks to. * @return boolean true if anything was done. False if not. */ public function process_url_actions() { @@ -1230,28 +1227,42 @@ class block_manager { $bi->subpagepattern = $data->bui_subpagepattern; } - $parentcontext = get_context_instance_by_id($data->bui_parentcontextid); $systemcontext = get_context_instance(CONTEXT_SYSTEM); + $frontpagecontext = get_context_instance(CONTEXT_COURSE, SITEID); + $parentcontext = get_context_instance_by_id($data->bui_parentcontextid); // Updating stickiness and contexts. See MDL-21375 for details. if (has_capability('moodle/site:manageblocks', $parentcontext)) { // Check permissions in destination - // Explicitly set the context + + // Explicitly set the default context $bi->parentcontextid = $parentcontext->id; - // If the context type is > 0 then we'll explicitly set the block as sticky, otherwise not - $bi->showinsubcontexts = (int)(!empty($data->bui_contexts)); + if ($data->bui_editingatfrontpage) { // The block is being edited on the front page - // If the block wants to be system-wide, then explicitly set that - if ($data->bui_contexts == BUI_CONTEXTS_ENTIRE_SITE) { // Only possible on a frontpage or system page - $bi->parentcontextid = $systemcontext->id; - $bi->showinsubcontexts = BUI_CONTEXTS_CURRENT_SUBS; //show in current and sub contexts - $bi->pagetypepattern = '*'; + // The interface here is a special case because the pagetype pattern is + // totally derived from the context menu. Here are the excpetions. MDL-30340 - } else { // The block doesn't want to be system-wide, so let's ensure that - if ($parentcontext->id == $systemcontext->id) { // We need to move it to the front page - $frontpagecontext = get_context_instance(CONTEXT_COURSE, SITEID); - $bi->parentcontextid = $frontpagecontext->id; - $bi->pagetypepattern = 'site-index'; + switch ($data->bui_contexts) { + case BUI_CONTEXTS_ENTIRE_SITE: + // The user wants to show the block across the entire site + $bi->parentcontextid = $systemcontext->id; + $bi->showinsubcontexts = true; + $bi->pagetypepattern = '*'; + break; + case BUI_CONTEXTS_FRONTPAGE_SUBS: + // The user wants the block shown on the front page and all subcontexts + $bi->parentcontextid = $frontpagecontext->id; + $bi->showinsubcontexts = true; + $bi->pagetypepattern = '*'; + break; + case BUI_CONTEXTS_FRONTPAGE_ONLY: + // The user want to show the front page on the frontpage only + $bi->parentcontextid = $frontpagecontext->id; + $bi->showinsubcontexts = false; + $bi->pagetypepattern = 'site-index'; + // This is the only relevant page type anyway but we'll set it explicitly just + // in case the front page grows site-index-* subpages of its own later + break; } } } @@ -1660,6 +1671,13 @@ function generate_page_type_patterns($pagetype, $parentcontext = null, $currentc $patterns = default_page_type_list($pagetype, $parentcontext, $currentcontext); } + // Ensure that the * pattern is always available if editing block 'at distance', so + // we always can 'bring back' it to the original context. MDL-30340 + if ($currentcontext->id != $parentcontext->id && !isset($patterns['*'])) { + // TODO: We could change the string here, showing its 'bring back' meaning + $patterns['*'] = get_string('page-x', 'pagetype'); + } + return $patterns; } @@ -1700,7 +1718,7 @@ function default_page_type_list($pagetype, $parentcontext = null, $currentcontex * @return array */ function my_page_type_list($pagetype, $parentcontext = null, $currentcontext = null) { - return array('my-index' => 'my-index'); + return array('my-index' => get_string('page-my-index', 'pagetype')); } /** diff --git a/lib/datalib.php b/lib/datalib.php index e888b23149d..0a80e0c0bcc 100644 --- a/lib/datalib.php +++ b/lib/datalib.php @@ -49,24 +49,36 @@ define('LASTACCESS_UPDATE_SECS', 60); /** * Returns $user object of the main admin user - * primary admin = admin with lowest role_assignment id among admins * * @static stdClass $mainadmin * @return stdClass {@link $USER} record from DB, false if not found */ function get_admin() { + global $CFG, $DB; + static $mainadmin = null; - if (!isset($mainadmin)) { - if (! $admins = get_admins()) { - return false; - } - //TODO: add some admin setting for specifying of THE main admin - // for now return the first assigned admin - $mainadmin = reset($admins); + if (isset($mainadmin)) { + return clone($mainadmin); + } + + if (empty($CFG->siteadmins)) { // Should not happen on an ordinary site + return false; + } + + foreach (explode(',', $CFG->siteadmins) as $id) { + if ($user = $DB->get_record('user', array('id'=>$id, 'deleted'=>0))) { + $mainadmin = $user; + break; + } + } + + if ($mainadmin) { + return clone($mainadmin); + } else { + // this should not happen + return false; } - // we must clone this otherwise code outside can break the static var - return clone($mainadmin); } /** diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php index 6b6573ce300..e540801aa49 100644 --- a/lib/db/upgrade.php +++ b/lib/db/upgrade.php @@ -6948,6 +6948,9 @@ FROM upgrade_main_savepoint(true, 2011111800.01); } + // Moodle v2.2.0 release upgrade line + // Put any upgrade step following this + return true; } diff --git a/lib/filestorage/file_storage.php b/lib/filestorage/file_storage.php index 9b22b01334a..d61e10f41ea 100644 --- a/lib/filestorage/file_storage.php +++ b/lib/filestorage/file_storage.php @@ -987,6 +987,12 @@ class file_storage { * @return stored_file instance */ public function convert_image($file_record, $fid, $newwidth = NULL, $newheight = NULL, $keepaspectratio = true, $quality = NULL) { + if (!function_exists('imagecreatefromstring')) { + //Most likely the GD php extension isn't installed + //image conversion cannot succeed + throw new file_exception('storedfileproblem', 'imagecreatefromstring() doesnt exist. The PHP extension "GD" must be installed for image conversion.'); + } + if ($fid instanceof stored_file) { $fid = $fid->get_id(); } diff --git a/lib/form/recaptcha.php b/lib/form/recaptcha.php index 79b2cb1f9b1..0282efdf0d4 100644 --- a/lib/form/recaptcha.php +++ b/lib/form/recaptcha.php @@ -34,10 +34,13 @@ class MoodleQuickForm_recaptcha extends HTML_QuickForm_input { * */ function MoodleQuickForm_recaptcha($elementName = null, $elementLabel = null, $attributes = null) { + global $CFG; parent::HTML_QuickForm_input($elementName, $elementLabel, $attributes); $this->_type = 'recaptcha'; - if (!empty($attributes['https'])) { - $this->_https = $attributes['https']; + if (!empty($attributes['https']) or strpos($CFG->httpswwwroot, 'https:') === 0) { + $this->_https = true; + } else { + $this->_https = false; } } diff --git a/lib/formslib.php b/lib/formslib.php index 9b1ce0485a7..ca83c7c6001 100644 --- a/lib/formslib.php +++ b/lib/formslib.php @@ -1014,7 +1014,12 @@ abstract class moodleform { $params = array_merge(array($realelementname), $params); call_user_func_array(array(&$mform, 'addRule'), $params); break; - + case 'type' : + //Type should be set only once + if (!isset($mform->_types[$elementname])) { + $mform->setType($elementname, $params); + } + break; } } } diff --git a/lib/javascript-static.js b/lib/javascript-static.js index 5bbc9c3e5e9..02254220386 100644 --- a/lib/javascript-static.js +++ b/lib/javascript-static.js @@ -263,15 +263,30 @@ M.util.show_confirm_dialog = function(e, args) { if (target.test('a')) { window.location = target.get('href'); + } else if ((targetancestor = target.ancestor('a')) !== null) { window.location = targetancestor.get('href'); + } else if (target.test('input')) { - targetform = target.ancestor('form'); - if (targetform && targetform.submit) { - targetform.submit(); + targetform = target.ancestor(function(node) { return node.get('tagName').toLowerCase() == 'form'; }); + // We cannot use target.ancestor('form') on the previous line + // because of http://yuilibrary.com/projects/yui3/ticket/2531561 + if (!targetform) { + return; } + if (target.get('name') && target.get('value')) { + targetform.append(''); + } + targetform.submit(); + + } else if (target.get('tagName').toLowerCase() == 'form') { + // We cannot use target.test('form') on the previous line because of + // http://yuilibrary.com/projects/yui3/ticket/2531561 + target.submit(); + } else if (M.cfg.developerdebug) { - alert("Element of type " + target.get('tagName') + " is not supported by the M.util.show_confirm_dialog function. Use A or INPUT"); + alert("Element of type " + target.get('tagName') + " is not supported by the M.util.show_confirm_dialog function. Use A, INPUT, or FORM"); } }; diff --git a/lib/navigationlib.php b/lib/navigationlib.php index 845cfe63e14..8645e271975 100644 --- a/lib/navigationlib.php +++ b/lib/navigationlib.php @@ -1216,6 +1216,7 @@ class global_navigation extends navigation_node { } break; case CONTEXT_USER : + $course = $this->page->course; if ($showcategories && !$ismycourse) { $this->load_all_categories($course->category, $showcategories); } @@ -1239,6 +1240,16 @@ class global_navigation extends navigation_node { $sections = $this->load_course_sections($course, $coursenode); break; } + } else { + // We need to check if the user is viewing a front page module. + // If so then there is potentially more content to load yet for that + // module. + if ($this->page->context->contextlevel == CONTEXT_MODULE) { + $activitynode = $this->rootnodes['site']->get($this->page->cm->id, navigation_node::TYPE_ACTIVITY); + if ($activitynode) { + $this->load_activity($this->page->cm, $this->page->course, $activitynode); + } + } } $limit = 20; diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php index a236aef11d9..7288f57cfa8 100644 --- a/lib/outputrenderers.php +++ b/lib/outputrenderers.php @@ -1469,14 +1469,13 @@ class core_renderer extends renderer_base { $aggregatelabel = $ratingmanager->get_aggregate_label($rating->settings->aggregationmethod); $aggregatestr = $rating->get_aggregate_string(); - $aggregatehtml = html_writer::tag('span', $aggregatestr, array('id' => 'ratingaggregate'.$rating->itemid)).' '; - $aggregatehtml .= html_writer::start_tag('span', array('id'=>"ratingcount{$rating->itemid}")); + $aggregatehtml = html_writer::tag('span', $aggregatestr, array('id' => 'ratingaggregate'.$rating->itemid, 'class' => 'ratingaggregate')).' '; if ($rating->count > 0) { - $aggregatehtml .= "({$rating->count})"; + $countstr = "({$rating->count})"; } else { - $aggregatehtml .= '-'; + $countstr = '-'; } - $aggregatehtml .= html_writer::end_tag('span').' '; + $aggregatehtml .= html_writer::tag('span', $countstr, array('id'=>"ratingcount{$rating->itemid}", 'class' => 'ratingcount')).' '; $ratinghtml .= html_writer::tag('span', $aggregatelabel, array('class'=>'rating-aggregate-label')); if ($rating->settings->permissions->viewall && $rating->settings->pluginpermissions->viewall) { diff --git a/login/index_form.html b/login/index_form.html index 9d2616527a0..e45b8e1aa96 100644 --- a/login/index_form.html +++ b/login/index_form.html @@ -38,7 +38,7 @@ if ($show_instructions) {
- + loginpasswordautocomplete)) {echo 'autocomplete="off"';} ?> /> " />
diff --git a/message/output/email/db/upgrade.php b/message/output/email/db/upgrade.php index caa6d35387a..ec64c5e42ba 100644 --- a/message/output/email/db/upgrade.php +++ b/message/output/email/db/upgrade.php @@ -50,6 +50,9 @@ function xmldb_message_email_upgrade($oldversion) { // Moodle v2.1.0 release upgrade line // Put any upgrade step following this + // Moodle v2.2.0 release upgrade line + // Put any upgrade step following this + return true; } diff --git a/message/output/email/message_output_email.php b/message/output/email/message_output_email.php index 5e56f1b4b05..37efbe2fa3b 100644 --- a/message/output/email/message_output_email.php +++ b/message/output/email/message_output_email.php @@ -83,7 +83,7 @@ class message_output_email extends message_output { * @param array $preferences preferences array */ function process_form($form, &$preferences){ - if (isset($form->email_email) && !empty($form->email_email)) { + if (isset($form->email_email)) { $preferences['message_processor_email_email'] = $form->email_email; } } diff --git a/message/output/jabber/db/upgrade.php b/message/output/jabber/db/upgrade.php index 480df5872c9..5563f666a2e 100644 --- a/message/output/jabber/db/upgrade.php +++ b/message/output/jabber/db/upgrade.php @@ -50,6 +50,9 @@ function xmldb_message_jabber_upgrade($oldversion) { // Moodle v2.1.0 release upgrade line // Put any upgrade step following this + // Moodle v2.2.0 release upgrade line + // Put any upgrade step following this + return true; } diff --git a/message/output/popup/db/upgrade.php b/message/output/popup/db/upgrade.php index 6cecfbc308a..6e6d37d77d3 100644 --- a/message/output/popup/db/upgrade.php +++ b/message/output/popup/db/upgrade.php @@ -50,6 +50,9 @@ function xmldb_message_popup_upgrade($oldversion) { // Moodle v2.1.0 release upgrade line // Put any upgrade step following this + // Moodle v2.2.0 release upgrade line + // Put any upgrade step following this + return true; } diff --git a/mod/assignment/db/upgrade.php b/mod/assignment/db/upgrade.php index 4136a76d895..6340d8023ac 100644 --- a/mod/assignment/db/upgrade.php +++ b/mod/assignment/db/upgrade.php @@ -157,6 +157,9 @@ function xmldb_assignment_upgrade($oldversion) { // Moodle v2.1.0 release upgrade line // Put any upgrade step following this + // Moodle v2.2.0 release upgrade line + // Put any upgrade step following this + return true; } diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php index 012b3b3956c..a65441fd040 100644 --- a/mod/assignment/lib.php +++ b/mod/assignment/lib.php @@ -1416,6 +1416,7 @@ class assignment_base { $currentposition = 0; foreach ($ausers as $auser) { if ($currentposition == $offset && $offset < $endposition) { + $rowclass = null; $final_grade = $grading_info->items[0]->grades[$auser->id]; $grademax = $grading_info->items[0]->grademax; $final_grade->formatted_grade = round($final_grade->grade,2) .' / ' . round($grademax,2); @@ -1438,11 +1439,16 @@ class assignment_base { ///attach file or print link to student answer, depending on the type of the assignment. ///Refer to print_student_answer in inherited classes. if ($auser->timemodified > 0) { - $studentmodified = '
'.$this->print_student_answer($auser->id) - . userdate($auser->timemodified).'
'; + $studentmodifiedcontent = $this->print_student_answer($auser->id) + . userdate($auser->timemodified); + if ($assignment->timedue && $auser->timemodified > $assignment->timedue) { + $studentmodifiedcontent .= assignment_display_lateness($auser->timemodified, $assignment->timedue); + $rowclass = 'late'; + } } else { - $studentmodified = '
 
'; + $studentmodifiedcontent = ' '; } + $studentmodified = html_writer::tag('div', $studentmodifiedcontent, array('id' => 'ts' . $auser->id)); ///Print grade, dropdown or text if ($auser->timemarked > 0) { $teachermodified = '
'.userdate($auser->timemarked).'
'; @@ -1561,7 +1567,7 @@ class assignment_base { if ($uses_outcomes) { $row[] = $outcomes; } - $table->add_data($row); + $table->add_data($row, $rowclass); } $currentposition++; } diff --git a/mod/chat/db/upgrade.php b/mod/chat/db/upgrade.php index c7750913cbd..d1c8ac00ffa 100644 --- a/mod/chat/db/upgrade.php +++ b/mod/chat/db/upgrade.php @@ -103,6 +103,9 @@ function xmldb_chat_upgrade($oldversion) { // Moodle v2.1.0 release upgrade line // Put any upgrade step following this + // Moodle v2.2.0 release upgrade line + // Put any upgrade step following this + return true; } diff --git a/mod/choice/db/upgrade.php b/mod/choice/db/upgrade.php index da14ee4f85e..d75dc24a2d7 100644 --- a/mod/choice/db/upgrade.php +++ b/mod/choice/db/upgrade.php @@ -71,6 +71,9 @@ function xmldb_choice_upgrade($oldversion) { // Moodle v2.1.0 release upgrade line // Put any upgrade step following this + // Moodle v2.2.0 release upgrade line + // Put any upgrade step following this + return true; } diff --git a/mod/choice/mod_form.php b/mod/choice/mod_form.php index 1a7ef127ba4..afacc4a9a6a 100644 --- a/mod/choice/mod_form.php +++ b/mod/choice/mod_form.php @@ -50,7 +50,6 @@ class mod_choice_mod_form extends moodleform_mod { $repeateloptions['limit']['default'] = 0; $repeateloptions['limit']['disabledif'] = array('limitanswers', 'eq', 0); $repeateloptions['limit']['rule'] = 'numeric'; - $mform->setType('limit', PARAM_INT); $repeateloptions['option']['helpbutton'] = array('choiceoptions', 'choice'); $mform->setType('option', PARAM_CLEANHTML); diff --git a/mod/data/db/upgrade.php b/mod/data/db/upgrade.php index 491d30d95f5..8983a9ba67d 100644 --- a/mod/data/db/upgrade.php +++ b/mod/data/db/upgrade.php @@ -341,6 +341,9 @@ function xmldb_data_upgrade($oldversion) { // Moodle v2.1.0 release upgrade line // Put any upgrade step following this + // Moodle v2.2.0 release upgrade line + // Put any upgrade step following this + return true; } diff --git a/mod/data/field/picture/field.class.php b/mod/data/field/picture/field.class.php index 3086c845504..269e916815f 100644 --- a/mod/data/field/picture/field.class.php +++ b/mod/data/field/picture/field.class.php @@ -266,6 +266,7 @@ class data_field_picture extends data_field_base { $fs->convert_image($file_record, $file, $this->field->param4, $this->field->param5, true); return true; } catch (Exception $e) { + debugging($e->getMessage()); return false; } } diff --git a/mod/feedback/db/upgrade.php b/mod/feedback/db/upgrade.php index e81cfa0b8d3..73b4520502d 100644 --- a/mod/feedback/db/upgrade.php +++ b/mod/feedback/db/upgrade.php @@ -364,6 +364,9 @@ function xmldb_feedback_upgrade($oldversion) { // Moodle v2.1.0 release upgrade line // Put any upgrade step following this + // Moodle v2.2.0 release upgrade line + // Put any upgrade step following this + return true; } diff --git a/mod/folder/db/upgrade.php b/mod/folder/db/upgrade.php index a0d64ac37a5..8e33d6a949c 100644 --- a/mod/folder/db/upgrade.php +++ b/mod/folder/db/upgrade.php @@ -54,5 +54,8 @@ function xmldb_folder_upgrade($oldversion) { // Moodle v2.1.0 release upgrade line // Put any upgrade step following this + // Moodle v2.2.0 release upgrade line + // Put any upgrade step following this + return true; } diff --git a/mod/forum/db/upgrade.php b/mod/forum/db/upgrade.php index 1ba81397d70..853a195c5b4 100644 --- a/mod/forum/db/upgrade.php +++ b/mod/forum/db/upgrade.php @@ -341,6 +341,9 @@ function xmldb_forum_upgrade($oldversion) { // Moodle v2.1.0 release upgrade line // Put any upgrade step following this + // Moodle v2.2.0 release upgrade line + // Put any upgrade step following this + return true; } diff --git a/mod/forum/discuss.php b/mod/forum/discuss.php index 0e42828c9cc..c4c5316dff7 100644 --- a/mod/forum/discuss.php +++ b/mod/forum/discuss.php @@ -86,6 +86,10 @@ print_error('cannotmovetonotexist', 'forum', $return); } + if ($forumto->type == 'single') { + print_error('cannotmovetosingleforum', 'forum', $return); + } + if (!$cmto = get_coursemodule_from_instance('forum', $forumto->id, $course->id)) { print_error('cannotmovetonotfound', 'forum', $return); } @@ -221,18 +225,21 @@ if (isset($modinfo->instances['forum'])) { $forummenu = array(); $sections = get_all_sections($course->id); + // Check forum types and eliminate simple discussions. + $forumcheck = $DB->get_records('forum', array('course' => $course->id),'', 'id, type'); foreach ($modinfo->instances['forum'] as $forumcm) { if (!$forumcm->uservisible || !has_capability('mod/forum:startdiscussion', get_context_instance(CONTEXT_MODULE,$forumcm->id))) { continue; } - $section = $forumcm->sectionnum; $sectionname = get_section_name($course, $sections[$section]); if (empty($forummenu[$section])) { $forummenu[$section] = array($sectionname => array()); } - if ($forumcm->instance != $forum->id) { + $forumidcompare = $forumcm->instance != $forum->id; + $forumtypecheck = $forumcheck[$forumcm->instance]->type !== 'single'; + if ($forumidcompare and $forumtypecheck) { $url = "/mod/forum/discuss.php?d=$discussion->id&move=$forumcm->instance&sesskey=".sesskey(); $forummenu[$section][$sectionname][$url] = format_string($forumcm->name); } diff --git a/mod/forum/lang/en/forum.php b/mod/forum/lang/en/forum.php index a23be0e63a8..88ab2a84124 100644 --- a/mod/forum/lang/en/forum.php +++ b/mod/forum/lang/en/forum.php @@ -64,6 +64,7 @@ $string['cannotmovefromsingleforum'] = 'Cannot move discussion from a simple sin $string['cannotmovenotvisible'] = 'Forum not visible'; $string['cannotmovetonotexist'] = 'You can\'t move to that forum - it doesn\'t exist!'; $string['cannotmovetonotfound'] = 'Target forum not found in this course.'; +$string['cannotmovetosingleforum'] = 'Cannot move discussion to a simple single discussion forum'; $string['cannotpurgecachedrss'] = 'Could not purge the cached RSS feeds for the source and/or destination forum(s) - check your file permissionsforums'; $string['cannotremovesubscriber'] = 'Could not remove subscriber with id {$a} from this forum!'; $string['cannotreply'] = 'You cannot reply to this post'; diff --git a/mod/glossary/db/upgrade.php b/mod/glossary/db/upgrade.php index 7257c67df6d..f70627f84f6 100644 --- a/mod/glossary/db/upgrade.php +++ b/mod/glossary/db/upgrade.php @@ -352,6 +352,9 @@ function xmldb_glossary_upgrade($oldversion) { // Moodle v2.1.0 release upgrade line // Put any upgrade step following this + // Moodle v2.2.0 release upgrade line + // Put any upgrade step following this + return true; } diff --git a/mod/imscp/db/upgrade.php b/mod/imscp/db/upgrade.php index 47a4b00ed57..06a695d9727 100644 --- a/mod/imscp/db/upgrade.php +++ b/mod/imscp/db/upgrade.php @@ -34,5 +34,8 @@ function xmldb_imscp_upgrade($oldversion) { // Moodle v2.1.0 release upgrade line // Put any upgrade step following this + // Moodle v2.2.0 release upgrade line + // Put any upgrade step following this + return true; } diff --git a/mod/label/db/upgrade.php b/mod/label/db/upgrade.php index fce86e529d4..a8d49095835 100644 --- a/mod/label/db/upgrade.php +++ b/mod/label/db/upgrade.php @@ -85,6 +85,9 @@ function xmldb_label_upgrade($oldversion) { // Moodle v2.1.0 release upgrade line // Put any upgrade step following this + // Moodle v2.2.0 release upgrade line + // Put any upgrade step following this + return true; } diff --git a/mod/lesson/db/upgrade.php b/mod/lesson/db/upgrade.php index 877dfaaa3cf..4e6878345e6 100644 --- a/mod/lesson/db/upgrade.php +++ b/mod/lesson/db/upgrade.php @@ -292,6 +292,9 @@ function xmldb_lesson_upgrade($oldversion) { // Moodle v2.1.0 release upgrade line // Put any upgrade step following this + // Moodle v2.2.0 release upgrade line + // Put any upgrade step following this + return true; } diff --git a/mod/lti/db/upgrade.php b/mod/lti/db/upgrade.php index 33aa23c0d0b..e215d0360f1 100644 --- a/mod/lti/db/upgrade.php +++ b/mod/lti/db/upgrade.php @@ -78,6 +78,9 @@ function xmldb_lti_upgrade($oldversion) { upgrade_mod_savepoint(true, 2011111600, 'lti'); } + // Moodle v2.2.0 release upgrade line + // Put any upgrade step following this + return true; } diff --git a/mod/page/db/upgrade.php b/mod/page/db/upgrade.php index cec60f67914..72d249772ce 100644 --- a/mod/page/db/upgrade.php +++ b/mod/page/db/upgrade.php @@ -55,5 +55,8 @@ function xmldb_page_upgrade($oldversion) { // Moodle v2.1.0 release upgrade line // Put any upgrade step following this + // Moodle v2.2.0 release upgrade line + // Put any upgrade step following this + return true; } diff --git a/mod/quiz/db/upgrade.php b/mod/quiz/db/upgrade.php index fecf7dfa421..d60c06a8b81 100644 --- a/mod/quiz/db/upgrade.php +++ b/mod/quiz/db/upgrade.php @@ -1193,6 +1193,9 @@ function xmldb_quiz_upgrade($oldversion) { upgrade_mod_savepoint(true, 2011100604, 'quiz'); } + // Moodle v2.2.0 release upgrade line + // Put any upgrade step following this + return true; } diff --git a/mod/quiz/editlib.php b/mod/quiz/editlib.php index 0097787deb5..920d0993a35 100644 --- a/mod/quiz/editlib.php +++ b/mod/quiz/editlib.php @@ -1165,7 +1165,7 @@ class quiz_question_bank_view extends question_bank_view { $this->display_category_form($this->contexts->having_one_edit_tab_cap('edit'), $this->baseurl, $categoryandcontext); echo "

"; - print_string('selectcategoryabove', 'quiz'); + print_string('selectcategoryabove', 'question'); echo "

"; echo $OUTPUT->box_end(); } diff --git a/mod/quiz/lang/en/quiz.php b/mod/quiz/lang/en/quiz.php index df384ed7883..897a16d0741 100644 --- a/mod/quiz/lang/en/quiz.php +++ b/mod/quiz/lang/en/quiz.php @@ -664,7 +664,6 @@ $string['scores'] = 'Scores'; $string['select'] = 'Select'; $string['selectall'] = 'Select all'; $string['selectcategory'] = 'Select category'; -$string['selectcategoryabove'] = 'Select a category above'; $string['selectedattempts'] = 'Selected attempts...'; $string['selectnone'] = 'Deselect all'; $string['selectquestiontype'] = '-- Select question type --'; diff --git a/mod/quiz/report/attemptsreport.php b/mod/quiz/report/attemptsreport.php index f26b2ec7071..edc4ea4fc33 100644 --- a/mod/quiz/report/attemptsreport.php +++ b/mod/quiz/report/attemptsreport.php @@ -360,7 +360,7 @@ abstract class quiz_attempt_report extends quiz_default_report { // Ensure the attempt exists, and belongs to this quiz. If not skip. continue; } - if ($allowed && !array_key_exists($attempt->userid, $allowed)) { + if ($allowed && !in_array($attempt->userid, $allowed)) { // Ensure the attempt belongs to a student included in the report. If not skip. continue; } @@ -398,10 +398,10 @@ abstract class quiz_attempt_report_table extends table_sql { protected $groupstudents; protected $students; protected $questions; - protected $candelete; + protected $includecheckboxes; public function __construct($uniqueid, $quiz, $context, $qmsubselect, $groupstudents, - $students, $questions, $candelete, $reporturl, $displayoptions) { + $students, $questions, $includecheckboxes, $reporturl, $displayoptions) { parent::__construct($uniqueid); $this->quiz = $quiz; $this->context = $context; @@ -409,7 +409,7 @@ abstract class quiz_attempt_report_table extends table_sql { $this->groupstudents = $groupstudents; $this->students = $students; $this->questions = $questions; - $this->candelete = $candelete; + $this->includecheckboxes = $includecheckboxes; $this->reporturl = $reporturl; $this->displayoptions = $displayoptions; } @@ -690,4 +690,50 @@ abstract class quiz_attempt_report_table extends table_sql { $sortcolumns['quiza.id'] = SORT_ASC; return $sortcolumns; } + + public function wrap_html_start() { + if ($this->is_downloading() || !$this->includecheckboxes) { + return; + } + + $url = new moodle_url($this->reporturl, $this->displayoptions); + $url->param('sesskey', sesskey()); + + echo '
'; + echo '
'; + + echo html_writer::input_hidden_params($url); + echo '
'; + } + + public function wrap_html_finish() { + if ($this->is_downloading() || !$this->includecheckboxes) { + return; + } + + echo '
'; + echo '' . + get_string('selectall', 'quiz') . ' / '; + echo '' . + get_string('selectnone', 'quiz') . ' '; + echo '  '; + $this->submit_buttons(); + echo '
'; + // Close form + echo '
'; + echo '
'; + } + + /** + * Output any submit buttons required by the $this->includecheckboxes form. + */ + protected function submit_buttons() { + global $PAGE; + if (has_capability('mod/quiz:deleteattempts', $this->context)) { + echo ''; + $PAGE->requires->event_handler('#deleteattemptsbutton', 'click', 'M.util.show_confirm_dialog', + array('message' => get_string('deleteattemptcheck', 'quiz'))); + } + } } diff --git a/mod/quiz/report/overview/db/upgrade.php b/mod/quiz/report/overview/db/upgrade.php index fede5ac7d6f..e1bef7fea5f 100644 --- a/mod/quiz/report/overview/db/upgrade.php +++ b/mod/quiz/report/overview/db/upgrade.php @@ -226,5 +226,8 @@ function xmldb_quiz_overview_upgrade($oldversion) { // Moodle v2.1.0 release upgrade line // Put any upgrade step following this + // Moodle v2.2.0 release upgrade line + // Put any upgrade step following this + return true; } diff --git a/mod/quiz/report/overview/overview_table.php b/mod/quiz/report/overview/overview_table.php index 55aacb34f49..7efa3d8b79f 100644 --- a/mod/quiz/report/overview/overview_table.php +++ b/mod/quiz/report/overview/overview_table.php @@ -35,13 +35,12 @@ defined('MOODLE_INTERNAL') || die(); */ class quiz_report_overview_table extends quiz_attempt_report_table { - protected $candelete; protected $regradedqs = array(); public function __construct($quiz, $context, $qmsubselect, $groupstudents, - $students, $detailedmarks, $questions, $candelete, $reporturl, $displayoptions) { + $students, $detailedmarks, $questions, $includecheckboxes, $reporturl, $displayoptions) { parent::__construct('mod-quiz-report-overview-report', $quiz , $context, - $qmsubselect, $groupstudents, $students, $questions, $candelete, + $qmsubselect, $groupstudents, $students, $questions, $includecheckboxes, $reporturl, $displayoptions); $this->detailedmarks = $detailedmarks; } @@ -147,45 +146,12 @@ class quiz_report_overview_table extends quiz_attempt_report_table { } } - public function wrap_html_start() { - if ($this->is_downloading() || !$this->candelete) { - return; - } - - // Start form - $url = new moodle_url($this->reporturl, $this->displayoptions + - array('sesskey' => sesskey())); - echo '
'; - echo '
'; - echo '
'; - echo html_writer::input_hidden_params($url); - echo '
'; - echo '
'; - } - - public function wrap_html_finish() { - if ($this->is_downloading() || !$this->candelete) { - return; - } - - // TODO add back are you sure, and convert to html_writer. - echo '
'; - echo '' . - get_string('selectall', 'quiz') . ' / '; - echo '' . - get_string('selectnone', 'quiz') . ' '; - echo '  '; + protected function submit_buttons() { if (has_capability('mod/quiz:regrade', $this->context)) { echo ''; } - echo ''; - echo '
'; - // Close form - echo '
'; - echo '
'; + parent::submit_buttons(); } public function col_sumgrades($attempt) { diff --git a/mod/quiz/report/overview/report.php b/mod/quiz/report/overview/report.php index 9b518a4ddd3..e863e45fa5e 100644 --- a/mod/quiz/report/overview/report.php +++ b/mod/quiz/report/overview/report.php @@ -106,7 +106,8 @@ class quiz_overview_report extends quiz_attempt_report { // We only want to show the checkbox to delete attempts // if the user has permissions and if the report mode is showing attempts. - $candelete = has_capability('mod/quiz:deleteattempts', $this->context) + $includecheckboxes = has_any_capability( + array('mod/quiz:regrade', 'mod/quiz:deleteattempts'), $this->context) && ($attemptsmode != QUIZ_REPORT_ATTEMPTS_STUDENTS_WITH_NO); if ($attemptsmode == QUIZ_REPORT_ATTEMPTS_ALL) { @@ -128,7 +129,7 @@ class quiz_overview_report extends quiz_attempt_report { $questions = quiz_report_get_significant_questions($quiz); $table = new quiz_report_overview_table($quiz, $this->context, $qmsubselect, - $groupstudents, $students, $detailedmarks, $questions, $candelete, + $groupstudents, $students, $detailedmarks, $questions, $includecheckboxes, $reporturl, $displayoptions); $filename = quiz_report_download_filename(get_string('overviewfilename', 'quiz_overview'), $courseshortname, $quiz->name); @@ -290,7 +291,7 @@ class quiz_overview_report extends quiz_attempt_report { $columns = array(); $headers = array(); - if (!$table->is_downloading() && $candelete) { + if (!$table->is_downloading() && $includecheckboxes) { $columns[] = 'checkbox'; $headers[] = null; } diff --git a/mod/quiz/report/responses/report.php b/mod/quiz/report/responses/report.php index aad714022e7..9f9857e4f0f 100644 --- a/mod/quiz/report/responses/report.php +++ b/mod/quiz/report/responses/report.php @@ -105,7 +105,7 @@ class quiz_responses_report extends quiz_attempt_report { // We only want to show the checkbox to delete attempts // if the user has permissions and if the report mode is showing attempts. - $candelete = has_capability('mod/quiz:deleteattempts', $this->context) + $includecheckboxes = has_capability('mod/quiz:deleteattempts', $this->context) && ($attemptsmode != QUIZ_REPORT_ATTEMPTS_STUDENTS_WITH_NO); $displayoptions = array(); @@ -124,11 +124,14 @@ class quiz_responses_report extends quiz_attempt_report { $allowed = array(); } - $attemptids = optional_param_array('attemptid', array(), PARAM_INT); - if ($attemptids && confirm_sesskey()) { - require_capability('mod/quiz:deleteattempts', $this->context); - $this->delete_selected_attempts($quiz, $cm, $attemptids, $allowed); - redirect($reporturl->out(false, $displayoptions)); + if (empty($currentgroup) || $groupstudents) { + if (optional_param('delete', 0, PARAM_BOOL) && confirm_sesskey()) { + if ($attemptids = optional_param_array('attemptid', array(), PARAM_INT)) { + require_capability('mod/quiz:deleteattempts', $this->context); + $this->delete_selected_attempts($quiz, $cm, $attemptids, $allowed); + redirect($reporturl->out(false, $displayoptions)); + } + } } // Load the required questions. @@ -143,7 +146,7 @@ class quiz_responses_report extends quiz_attempt_report { array('context' => $displaycoursecontext)); $table = new quiz_report_responses_table($quiz, $this->context, $qmsubselect, - $groupstudents, $students, $questions, $candelete, $reporturl, $displayoptions); + $groupstudents, $students, $questions, $includecheckboxes, $reporturl, $displayoptions); $filename = quiz_report_download_filename(get_string('responsesfilename', 'quiz_responses'), $courseshortname, $quiz->name); $table->is_downloading($download, $filename, @@ -205,7 +208,7 @@ class quiz_responses_report extends quiz_attempt_report { $columns = array(); $headers = array(); - if (!$table->is_downloading() && $candelete) { + if (!$table->is_downloading() && $includecheckboxes) { $columns[] = 'checkbox'; $headers[] = null; } diff --git a/mod/quiz/report/responses/responses_table.php b/mod/quiz/report/responses/responses_table.php index c994908e603..cfb4633ddcf 100644 --- a/mod/quiz/report/responses/responses_table.php +++ b/mod/quiz/report/responses/responses_table.php @@ -36,9 +36,9 @@ defined('MOODLE_INTERNAL') || die(); class quiz_report_responses_table extends quiz_attempt_report_table { public function __construct($quiz, $context, $qmsubselect, $groupstudents, - $students, $questions, $candelete, $reporturl, $displayoptions) { + $students, $questions, $includecheckboxes, $reporturl, $displayoptions) { parent::__construct('mod-quiz-report-responses-report', $quiz, $context, - $qmsubselect, $groupstudents, $students, $questions, $candelete, + $qmsubselect, $groupstudents, $students, $questions, $includecheckboxes, $reporturl, $displayoptions); } @@ -49,43 +49,6 @@ class quiz_report_responses_table extends quiz_attempt_report_table { } } - public function wrap_html_start() { - global $PAGE; - if ($this->is_downloading() || !$this->candelete) { - return; - } - - // Start form - $url = new moodle_url($this->reporturl, $this->displayoptions); - $url->param('sesskey', sesskey()); - - echo '
'; - echo '
'; - echo ''. - get_string('selectall', 'quiz').' / '; - echo ''. - get_string('selectnone', 'quiz').' '; - echo '  '; - echo ''; - echo '
'; - // Close form - echo ''; - echo ''; - } - public function col_sumgrades($attempt) { if (!$attempt->timefinish) { return '-'; diff --git a/mod/quiz/report/statistics/db/upgrade.php b/mod/quiz/report/statistics/db/upgrade.php index a25da3ca486..6ee18fd6b6b 100644 --- a/mod/quiz/report/statistics/db/upgrade.php +++ b/mod/quiz/report/statistics/db/upgrade.php @@ -398,6 +398,9 @@ function xmldb_quiz_statistics_upgrade($oldversion) { // Moodle v2.1.0 release upgrade line // Put any upgrade step following this + // Moodle v2.2.0 release upgrade line + // Put any upgrade step following this + return true; } diff --git a/mod/quiz/report/statistics/report.php b/mod/quiz/report/statistics/report.php index 4d976005b61..f29d2205ee6 100644 --- a/mod/quiz/report/statistics/report.php +++ b/mod/quiz/report/statistics/report.php @@ -313,15 +313,22 @@ class quiz_statistics_report extends quiz_default_report { // Display the various bits. echo $OUTPUT->heading(get_string('questioninformation', 'quiz_statistics')); echo html_writer::table($questioninfotable); - - echo $OUTPUT->box(format_text($question->questiontext, $question->questiontextformat, - array('overflowdiv' => true)) . $actions, - 'questiontext boxaligncenter generalbox boxwidthnormal mdl-align'); - + echo $this->render_question_text($question); echo $OUTPUT->heading(get_string('questionstatistics', 'quiz_statistics')); echo html_writer::table($questionstatstable); } + /** + * @param object $question question data. + * @return string HTML of question text, ready for display. + */ + protected function render_question_text($question){ + global $OUTPUT; + return $OUTPUT->box(format_text($question->questiontext, $question->questiontextformat, + array('overflowdiv' => true)), + 'questiontext boxaligncenter generalbox boxwidthnormal mdl-align'); + } + /** * Display the response analysis for a question. * @param object $question the question to report on. @@ -356,6 +363,10 @@ class quiz_statistics_report extends quiz_default_report { // Set up the table. $exportclass->start_table($questiontabletitle); + + if ($this->table->is_downloading() == 'xhtml') { + echo $this->render_question_text($question); + } } $responesstats = new quiz_statistics_response_analyser($question); diff --git a/mod/resource/db/upgrade.php b/mod/resource/db/upgrade.php index b1831a1ae2e..1a9d2bedc48 100644 --- a/mod/resource/db/upgrade.php +++ b/mod/resource/db/upgrade.php @@ -265,5 +265,8 @@ function xmldb_resource_upgrade($oldversion) { // Moodle v2.1.0 release upgrade line // Put any upgrade step following this + // Moodle v2.2.0 release upgrade line + // Put any upgrade step following this + return true; } diff --git a/mod/scorm/datamodels/scorm_13.js.php b/mod/scorm/datamodels/scorm_13.js.php index 9b5d4874091..d6e0b03bd27 100644 --- a/mod/scorm/datamodels/scorm_13.js.php +++ b/mod/scorm/datamodels/scorm_13.js.php @@ -177,11 +177,11 @@ function SCORMapi1_3() { 'cmi.comments_from_lms.n.comment':{'format':CMILangString4000, 'mod':'r'}, 'cmi.comments_from_lms.n.location':{'format':CMIString250, 'mod':'r'}, 'cmi.comments_from_lms.n.timestamp':{'format':CMITime, 'mod':'r'}, - 'cmi.completion_status':{'defaultvalue':'{'cmi.completion_status'})?$userdata->{'cmi.completion_status'}:'unknown' ?>', 'format':CMICStatus, 'mod':'rw'}, - 'cmi.completion_threshold':{'defaultvalue':threshold)?'\''.$userdata->threshold.'\'':'null' ?>, 'mod':'r'}, - 'cmi.credit':{'defaultvalue':'credit)?$userdata->credit:'' ?>', 'mod':'r'}, + 'cmi.completion_status':{'defaultvalue':'{'cmi.completion_status'})?$userdata->{'cmi.completion_status'}:'unknown' ?>', 'format':CMICStatus, 'mod':'rw'}, + 'cmi.completion_threshold':{'defaultvalue':threshold)?'\''.$userdata->threshold.'\'':'null' ?>, 'mod':'r'}, + 'cmi.credit':{'defaultvalue':'credit)?$userdata->credit:'' ?>', 'mod':'r'}, 'cmi.entry':{'defaultvalue':'entry ?>', 'mod':'r'}, - 'cmi.exit':{'defaultvalue':'{'cmi.exit'})?$userdata->{'cmi.exit'}:'' ?>', 'format':CMIExit, 'mod':'w'}, + 'cmi.exit':{'defaultvalue':'{'cmi.exit'})?$userdata->{'cmi.exit'}:'' ?>', 'format':CMIExit, 'mod':'w'}, 'cmi.interactions._children':{'defaultvalue':interactions_children, 'mod':'r'}, 'cmi.interactions._count':{'mod':'r', 'defaultvalue':'0'}, 'cmi.interactions.n.id':{'pattern':CMIIndex, 'format':CMILongIdentifier, 'mod':'rw'}, @@ -196,7 +196,7 @@ function SCORMapi1_3() { 'cmi.interactions.n.result':{'pattern':CMIIndex, 'format':CMIResult, 'mod':'rw'}, 'cmi.interactions.n.latency':{'pattern':CMIIndex, 'format':CMITimespan, 'mod':'rw'}, 'cmi.interactions.n.description':{'pattern':CMIIndex, 'format':CMILangString250, 'mod':'rw'}, - 'cmi.launch_data':{'defaultvalue':datafromlms)?'\''.$userdata->datafromlms.'\'':'null' ?>, 'mod':'r'}, + 'cmi.launch_data':{'defaultvalue':datafromlms)?'\''.$userdata->datafromlms.'\'':'null' ?>, 'mod':'r'}, 'cmi.learner_id':{'defaultvalue':'student_id ?>', 'mod':'r'}, 'cmi.learner_name':{'defaultvalue':'student_name ?>', 'mod':'r'}, 'cmi.learner_preference._children':{'defaultvalue':student_preference_children, 'mod':'r'}, @@ -204,8 +204,8 @@ function SCORMapi1_3() { 'cmi.learner_preference.language':{'defaultvalue':'', 'format':CMILang, 'mod':'rw'}, 'cmi.learner_preference.delivery_speed':{'defaultvalue':'1', 'format':CMIDecimal, 'range':speed_range, 'mod':'rw'}, 'cmi.learner_preference.audio_captioning':{'defaultvalue':'0', 'format':CMISInteger, 'range':text_range, 'mod':'rw'}, - 'cmi.location':{'defaultvalue':{'cmi.location'})?'\''.$userdata->{'cmi.location'}.'\'':'null' ?>, 'format':CMIString1000, 'mod':'rw'}, - 'cmi.max_time_allowed':{'defaultvalue':attemptAbsoluteDurationLimit)?'\''.$userdata->attemptAbsoluteDurationLimit.'\'':'null' ?>, 'mod':'r'}, + 'cmi.location':{'defaultvalue':{'cmi.location'})?'\''.$userdata->{'cmi.location'}.'\'':'null' ?>, 'format':CMIString1000, 'mod':'rw'}, + 'cmi.max_time_allowed':{'defaultvalue':attemptAbsoluteDurationLimit)?'\''.$userdata->attemptAbsoluteDurationLimit.'\'':'null' ?>, 'mod':'r'}, 'cmi.mode':{'defaultvalue':'mode ?>', 'mod':'r'}, 'cmi.objectives._children':{'defaultvalue':objectives_children, 'mod':'r'}, 'cmi.objectives._count':{'mod':'r', 'defaultvalue':'0'}, @@ -219,18 +219,18 @@ function SCORMapi1_3() { 'cmi.objectives.n.completion_status':{'defaultvalue':'unknown', 'pattern':CMIIndex, 'format':CMICStatus, 'mod':'rw'}, 'cmi.objectives.n.progress_measure':{'defaultvalue':null, 'format':CMIDecimal, 'range':progress_range, 'mod':'rw'}, 'cmi.objectives.n.description':{'pattern':CMIIndex, 'format':CMILangString250, 'mod':'rw'}, - 'cmi.progress_measure':{'defaultvalue':{'cmi.progess_measure'})?'\''.$userdata->{'cmi.progress_measure'}.'\'':'null' ?>, 'format':CMIDecimal, 'range':progress_range, 'mod':'rw'}, - 'cmi.scaled_passing_score':{'defaultvalue':{'cmi.scaled_passing_score'})?'\''.$userdata->{'cmi.scaled_passing_score'}.'\'':'null' ?>, 'format':CMIDecimal, 'range':scaled_range, 'mod':'r'}, + 'cmi.progress_measure':{'defaultvalue':{'cmi.progess_measure'})?'\''.$userdata->{'cmi.progress_measure'}.'\'':'null' ?>, 'format':CMIDecimal, 'range':progress_range, 'mod':'rw'}, + 'cmi.scaled_passing_score':{'defaultvalue':{'cmi.scaled_passing_score'})?'\''.$userdata->{'cmi.scaled_passing_score'}.'\'':'null' ?>, 'format':CMIDecimal, 'range':scaled_range, 'mod':'r'}, 'cmi.score._children':{'defaultvalue':score_children, 'mod':'r'}, - 'cmi.score.scaled':{'defaultvalue':{'cmi.score.scaled'})?'\''.$userdata->{'cmi.score.scaled'}.'\'':'null' ?>, 'format':CMIDecimal, 'range':scaled_range, 'mod':'rw'}, - 'cmi.score.raw':{'defaultvalue':{'cmi.score.raw'})?'\''.$userdata->{'cmi.score.raw'}.'\'':'null' ?>, 'format':CMIDecimal, 'mod':'rw'}, - 'cmi.score.min':{'defaultvalue':{'cmi.score.min'})?'\''.$userdata->{'cmi.score.min'}.'\'':'null' ?>, 'format':CMIDecimal, 'mod':'rw'}, - 'cmi.score.max':{'defaultvalue':{'cmi.score.max'})?'\''.$userdata->{'cmi.score.max'}.'\'':'null' ?>, 'format':CMIDecimal, 'mod':'rw'}, + 'cmi.score.scaled':{'defaultvalue':{'cmi.score.scaled'})?'\''.$userdata->{'cmi.score.scaled'}.'\'':'null' ?>, 'format':CMIDecimal, 'range':scaled_range, 'mod':'rw'}, + 'cmi.score.raw':{'defaultvalue':{'cmi.score.raw'})?'\''.$userdata->{'cmi.score.raw'}.'\'':'null' ?>, 'format':CMIDecimal, 'mod':'rw'}, + 'cmi.score.min':{'defaultvalue':{'cmi.score.min'})?'\''.$userdata->{'cmi.score.min'}.'\'':'null' ?>, 'format':CMIDecimal, 'mod':'rw'}, + 'cmi.score.max':{'defaultvalue':{'cmi.score.max'})?'\''.$userdata->{'cmi.score.max'}.'\'':'null' ?>, 'format':CMIDecimal, 'mod':'rw'}, 'cmi.session_time':{'format':CMITimespan, 'mod':'w', 'defaultvalue':'PT0H0M0S'}, - 'cmi.success_status':{'defaultvalue':'{'cmi.success_status'})?$userdata->{'cmi.success_status'}:'unknown' ?>', 'format':CMISStatus, 'mod':'rw'}, - 'cmi.suspend_data':{'defaultvalue':{'cmi.suspend_data'})?'\''.$userdata->{'cmi.suspend_data'}.'\'':'null' ?>, 'format':CMIString64000, 'mod':'rw'}, - 'cmi.time_limit_action':{'defaultvalue':timelimitaction)?'\''.$userdata->timelimitaction.'\'':'null' ?>, 'mod':'r'}, - 'cmi.total_time':{'defaultvalue':'{'cmi.total_time'})?$userdata->{'cmi.total_time'}:'PT0H0M0S' ?>', 'mod':'r'}, + 'cmi.success_status':{'defaultvalue':'{'cmi.success_status'})?$userdata->{'cmi.success_status'}:'unknown' ?>', 'format':CMISStatus, 'mod':'rw'}, + 'cmi.suspend_data':{'defaultvalue':{'cmi.suspend_data'})?'\''.$userdata->{'cmi.suspend_data'}.'\'':'null' ?>, 'format':CMIString64000, 'mod':'rw'}, + 'cmi.time_limit_action':{'defaultvalue':timelimitaction)?'\''.$userdata->timelimitaction.'\'':'null' ?>, 'mod':'r'}, + 'cmi.total_time':{'defaultvalue':'{'cmi.total_time'})?$userdata->{'cmi.total_time'}:'PT0H0M0S' ?>', 'mod':'r'}, 'adl.nav.request':{'defaultvalue':'_none_', 'format':NAVEvent, 'mod':'rw'} }; // diff --git a/mod/scorm/db/upgrade.php b/mod/scorm/db/upgrade.php index 32396c9a462..c48eaeb0ec2 100644 --- a/mod/scorm/db/upgrade.php +++ b/mod/scorm/db/upgrade.php @@ -604,6 +604,9 @@ function xmldb_scorm_upgrade($oldversion) { upgrade_mod_savepoint(true, 2011110502, 'scorm'); } + // Moodle v2.2.0 release upgrade line + // Put any upgrade step following this + return true; } diff --git a/mod/scorm/loadSCO.php b/mod/scorm/loadSCO.php index d7988f576e8..ea2a6b8ca43 100644 --- a/mod/scorm/loadSCO.php +++ b/mod/scorm/loadSCO.php @@ -141,6 +141,8 @@ if (scorm_external_link($sco->launch)) { $result = "$CFG->wwwroot/pluginfile.php/$context->id/mod_scorm/content/$scorm->revision/$launcher"; } +add_to_log($course->id, 'scorm', 'launch', 'view.php?id='.$cm->id, $result, $cm->id); + // which API are we looking for $LMS_api = (scorm_version_check($scorm->version, SCORM_12) || empty($scorm->version)) ? 'API' : 'API_1484_11'; ?> @@ -211,9 +213,5 @@ $LMS_api = (scorm_version_check($scorm->version, SCORM_12) || empty($scorm->vers

- id, 'scorm', 'launch', 'view.php?id='.$cm->id, $result, $cm->id); - } - ?> diff --git a/mod/scorm/report/basic/report.php b/mod/scorm/report/basic/report.php index 5cd4c1b2787..d2f9f6840ea 100644 --- a/mod/scorm/report/basic/report.php +++ b/mod/scorm/report/basic/report.php @@ -36,6 +36,8 @@ class scorm_basic_report extends scorm_default_report { $contextmodule= get_context_instance(CONTEXT_MODULE, $cm->id); $action = optional_param('action', '', PARAM_ALPHA); $attemptids = optional_param_array('attemptid', array(), PARAM_RAW); + $attemptsmode = optional_param('attemptsmode', SCORM_REPORT_ATTEMPTS_ALL_STUDENTS, PARAM_INT); + $PAGE->set_url(new moodle_url($PAGE->url, array('attemptsmode' => $attemptsmode))); if ($action == 'delete' && has_capability('mod/scorm:deleteresponses', $contextmodule) && confirm_sesskey()) { if (scorm_delete_responses($attemptids, $scorm)) { //delete responses. @@ -43,19 +45,19 @@ class scorm_basic_report extends scorm_default_report { echo $OUTPUT->notification(get_string('scormresponsedeleted', 'scorm'), 'notifysuccess'); } } + // find out current groups mode + $currentgroup = groups_get_activity_group($cm, true); // detailed report $mform = new mod_scorm_report_settings($PAGE->url, compact('currentgroup')); if ($fromform = $mform->get_data()) { $detailedrep = $fromform->detailedrep; $pagesize = $fromform->pagesize; - $attemptsmode = !empty($fromform->attemptsmode) ? $fromform->attemptsmode : SCORM_REPORT_ATTEMPTS_ALL_STUDENTS; set_user_preference('scorm_report_detailed', $detailedrep); set_user_preference('scorm_report_pagesize', $pagesize); } else { $detailedrep = get_user_preferences('scorm_report_detailed', false); $pagesize = get_user_preferences('scorm_report_pagesize', 0); - $attemptsmode = optional_param('attemptsmode', SCORM_REPORT_ATTEMPTS_STUDENTS_WITH, PARAM_INT); } if ($pagesize < 1) { $pagesize = SCORM_REPORT_DEFAULT_PAGE_SIZE; @@ -84,7 +86,7 @@ class scorm_basic_report extends scorm_default_report { $nostudents = true; $allowedlist = ''; } else { - $allowedlist = join(',', array_keys($students)); + $allowedlist = array_keys($students); } } else { // all users who can attempt scoes and who are in the currently selected group @@ -93,7 +95,7 @@ class scorm_basic_report extends scorm_default_report { $nostudents = true; $groupstudents = array(); } - $allowedlist = join(',', array_keys($groupstudents)); + $allowedlist = array_keys($groupstudents); } if ( !$nostudents ) { @@ -269,7 +271,8 @@ class scorm_basic_report extends scorm_default_report { header("Pragma: public"); echo implode("\t", $headers)." \n"; } - + $params = array(); + list($usql, $params) = $DB->get_in_or_equal($allowedlist, SQL_PARAMS_NAMED); // Construct the SQL $select = 'SELECT DISTINCT '.$DB->sql_concat('u.id', '\'#\'', 'COALESCE(st.attempt, 0)').' AS uniqueid, '; $select .= 'st.scormid AS scormid, st.attempt AS attempt, ' . @@ -282,15 +285,15 @@ class scorm_basic_report extends scorm_default_report { switch ($attemptsmode) { case SCORM_REPORT_ATTEMPTS_STUDENTS_WITH: // Show only students with attempts - $where = ' WHERE u.id IN (' .$allowedlist. ') AND st.userid IS NOT NULL'; + $where = ' WHERE u.id ' .$usql. ' AND st.userid IS NOT NULL'; break; case SCORM_REPORT_ATTEMPTS_STUDENTS_WITH_NO: // Show only students without attempts - $where = ' WHERE u.id IN (' .$allowedlist. ') AND st.userid IS NULL'; + $where = ' WHERE u.id ' .$usql. ' AND st.userid IS NULL'; break; case SCORM_REPORT_ATTEMPTS_ALL_STUDENTS: // Show all students with or without attempts - $where = ' WHERE u.id IN (' .$allowedlist. ') AND (st.userid IS NOT NULL OR st.userid IS NULL)'; + $where = ' WHERE u.id ' .$usql. ' AND (st.userid IS NOT NULL OR st.userid IS NULL)'; break; } @@ -298,7 +301,6 @@ class scorm_basic_report extends scorm_default_report { $countsql .= 'COUNT(DISTINCT('.$DB->sql_concat('u.id', '\'#\'', 'st.attempt').')) AS nbattempts, '; $countsql .= 'COUNT(DISTINCT(u.id)) AS nbusers '; $countsql .= $from.$where; - $params = array(); if (!$download) { $sort = $table->get_sql_sort(); @@ -321,7 +323,7 @@ class scorm_basic_report extends scorm_default_report { } if (!empty($countsql)) { - $count = $DB->get_record_sql($countsql); + $count = $DB->get_record_sql($countsql, $params); $totalinitials = $count->nbresults; if ($twhere) { $countsql .= ' AND '.$twhere; @@ -520,7 +522,7 @@ class scorm_basic_report extends scorm_default_report { } } if (!$download) { - $mform->set_data(compact('detailedrep', 'pagesize')); + $mform->set_data(compact('detailedrep', 'pagesize', 'attemptsmode')); $mform->display(); } } else { diff --git a/mod/scorm/report/interactions/report.php b/mod/scorm/report/interactions/report.php index 96e1ff280cf..12e61abdeb9 100644 --- a/mod/scorm/report/interactions/report.php +++ b/mod/scorm/report/interactions/report.php @@ -38,6 +38,8 @@ class scorm_interactions_report extends scorm_default_report { $contextmodule = get_context_instance(CONTEXT_MODULE, $cm->id); $action = optional_param('action', '', PARAM_ALPHA); $attemptids = optional_param_array('attemptid', array(), PARAM_RAW); + $attemptsmode = optional_param('attemptsmode', SCORM_REPORT_ATTEMPTS_ALL_STUDENTS, PARAM_INT); + $PAGE->set_url(new moodle_url($PAGE->url, array('attemptsmode' => $attemptsmode))); if ($action == 'delete' && has_capability('mod/scorm:deleteresponses', $contextmodule) && confirm_sesskey()) { if (scorm_delete_responses($attemptids, $scorm)) { //delete responses. @@ -45,6 +47,8 @@ class scorm_interactions_report extends scorm_default_report { echo $OUTPUT->notification(get_string('scormresponsedeleted', 'scorm'), 'notifysuccess'); } } + // find out current groups mode + $currentgroup = groups_get_activity_group($cm, true); // detailed report $mform = new mod_scorm_report_interactions_settings($PAGE->url, compact('currentgroup')); @@ -53,14 +57,12 @@ class scorm_interactions_report extends scorm_default_report { $includeqtext = $fromform->qtext; $includeresp = $fromform->resp; $includeright = $fromform->right; - $attemptsmode = !empty($fromform->attemptsmode) ? $fromform->attemptsmode : SCORM_REPORT_ATTEMPTS_ALL_STUDENTS; set_user_preference('scorm_report_pagesize', $pagesize); set_user_preference('scorm_report_interactions_qtext', $includeqtext); set_user_preference('scorm_report_interactions_resp', $includeresp); set_user_preference('scorm_report_interactions_right', $includeright); } else { $pagesize = get_user_preferences('scorm_report_pagesize', 0); - $attemptsmode = optional_param('attemptsmode', SCORM_REPORT_ATTEMPTS_STUDENTS_WITH, PARAM_INT); $includeqtext = get_user_preferences('scorm_report_interactions_qtext', 0); $includeresp = get_user_preferences('scorm_report_interactions_resp', 1); $includeright = get_user_preferences('scorm_report_interactions_right', 0); @@ -107,7 +109,7 @@ class scorm_interactions_report extends scorm_default_report { $nostudents = true; $groupstudents = array(); } - $allowedlist = ($groupstudents); + $allowedlist = array_keys($groupstudents); } if ( !$nostudents ) { // Now check if asked download of data @@ -582,7 +584,7 @@ class scorm_interactions_report extends scorm_default_report { } } if (!$download) { - $mform->set_data(compact('detailedrep', 'pagesize')); + $mform->set_data(compact('detailedrep', 'pagesize', 'attemptsmode')); $mform->display(); } } else { diff --git a/mod/survey/db/upgrade.php b/mod/survey/db/upgrade.php index b9d06a213b1..ab5b273ff63 100644 --- a/mod/survey/db/upgrade.php +++ b/mod/survey/db/upgrade.php @@ -57,6 +57,9 @@ function xmldb_survey_upgrade($oldversion) { // Moodle v2.1.0 release upgrade line // Put any upgrade step following this + // Moodle v2.2.0 release upgrade line + // Put any upgrade step following this + return true; } diff --git a/mod/url/db/upgrade.php b/mod/url/db/upgrade.php index 01926f80c9c..c636b674c12 100644 --- a/mod/url/db/upgrade.php +++ b/mod/url/db/upgrade.php @@ -68,5 +68,8 @@ function xmldb_url_upgrade($oldversion) { upgrade_mod_savepoint(true, 2011092800, 'url'); } + // Moodle v2.2.0 release upgrade line + // Put any upgrade step following this + return true; } diff --git a/mod/wiki/db/upgrade.php b/mod/wiki/db/upgrade.php index 63a1d2f8c37..d4c84b6c630 100644 --- a/mod/wiki/db/upgrade.php +++ b/mod/wiki/db/upgrade.php @@ -373,5 +373,8 @@ function xmldb_wiki_upgrade($oldversion) { // Moodle v2.1.0 release upgrade line // Put any upgrade step following this + // Moodle v2.2.0 release upgrade line + // Put any upgrade step following this + return true; } diff --git a/mod/workshop/db/upgrade.php b/mod/workshop/db/upgrade.php index abde32722c1..3b2dd18fe1e 100644 --- a/mod/workshop/db/upgrade.php +++ b/mod/workshop/db/upgrade.php @@ -319,5 +319,8 @@ function xmldb_workshop_upgrade($oldversion) { upgrade_mod_savepoint(true, 2011110400, 'workshop'); } + // Moodle v2.2.0 release upgrade line + // Put any upgrade step following this + return true; } diff --git a/mod/workshop/form/accumulative/db/upgrade.php b/mod/workshop/form/accumulative/db/upgrade.php index 0626d936ddd..7a78bb9a8b1 100644 --- a/mod/workshop/form/accumulative/db/upgrade.php +++ b/mod/workshop/form/accumulative/db/upgrade.php @@ -52,5 +52,8 @@ function xmldb_workshopform_accumulative_upgrade($oldversion) { // Moodle v2.1.0 release upgrade line // Put any upgrade step following this + // Moodle v2.2.0 release upgrade line + // Put any upgrade step following this + return true; } diff --git a/mod/workshop/form/comments/db/upgrade.php b/mod/workshop/form/comments/db/upgrade.php index 82402d7ab28..42ace1c276e 100644 --- a/mod/workshop/form/comments/db/upgrade.php +++ b/mod/workshop/form/comments/db/upgrade.php @@ -52,5 +52,8 @@ function xmldb_workshopform_comments_upgrade($oldversion) { // Moodle v2.1.0 release upgrade line // Put any upgrade step following this + // Moodle v2.2.0 release upgrade line + // Put any upgrade step following this + return true; } diff --git a/mod/workshop/form/numerrors/db/upgrade.php b/mod/workshop/form/numerrors/db/upgrade.php index 553cc735548..59cc3867665 100644 --- a/mod/workshop/form/numerrors/db/upgrade.php +++ b/mod/workshop/form/numerrors/db/upgrade.php @@ -62,5 +62,8 @@ function xmldb_workshopform_numerrors_upgrade($oldversion) { // Moodle v2.1.0 release upgrade line // Put any upgrade step following this + // Moodle v2.2.0 release upgrade line + // Put any upgrade step following this + return true; } diff --git a/mod/workshop/form/rubric/db/upgrade.php b/mod/workshop/form/rubric/db/upgrade.php index ac69e2fc05f..ea418d5bc6c 100644 --- a/mod/workshop/form/rubric/db/upgrade.php +++ b/mod/workshop/form/rubric/db/upgrade.php @@ -63,5 +63,8 @@ function xmldb_workshopform_rubric_upgrade($oldversion) { // Moodle v2.1.0 release upgrade line // Put any upgrade step following this + // Moodle v2.2.0 release upgrade line + // Put any upgrade step following this + return true; } diff --git a/question/editlib.php b/question/editlib.php index 4079d48488b..2b541a6306c 100644 --- a/question/editlib.php +++ b/question/editlib.php @@ -1198,7 +1198,7 @@ class question_bank_view { protected function print_choose_category_message($categoryandcontext) { echo "

"; - print_string("selectcategoryabove", "question"); + print_string('selectcategoryabove', 'question'); echo "

"; } diff --git a/question/type/calculated/db/upgrade.php b/question/type/calculated/db/upgrade.php index 0605694a279..7d49e4247ae 100644 --- a/question/type/calculated/db/upgrade.php +++ b/question/type/calculated/db/upgrade.php @@ -230,6 +230,9 @@ function xmldb_qtype_calculated_upgrade($oldversion) { // Moodle v2.1.0 release upgrade line // Put any upgrade step following this + // Moodle v2.2.0 release upgrade line + // Put any upgrade step following this + return true; } diff --git a/question/type/essay/db/upgrade.php b/question/type/essay/db/upgrade.php index e74b8eaa2b3..f5938bdf3f9 100644 --- a/question/type/essay/db/upgrade.php +++ b/question/type/essay/db/upgrade.php @@ -90,5 +90,8 @@ function xmldb_qtype_essay_upgrade($oldversion) { // Moodle v2.1.0 release upgrade line // Put any upgrade step following this + // Moodle v2.2.0 release upgrade line + // Put any upgrade step following this + return true; } diff --git a/question/type/match/db/upgrade.php b/question/type/match/db/upgrade.php index fa89bf3d874..e799034226a 100644 --- a/question/type/match/db/upgrade.php +++ b/question/type/match/db/upgrade.php @@ -210,5 +210,8 @@ function xmldb_qtype_match_upgrade($oldversion) { // Moodle v2.1.0 release upgrade line // Put any upgrade step following this + // Moodle v2.2.0 release upgrade line + // Put any upgrade step following this + return true; } diff --git a/question/type/multianswer/db/upgrade.php b/question/type/multianswer/db/upgrade.php index cc832b92e16..ce7a57cfeba 100644 --- a/question/type/multianswer/db/upgrade.php +++ b/question/type/multianswer/db/upgrade.php @@ -59,5 +59,8 @@ function xmldb_qtype_multianswer_upgrade($oldversion) { // Moodle v2.1.0 release upgrade line // Put any upgrade step following this + // Moodle v2.2.0 release upgrade line + // Put any upgrade step following this + return true; } diff --git a/question/type/multichoice/db/upgrade.php b/question/type/multichoice/db/upgrade.php index 22dc83a7f7b..a26790ac8c1 100644 --- a/question/type/multichoice/db/upgrade.php +++ b/question/type/multichoice/db/upgrade.php @@ -151,5 +151,8 @@ function xmldb_qtype_multichoice_upgrade($oldversion) { // Moodle v2.1.0 release upgrade line // Put any upgrade step following this + // Moodle v2.2.0 release upgrade line + // Put any upgrade step following this + return true; } diff --git a/question/type/numerical/db/upgrade.php b/question/type/numerical/db/upgrade.php index 09550c69ac4..5a3ae490c9c 100644 --- a/question/type/numerical/db/upgrade.php +++ b/question/type/numerical/db/upgrade.php @@ -237,6 +237,9 @@ function xmldb_qtype_numerical_upgrade($oldversion) { // Moodle v2.1.0 release upgrade line // Put any upgrade step following this + // Moodle v2.2.0 release upgrade line + // Put any upgrade step following this + return true; } diff --git a/question/upgrade.php b/question/upgrade.php index 7e5074be5b0..fbedeb7ca1f 100644 --- a/question/upgrade.php +++ b/question/upgrade.php @@ -40,5 +40,6 @@ defined('MOODLE_INTERNAL') || die(); function question_fix_random_question_parents() { global $CFG, $DB; $DB->execute("UPDATE {question} SET parent = id WHERE qtype = 'random' AND parent <> id"); + return true; } diff --git a/tag/coursetags_edit.php b/tag/coursetags_edit.php index be710fe1e56..18d40a45da8 100644 --- a/tag/coursetags_edit.php +++ b/tag/coursetags_edit.php @@ -41,7 +41,7 @@ if ($courseid != SITEID) { } // Permissions -$sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID); +$sitecontext = get_context_instance(CONTEXT_SYSTEM); require_login($course->id); $canedit = has_capability('moodle/tag:create', $sitecontext); diff --git a/theme/formal_white/db/upgrade.php b/theme/formal_white/db/upgrade.php index e26319500b2..81d789db5d2 100644 --- a/theme/formal_white/db/upgrade.php +++ b/theme/formal_white/db/upgrade.php @@ -63,5 +63,8 @@ function xmldb_theme_formal_white_upgrade($oldversion) { // Moodle v2.1.0 release upgrade line // Put any upgrade step following this + // Moodle v2.2.0 release upgrade line + // Put any upgrade step following this + return true; } \ No newline at end of file diff --git a/user/lib.php b/user/lib.php index 7c2267fe327..66f84047a47 100644 --- a/user/lib.php +++ b/user/lib.php @@ -392,8 +392,5 @@ function user_get_user_details($user, $course = null, array $userfields = array( * @param stdClass $currentcontext Current context of block */ function user_page_type_list($pagetype, $parentcontext, $currentcontext) { - return array( - 'user-profile'=>get_string('page-user-profile', 'pagetype'), - 'my-index'=>get_string('page-my-index', 'pagetype') - ); + return array('user-profile'=>get_string('page-user-profile', 'pagetype')); } diff --git a/user/profile/field/checkbox/field.class.php b/user/profile/field/checkbox/field.class.php index 75c955d54ed..29aaf3dd9b4 100644 --- a/user/profile/field/checkbox/field.class.php +++ b/user/profile/field/checkbox/field.class.php @@ -29,7 +29,7 @@ class profile_field_checkbox extends profile_field_base { $checkbox->setChecked(true); } $mform->setType($this->inputname, PARAM_BOOL); - if ($this->is_required() and !has_capability('moodle/user:update', get_context_instance(CONTEXT_SYSTEM, SITEID))) { + if ($this->is_required() and !has_capability('moodle/user:update', get_context_instance(CONTEXT_SYSTEM))) { $mform->addRule($this->inputname, get_string('required'), 'nonzero', null, 'client'); } } diff --git a/version.php b/version.php index 7e236dab261..868b08325c6 100644 --- a/version.php +++ b/version.php @@ -30,10 +30,10 @@ defined('MOODLE_INTERNAL') || die(); -$version = 2011120100.00; // YYYYMMDD = weekly release date of this DEV branch +$version = 2011120500.01; // YYYYMMDD = weekly release date of this DEV branch // RR = release increments - 00 in DEV branches // .XX = incremental changes -$release = '2.2rc1 (Build: 20111201)'; // Human-friendly version name +$release = '2.3dev (Build: 20111209)'; // Human-friendly version name -$maturity = MATURITY_RC; // this version's maturity level +$maturity = MATURITY_ALPHA; // this version's maturity level diff --git a/webservice/rest/locallib.php b/webservice/rest/locallib.php index 3fe38ea8b9f..179a85b9f52 100644 --- a/webservice/rest/locallib.php +++ b/webservice/rest/locallib.php @@ -138,9 +138,9 @@ class webservice_rest_server extends webservice_base_server { } else { $error = ''."\n"; $error .= ''."\n"; - $error .= ''.htmlentities($ex->getMessage(), ENT_COMPAT, 'UTF-8').''."\n"; + $error .= ''.htmlspecialchars($ex->getMessage(), ENT_COMPAT, 'UTF-8').''."\n"; if (debugging() and isset($ex->debuginfo)) { - $error .= ''.htmlentities($ex->debuginfo, ENT_COMPAT, 'UTF-8').''."\n"; + $error .= ''.htmlspecialchars($ex->debuginfo, ENT_COMPAT, 'UTF-8').''."\n"; } $error .= ''."\n"; } @@ -182,7 +182,7 @@ class webservice_rest_server extends webservice_base_server { if (is_null($returns)) { return ''."\n"; } else { - return ''.htmlentities($returns, ENT_COMPAT, 'UTF-8').''."\n"; + return ''.htmlspecialchars($returns, ENT_COMPAT, 'UTF-8').''."\n"; } } else if ($desc instanceof external_multiple_structure) {