Bumped for release

MDL-17365 forum rate - validate rating against scale values. Backported from 18_STABLE
MDL-17679: implement course reset for HotPot module (thanks to Albert Gasset)
2009-01-28 09:19:05 +00:00 · 2009-01-27 18:04:14 +00:00 · 2009-01-27 08:36:37 +00:00 · 2009-01-26 23:42:06 +00:00 · 2009-01-23 23:42:07 +00:00 · 2009-01-22 23:43:03 +00:00
498 changed files with 23408 additions and 36802 deletions
@@ -1,185 +0,0 @@
-<?php  // $Id$
-       // config.php - allows admin to edit all configuration variables
-
-    require_once('../config.php');
-
-    $focus = '';
-
-    if ($site = get_site()) {   // If false then this is a new installation
-        require_login();
-        require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
-    }
-
-/// This is to overcome the "insecure forms paradox"
-    if (isset($secureforms) and $secureforms == 0) {
-        $match = 'nomatch';
-    } else {
-        $match = '';
-    }
-
-/// If data submitted, then process and store.
-
-    if ($config = data_submitted($match)) {  
-
-        if (!empty($USER->id)) {            // Additional identity check
-            if (!confirm_sesskey()) {
-                error(get_string('confirmsesskeybad', 'error'));
-            }
-        }
-
-        validate_form($config, $err);
-
-        if (count($err) == 0) {
-            foreach ($config as $name => $value) {
-                if ($name == "sessioncookie") {
-                    $value = eregi_replace("[^a-zA-Z0-9_]", "", $value);
-                }
-                if ($name == "defaultallowedmodules") {
-                    $value = implode(',',$value);
-                }
-                if ($name == 'hiddenuserfields') {
-                    if (in_array('none', $value)) {
-                        $value = '';
-                    } else {
-                        $value = implode(',',$value);
-                    }
-                }
-                if ($name == "locale") {
-                    $value = trim($value);
-                }
-                $conf = new object();
-                $conf->name  = $name;
-                $conf->value = $value;
-                if ($current = get_record('config', 'name', $name)) {
-                    $conf->id = $current->id;
-                    if (! update_record('config', $conf)) {
-                        error("Error: Could not update $name to $value");
-                    }
-                } else {
-                    if (! insert_record('config', $conf)) {
-                        error("Error: could not add new variable $name !");
-                    }
-                }
-            }
-            redirect('index.php');
-            exit;
-
-        } else {
-            foreach ($err as $key => $value) {
-                $focus = "form.$key";
-            }
-        }
-    }
-
-/// Otherwise fill and print the form.
-
-    if (empty($config)) {
-        $config = $CFG;
-    }
-
-    $sesskey = !empty($USER->id) ? $USER->sesskey : '';
-
-
-    $stradmin = get_string('administration');
-    $strconfiguration = get_string('configuration');
-    $strconfigvariables = get_string('configvariables', 'admin');
-
-    if ($site) {
-        print_header("$site->shortname: $strconfigvariables", $site->fullname,
-                      "<a href=\"index.php\">$stradmin</a> -> ".
-                      "<a href=\"configure.php\">$strconfiguration</a> -> $strconfigvariables", $focus);
-        print_heading($strconfigvariables);
-    } else {
-        print_header();
-        print_heading($strconfigvariables);
-        print_simple_box(get_string('configintro', 'admin'), 'center', "50%");
-        echo '<br />';
-    }
-
-
-
-/// Get all the configuration fields and helptext
-    require('configvars.php');
-
-/// Cycle through the sections to get the sectionnames
-    $linktext = '';
-    foreach($configvars as $sectionname=>$section) {
-        if ($linktext !== '') {
-            $linktext .= ' | ';
-        }
-        $linktext .= '<a href="#configsection'.$sectionname.'">'.get_string('configsection'.$sectionname, 'admin').'</a>';
-    }
-        
-    echo "<center>$linktext</center>\n";
-
-    
-    echo '<form method="post" action="config.php" name="form">';
-    echo '<center><input type="submit" value="'.get_string('savechanges').'" /></center>';
-
-/// Cycle through each section of the configuration
-    foreach ($configvars as $sectionname=>$section) {
-
-        print_heading('<a name="configsection'.$sectionname.'"></a>'.get_string('configsection'.$sectionname, 'admin'));
-
-        $table = NULL;
-        $table->data = array();
-        foreach ($section as $configvariable=>$configobject) {
-            $table->data[] = array ( $configvariable.': ',
-                                     $configobject->field
-                                   );
-            if ($configobject->display_warning()) {
-                $table->data[] = array ( '&nbsp;',
-                                         '<span class="configwarning">'.$configobject->warning.'</span>'
-                                       );
-            }
-            $table->data[] = array ( '&nbsp;',
-                                     '<span class="confighelp">'.$configobject->help.'</span>'
-                                   );
-            $table->align = array ('right', 'left');
-        }
-        print_table($table);
-
-    }
-    echo '<center>';
-    echo '<input type="hidden" name="sesskey" value="'.$sesskey.'" />';
-    echo '<input type="submit" value="'.get_string('savechanges').'" />';
-    echo '</center>';
-                
-    echo '</form>';
-    
-
-
-    
-
-    /// Lock some options
-
-    $httpsurl = str_replace('http://', 'https://', $CFG->wwwroot);
-    if ($httpsurl != $CFG->wwwroot) {
-        if (ini_get('allow_url_fopen')) {
-            if ((($fh = @fopen($httpsurl, 'r')) == false) and ($config->loginhttps == 0)) {
-                echo '<script type="text/javascript">'."\n";
-                echo '<!--'."\n";
-                echo "eval('document.form.loginhttps.disabled=true');\n";
-                echo '-->'."\n";
-                echo '</script>'."\n";
-            }
-        }
-    }
-
-
-    if ($site) {
-        print_footer();
-    }
-
-    exit;
-
-/// Functions /////////////////////////////////////////////////////////////////
-
-function validate_form(&$form, &$err) {
-
-    // Currently no checks are needed ...
-
-    return true;
-}
-
-?>
@@ -1,660 +0,0 @@
-<?php // $Id$
-      // Shane Elliott
-defined('MOODLE_INTERNAL') or die('Direct access to this script is forbidden.');
-
-/// Add new sitewide configuration variables to this file.
-
-
-/// $configvars is parsed by config.php
-/// It is an array of arrays of objects
-/// $configvars[sectionname][configvariablename] = configvar object
-    $configvars = array();
-
-
-/// no, yes strings and menu options are used in a number of places
-/// so we define them here to save time on repeatedly calling
-/// get_string()
-    $stryes = get_string('yes');
-    $strno  = get_string('no');
-
-    $noyesoptions[0] = $strno;
-    $noyesoptions[1] = $stryes;
-
-
-
-/// A class to hold the configurable information
-/// $field   - the html code for the form field
-/// $help    - help text for the field
-/// $warning - optional warning text to be displayed
-/// method display_warning() - a generic function that can be used in an extended class
-///     e.g. enablerssfeeds
-class configvar {
-
-    var $field;
-    var $help;
-    var $warning;
-
-    function configvar($help, $field, $warning='') {
-        $this->help    = $help;
-        $this->field   = $field;
-        $this->warning = $warning;
-    }
-
-    function display_warning() {
-        return false;
-    }
-}
-
-
-
-
-
-////////////////////////////////////////////////////////////////////
-/// Miscellaneous config variables
-////////////////////////////////////////////////////////////////////
-    $misc = array();
-
-
-/// maxeditingtime
-    unset($options);
-    $options[3600] = get_string('numminutes', '', 60);
-    $options[2700] = get_string('numminutes', '', 45);
-    $options[1800] = get_string('numminutes', '', 30);
-    $options[900]  = get_string('numminutes', '', 15);
-    $options[300]  = get_string('numminutes', '', 5);
-    $options[60]   = get_string('numminutes', '', 1);
-
-    $misc['maxeditingtime'] = new configvar (get_string('configmaxeditingtime', 'admin'),
-        choose_from_menu ($options, 'maxeditingtime', $config->maxeditingtime, '', '', '', true) );
-
-/// debug
-    unset($options);
-    $options[5]  = $strno;
-    $options[15] = $stryes;
-
-    $misc['debug'] = new configvar (get_string('configdebug', 'admin'),
-        choose_from_menu ($options, 'debug', $config->debug, '', '', '', true) );
-
-    $misc['perfdebug'] = new configvar (get_string('configperfdebug', 'admin'),
-        choose_from_menu ($options, 'perfdebug', $config->perfdebug, '', '', '', true) );
-
-/// enablerssfeeds
-class configvarrss extends configvar {
-    function display_warning() {
-        return (!function_exists('utf8_encode'));
-    }
-}
-
-    $misc['enablerssfeeds'] = new configvarrss (get_string('configenablerssfeeds', 'admin'),
-        choose_from_menu ($noyesoptions, 'enablerssfeeds', $config->enablerssfeeds, '', '', '', true),
-        '<font color="red"> You need to add XML support to your PHP installation.</font>' );
-
-    $misc['mymoodleredirect'] = new configvar (get_string('configmymoodleredirect','admin'),
-        choose_from_menu($noyesoptions,'mymoodleredirect',$config->mymoodleredirect,'','','',true));
-
-    unset($options);
-    $options[5] = get_string('worldblogs','blog');
-    $options[4] = get_string('siteblogs','blog');
-    $options[3] = get_string('courseblogs','blog');
-    $options[2] = get_string('groupblogs','blog');
-    $options[1] = get_string('personalblogs','blog');
-    $options[0] = get_string('disableblogs','blog');
-
-    $misc['bloglevel'] = new configvar (get_string('configbloglevel', 'admin'),
-        choose_from_menu ($options, 'bloglevel', $config->bloglevel,'','','',true));
-
-////////////////////////////////////////////////////////////////////
-/// OPERATING SYSTEM config variables
-////////////////////////////////////////////////////////////////////
-    $operatingsystem = array();
-
-/// gdversion
-    unset($options);
-    $options[0] = get_string('gdnot');
-    $options[1] = get_string('gd1');
-    $options[2] = get_string('gd2');
-
-    $installed  = check_gd_version();
-
-    $operatingsystem['gdversion'] = new configvar (get_string('configgdversion', 'admin'),
-        choose_from_menu ($options, 'gdversion', $installed, '', '', '', true) );
-
-/// dbsessions
-    $operatingsystem['dbsessions'] = new configvar (get_string('configdbsessions', 'admin'),
-        choose_from_menu ($noyesoptions, 'dbsessions', $config->dbsessions, '', '', '', true) );
-
-/// sessiontimeout
-    unset($options);
-    $options[14400] = get_string('numhours', '', 4);
-    $options[10800] = get_string('numhours', '', 3);
-    $options[7200]  = get_string('numhours', '', 2);
-    $options[5400]  = get_string('numhours', '', '1.5');
-    $options[3600]  = get_string('numminutes', '', 60);
-    $options[2700]  = get_string('numminutes', '', 45);
-    $options[1800]  = get_string('numminutes', '', 30);
-    $options[900]   = get_string('numminutes', '', 15);
-    $options[300]   = get_string('numminutes', '', 5);
-
-    $operatingsystem['sessiontimeout'] = new configvar (get_string('configsessiontimeout', 'admin'),
-        choose_from_menu ($options, 'sessiontimeout', $config->sessiontimeout, '', '', '', true) );
-
-/// sessioncookie
-    $operatingsystem['sessioncookie'] = new configvar (get_string('configsessioncookie', 'admin'),
-        '<input name="sessioncookie" type="text" size="10" value="'.s($config->sessioncookie).'" alt="sessioncookie" />' );
-    $operatingsystem['sessioncookiepath'] = new configvar (get_string('configsessioncookiepath', 'admin'),
-        '<input name="sessioncookiepath" type="text" size="10" value="'.s($config->sessioncookiepath).'" alt="sessioncookiepath" />' );
-
-/// zip
-    $operatingsystem['zip'] = new configvar (get_string('configzip', 'admin'),
-        '<input name="zip" type="text" size="30" value="'.s($config->zip).'" alt="zip" />' );
-
-/// unzip
-    $operatingsystem['unzip'] = new configvar (get_string('configunzip', 'admin'),
-        '<input name="unzip" type="text" size="30" value="'.s($config->unzip).'" alt="unzip" />' );
-
-    $operatingsystem['pathtodu'] = new configvar(get_string('configpathtodu', 'admin'),
-        '<input name="pathtodu" type="text" size="30" value="'.s($config->pathtodu).'" alt="pathtodu" />');                                                
-
-/// slasharguments
-    unset($options);
-    $options[0] = "file.php?file=/1/pic.jpg";
-    $options[1] = "file.php/1/pic.jpg";
-
-    $operatingsystem['slasharguments'] = new configvar (get_string('configslasharguments', 'admin'),
-        choose_from_menu ($options, 'slasharguments', $config->slasharguments, '', '', '', true) );
-
-/// proxyhost
-    $operatingsystem['proxyhost'] = new configvar (get_string('configproxyhost', 'admin'),
-        '<input name="proxyhost" type="text" size="30" value="'.s($config->proxyhost).'" alt="proxyhost" />' );
-
-/// proxyport
-    $operatingsystem['proxyport'] = new configvar ('',
-        '<input name="proxyport" type="text" size="5" value="'.s($config->proxyport).'" alt="proxyport" />' );
-
-
-
-////////////////////////////////////////////////////////////////////
-/// PERMISSIONS config variables
-////////////////////////////////////////////////////////////////////
-    $permissions = array();
-
-/// teacherassignteachers
-    $permissions['teacherassignteachers'] = new configvar (get_string('configteacherassignteachers', 'admin'),
-        choose_from_menu ($noyesoptions, 'teacherassignteachers', $config->teacherassignteachers, '', '', '', true) );
-
-/// allowunenroll
-    $permissions['allowunenroll'] = new configvar (get_string('configallowunenroll', 'admin'),
-        choose_from_menu ($noyesoptions, 'allowunenroll', $config->allowunenroll, '', '', '', true) );
-
-/// allusersaresitestudents
-    $permissions['allusersaresitestudents'] = new configvar (get_string('configallusersaresitestudents', 'admin'),
-        choose_from_menu ($noyesoptions, 'allusersaresitestudents', $config->allusersaresitestudents, '', '', '', true) );
-
-/// showsiteparticipantslist
-    unset($options);
-    $options[0]  = get_string('siteteachers');
-    $options[1]  = get_string('allteachers');
-    $options[2]  = get_string('studentsandteachers');
-
-    $permissions['showsiteparticipantslist'] = new configvar (get_string('configshowsiteparticipantslist', 'admin'),
-        choose_from_menu ($options, 'showsiteparticipantslist', $config->showsiteparticipantslist, '', '', '', true) );
-
-/// forcelogin
-    $permissions['forcelogin'] = new configvar (get_string('configforcelogin', 'admin'),
-        choose_from_menu ($noyesoptions, 'forcelogin', $config->forcelogin, '', '', '', true) );
-
-/// forceloginforprofiles
-   $permissions['forceloginforprofiles'] = new configvar (get_string('configforceloginforprofiles', 'admin'),
-        choose_from_menu ($noyesoptions, 'forceloginforprofiles', $config->forceloginforprofiles, '', '', '', true) );
-
-/// opentogoogle
-    $permissions['opentogoogle'] = new configvar (get_string('configopentogoogle', 'admin'),
-        choose_from_menu ($noyesoptions, 'opentogoogle', $config->opentogoogle, '', '', '', true) );
-
-/// maxbytes
-    $options = get_max_upload_sizes();
-
-    $permissions['maxbytes'] = new configvar (get_string('configmaxbytes', 'admin'),
-        choose_from_menu ($options, 'maxbytes', $config->maxbytes, '', '', 0, true) );
-
-/// messaging
-    $permissions['messaging'] = new configvar (get_string('configmessaging', 'admin'),
-        choose_from_menu ($noyesoptions, 'messaging', $config->messaging, '', '', '', true) );
-
-/// allowobjectembed
-    $permissions['allowobjectembed'] = new configvar (get_string('configallowobjectembed', 'admin'),
-        choose_from_menu ($noyesoptions, 'allowobjectembed', $config->allowobjectembed, '', '', '', true) );
-
-/// enabletrusttext
-    $permissions['enabletrusttext'] = new configvar (get_string('configenabletrusttext', 'admin'),
-        choose_from_menu ($noyesoptions, 'enabletrusttext', $config->enabletrusttext, '', '', '', true) );
-
-    unset($options);
-    $options['none'] = 'No courses';
-    $options['all'] = 'All courses';
-    $options['requested'] = 'Requested courses';
-
-    $permissions['restrictmodulesfor'] = new configvar (get_string('configrestrictmodulesfor','admin'),
-   ' <script language="JavaScript">
-    function togglemodules(index) {
-        if (index == 0) {
-            document.getElementById(\'allowedmodules\').disabled=true;
-        }
-        else {
-            document.getElementById(\'allowedmodules\').disabled=false;
-        }
-    }
-    </script>'.
-        choose_from_menu($options,'restrictmodulesfor',$config->restrictmodulesfor,'','togglemodules(this.selectedIndex);','',true) );
-
-    $permissions['restrictbydefault'] = new configvar (get_string('configrestrictbydefault','admin'),
-        choose_from_menu($noyesoptions, 'restrictbydefault',$config->restrictbydefault,'','','',true) );
-
-    $allowstr = '<select name="defaultallowedmodules[]" id="allowedmodules" multiple="multiple" size="10"'.((empty($config->restrictmodulesfor)) ? "disabled=\"disabled\"" : "").'>';
-
-    $allowedmodules = array();
-    if (!empty($config->defaultallowedmodules)) {
-        $allowedmodules = explode(',',$config->defaultallowedmodules);
-    }
-
-//  On a fresh install of Moodle, this could be empty; prevent a warning on the following loop.
-    if (!$mods = get_records("modules")) {
-        $mods = array();
-    }
-    $s = "selected=\"selected\"";
-    $allowstr .= '<option value="0" '.((empty($allowedmodules)) ? $s : '').'>'.get_string('allownone').'</option>'."\n";
-    foreach ($mods as $mod) {
-        $selected = "";
-        if (in_array($mod->id,$allowedmodules)) 
-            $selected = $s;
-        $allowstr .= '<option '.$selected.' value="'.$mod->id.'">'.$mod->name.'</option>'."\n";
-    }  
-    $allowstr .= '</select>';
-
-    $permissions['defaultallowedmodules'] = new configvar (get_string('configdefaultallowedmodules','admin'),$allowstr);
-
-
-/// course requests
-    $reqcourse['enablecourserequests'] = new configvar (get_string('configenablecourserequests', 'admin'),
-        choose_from_menu ($noyesoptions,'enablecourserequests',$config->enablecourserequests,'','','',true) );
-
-/// default category for course requests
-    require_once($CFG->dirroot.'/course/lib.php');
-    $reqcourse['defaultrequestedcategory'] = new configvar (get_string('configdefaultrequestedcategory', 'admin'),
-        choose_from_menu (make_categories_options(), 'defaultrequestedcategory',$config->defaultrequestedcategory,'','','',true) );
-
-    $reqcourse['requestedteachername'] = new configvar (get_string('configrequestedteachername','admin'),
-        '<input type="text" name="requestedteachername" size="20" maxlength="100" value="'.s($config->requestedteachername).'" />');
-
-    $reqcourse['requestedteachersname'] = new configvar (get_string('configrequestedteachersname','admin'),
-        '<input type="text" name="requestedteachersname" size="20" maxlength="100" value="'.s($config->requestedteachersname).'" />');
-
-    $reqcourse['requestedstudentname'] = new configvar (get_string('configrequestedstudentname','admin'),
-        '<input type="text" name="requestedstudentname" size="20" maxlength="100" value="'.s($config->requestedstudentname).'" />');
-
-    $reqcourse['requestedstudentsname'] = new configvar (get_string('configrequestedstudentsname','admin'),
-        '<input type="text" name="requestedstudentsname" size="20" maxlength="100" value="'.s($config->requestedstudentsname).'" />');
-
-////////////////////////////////////////////////////////////////////
-/// INTERFACE config variables
-////////////////////////////////////////////////////////////////////
-    $interface = array();
-
-/// language settings
-    $interface['lang'] = new configvar ( get_string('configlang', 'admin'),
-        choose_from_menu(get_list_of_languages(), 'lang', $config->lang, '', '', '', true) );
-
-/// language menu
-    $interface['langmenu'] = new configvar ( get_string('configlangmenu', 'admin'),
-        choose_from_menu($noyesoptions, 'langmenu', $config->langmenu, '', '', '', true) );
-
-/// language list
-    $interface['langlist'] = new configvar ( get_string('configlanglist', 'admin'),
-        '<input name="langlist" type="text" size="60" value="'.s($config->langlist).'" alt="langlist" />' );
-
-/// language menu
-    $interface['langcache'] = new configvar ( get_string('configlangcache', 'admin'),
-        choose_from_menu($noyesoptions, 'langcache', $config->langcache, '', '', '', true) );
-
-/// locale
-    $interface['locale'] = new configvar ( get_string('configlocale', 'admin'),
-        '<input name="locale" type="text" size="15" value="'.s($config->locale).'" alt="locale" />' );
-
-/// docroot
-    $interface['docroot'] = new configvar ( get_string('configdocroot', 'admin'),
-        '<input name="docroot" type="text" size="60" value="'.s($config->docroot).'" alt="docroot" />' );
-
-/// doctonewwindow
-    $interface['doctonewwindow'] = new configvar ( get_string('configdoctonewwindow', 'admin'),
-        choose_from_menu($noyesoptions, 'doctonewwindow', $config->doctonewwindow, '', '', '', true) );
-
-/// timezone
-    $interface['timezone'] = new configvar ( get_string('configtimezone', 'admin'),
-        choose_from_menu (get_list_of_timezones(), 'timezone', $config->timezone, get_string('serverlocaltime'), '', '99', true ) );
-
-/// country
-    $interface['country'] = new configvar ( get_string('configcountry', 'admin'),
-        choose_from_menu (get_list_of_countries(), 'country', $config->country, get_string('selectacountry'), '', 0, true) );
-
-/// framename
-    if (empty($config->framename)) {
-        $config->framename = "_top";
-    }
-
-    $interface['framename'] = new configvar (get_string('configframename', 'admin'),
-        '<input name="framename" type="text" size="15" value="'.s($config->framename).'" alt="framename" />' );
-
-/// language list
-    $interface['themelist'] = new configvar ( get_string('configthemelist', 'admin'),
-        '<input name="themelist" type="text" size="60" value="'.s($config->themelist).'" alt="themelist" />' );
-
-/// user themes
-    $interface['allowuserthemes'] = new configvar (get_string('configallowuserthemes', 'admin'),
-        choose_from_menu ($noyesoptions, 'allowuserthemes', $config->allowuserthemes, '', '', '', true) );
-
-/// course themes
-    $interface['allowcoursethemes'] = new configvar (get_string('configallowcoursethemes', 'admin'),
-        choose_from_menu ($noyesoptions, 'allowcoursethemes', $config->allowcoursethemes, '', '', '', true) );
-
-/// allowuserblockhiding
-    $interface['allowuserblockhiding'] = new configvar (get_string('configallowuserblockhiding', 'admin'),
-        choose_from_menu ($noyesoptions, 'allowuserblockhiding', $config->allowuserblockhiding, '', '', '', true) );
-
-/// showblocksonmodpages
-    $interface['showblocksonmodpages'] = new configvar (get_string('configshowblocksonmodpages', 'admin'),
-        choose_from_menu ($noyesoptions, 'showblocksonmodpages', $config->showblocksonmodpages, '', '', '', true) );
-
-
-/// tabselectedtofront
-    $interface['tabselectedtofront'] = new configvar (get_string('tabselectedtofront', 'admin'),
-        choose_from_menu ($noyesoptions, 'tabselectedtofront', $config->tabselectedtofront, '', '', '', true) );
-
-
-
-////////////////////////////////////////////////////////////////////
-/// USER config variables
-////////////////////////////////////////////////////////////////////
-    $user = array();
-
-/// sitepolicy
-    $user['sitepolicy'] = new configvar (get_string('configsitepolicy', 'admin'),
-        '<input type="text" name="sitepolicy" size="60" value="'.$config->sitepolicy.'" alt="sitepolicy" />' );
-
-
-/// fullnamedisplay
-    unset($options);
-    $options['language']  = get_string('language');
-    $options['firstname lastname']  = get_string('firstname') . ' + ' . get_string('lastname');
-    $options['lastname firstname']  = get_string('lastname') . ' + ' . get_string('firstname');
-    $options['firstname']  = get_string('firstname');
-
-    $user['fullnamedisplay'] = new configvar (get_string('configfullnamedisplay', 'admin'),
-        choose_from_menu ($options, 'fullnamedisplay', $config->fullnamedisplay, '', '', '', true) );
-
-/// extendedusernamechars
-    $user['extendedusernamechars'] = new configvar (get_string('configextendedusernamechars', 'admin'),
-        choose_from_menu ($noyesoptions, 'extendedusernamechars', $config->extendedusernamechars, '', '', '', true) );
-
-/// autologinguests
-    $user['autologinguests'] = new configvar (get_string('configautologinguests', 'admin'),
-        choose_from_menu ($noyesoptions, 'autologinguests', $config->autologinguests, '', '', '', true) );
-
-/// hiddenuserfields
-    $fields = array('none', 'description', 'city', 'country', 'webpage', 'icqnumber', 'skypeid', 'yahooid', 'aimid', 'msnid', 'lastaccess');
-    if (empty($config->hiddenuserfields)) {
-        $config->hiddenuserfields = 'none';
-    }
-    $configfields = array_flip(explode(',', $config->hiddenuserfields));
-    $fieldoptions = '';
-    foreach ($fields as $value) {
-        $fieldoptions .= '<option value="'.$value.'"';
-        if (isset($configfields[$value])) {
-            $fieldoptions .= ' selected="selected"';
-        }
-        $fieldoptions .= '>'.get_string($value).'</option>';
-    }
-
-    $user['hiddenuserfields'] = new configvar (get_string('confighiddenuserfields', 'admin'),
-        '<select id="menuhiddenuserfields" name="hiddenuserfields[]" size="10" multiple="multiple">'.$fieldoptions.'</select>' );
-
-
-
-
-////////////////////////////////////////////////////////////////////
-/// SECURITY config variables
-////////////////////////////////////////////////////////////////////
-    $security = array();
-
-/// displayloginfailures
-    unset($options);
-    $options[''] = get_string('nobody');
-    $options['admin'] = get_string('administrators');
-    $options['teacher'] = get_string('administratorsandteachers');
-    $options['everybody'] = get_string('everybody');
-
-    $security['displayloginfailures'] = new configvar (get_string('configdisplayloginfailures', 'admin'),
-        choose_from_menu($options, 'displayloginfailures', $config->displayloginfailures, '', '', '', true) );
-
-/// notifyloginfailures
-    unset($options);
-    $options[''] = get_string('nobody');
-    $options['mainadmin'] = get_string('administrator');
-    $options['alladmins'] = get_string('administratorsall');
-
-    $security['notifyloginfailures'] = new configvar (get_string('confignotifyloginfailures', 'admin'),
-        choose_from_menu($options, 'notifyloginfailures', $config->notifyloginfailures, '', '', '', true) );
-
-/// notifyloginthreshold
-    unset($options);
-    for ($i=1; $i<=100; $i++) {
-        $options[$i] = "$i";
-    }
-
-    $security['notifyloginthreshold'] = new configvar (get_string('confignotifyloginthreshold', 'admin'),
-        choose_from_menu($options, 'notifyloginthreshold', $config->notifyloginthreshold, '', '', '', true) );
-
-/// secureforms
-    $security['secureforms'] = new configvar (get_string('configsecureforms', 'admin'),
-        choose_from_menu ($noyesoptions, 'secureforms', $config->secureforms, '', '', '', true) );
-
-/// loginhttps
-    $security['loginhttps'] = new configvar (get_string('configloginhttps', 'admin'),
-        choose_from_menu ($noyesoptions, 'loginhttps', $config->loginhttps, '', '', '', true) );
-
-/// runclamonupload
-    $security['runclamonupload'] = new configvar (get_string('configrunclamonupload', 'admin'),
-        choose_from_menu($noyesoptions, 'runclamonupload', $config->runclamonupload, '', '', '', true) );
-
-/// pathtoclam
-    $security['pathtoclam'] = new configvar (get_string('configpathtoclam', 'admin'),
-        '<input type="text" name="pathtoclam" size="30" value="'.$config->pathtoclam.'" alt="pathtoclam" />' );
-
-/// quarantinedir
-    $security['quarantinedir'] = new configvar (get_string('configquarantinedir', 'admin'),
-        '<input type="text" name="quarantinedir" size="30" value="'.$config->quarantinedir.'" alt="quarantinedir" />' );
-
-/// clamfailureonupload
-    unset($options);
-    $options['donothing'] = get_string('configclamdonothing', 'admin');
-    $options['actlikevirus'] = get_string('configclamactlikevirus', 'admin');
-
-    $security['clamfailureonupload'] = new configvar (get_string('configclamfailureonupload', 'admin'),
-        choose_from_menu($options, 'clamfailureonupload', $config->clamfailureonupload, '', '', '', true) );
-
-
-
-
-////////////////////////////////////////////////////////////////////
-/// MAINTENANCE config variables
-////////////////////////////////////////////////////////////////////
-    $maintenance = array();
-
-/// longtimenosee
-    unset($options);
-    $options[0]    = get_string('never');
-    $options[1000] = get_string('numdays', '', 1000);
-    $options[365]  = get_string('numdays', '', 365);
-    $options[180]  = get_string('numdays', '', 180);
-    $options[150]  = get_string('numdays', '', 150);
-    $options[120]  = get_string('numdays', '', 120);
-    $options[90]   = get_string('numdays', '', 90);
-    $options[60]   = get_string('numdays', '', 60);
-    $options[30]   = get_string('numdays', '', 30);
-    $options[21]   = get_string('numdays', '', 21);
-    $options[14]   = get_string('numdays', '', 14);
-    $options[7]   = get_string('numdays', '', 7);
-
-    $maintenance['longtimenosee'] = new configvar (get_string('configlongtimenosee', 'admin'),
-        choose_from_menu ($options, 'longtimenosee', $config->longtimenosee, '', '', '', true) );
-
-/// deleteunconfirmed
-    unset($options);
-    $options[0]    = get_string('never');
-    $options[168]  = get_string('numdays', '', 7);
-    $options[144]  = get_string('numdays', '', 6);
-    $options[120]  = get_string('numdays', '', 5);
-    $options[96]   = get_string('numdays', '', 4);
-    $options[72]   = get_string('numdays', '', 3);
-    $options[48]   = get_string('numdays', '', 2);
-    $options[24]   = get_string('numdays', '', 1);
-    $options[12]   = get_string('numhours', '', 12);
-    $options[6]    = get_string('numhours', '', 6);
-    $options[1]    = get_string('numhours', '', 1);
-
-    $maintenance['deleteunconfirmed'] = new configvar (get_string('configdeleteunconfirmed', 'admin'),
-        choose_from_menu ($options, 'deleteunconfirmed', $config->deleteunconfirmed, '', '', '', true) );
-
-/// loglifetime
-    unset($options);
-    $options[0]    = get_string('neverdeletelogs');
-    $options[1000] = get_string('numdays', '', 1000);
-    $options[365]  = get_string('numdays', '', 365);
-    $options[180]  = get_string('numdays', '', 180);
-    $options[150]  = get_string('numdays', '', 150);
-    $options[120]  = get_string('numdays', '', 120);
-    $options[90]   = get_string('numdays', '', 90);
-    $options[60]   = get_string('numdays', '', 60);
-    $options[30]   = get_string('numdays', '', 30);
-
-    $maintenance['loglifetime'] = new configvar (get_string('configloglifetime', 'admin'),
-        choose_from_menu ($options, 'loglifetime', $config->loglifetime, '', '', '', true) );
-
-
-////////////////////////////////////////////////////////////////////
-/// MAIL config variables
-////////////////////////////////////////////////////////////////////
-    $mail = array();
-
-/// smtphosts
-    $mail['smtphosts'] = new configvar (get_string('configsmtphosts', 'admin'),
-        '<input name="smtphosts" type="text" size="30" value="'.s($config->smtphosts).'" alt="smtphosts" />' );
-
-/// smtpuser
-    $mail['smtpuser'] = new configvar (get_string('configsmtpuser', 'admin'),
-        '<input name="smtpuser" type="text" size="10" value="'.s($config->smtpuser).'" alt="smtpuser" />' );
-
-/// smtppass
-    $mail['smtppass'] = new configvar ('',
-        '<input name="smtppass" type="password" size="10" value="'.s($config->smtppass).'" alt="smtppass" />' );
-
-/// noreplyaddress
-    $mail['noreplyaddress'] = new configvar (get_string('confignoreplyaddress', 'admin'),
-        '<input name="noreplyaddress" type="text" size="30" value="'.s($config->noreplyaddress).'" alt="noreplyaddress" />' );
-
-/// digestmailtime
-    $hours = array();
-    for ($i=0; $i<=23; $i++) {
-        $hours[$i] = sprintf("%02d",$i);
-    }
-
-    $mail['digestmailtime'] = new configvar (get_string('configdigestmailtime', 'admin'),
-        choose_from_menu($hours, 'digestmailtime', $config->digestmailtime, '', '', 0, true) );
-
-/// allowemailaddresses
-    $mail['allowemailaddresses'] = new configvar (get_string('configallowemailaddresses', 'admin'),
-        '<input name="allowemailaddresses" type="text" size="60" value="'.s($config->allowemailaddresses).'" alt="allowemailaddresses" />' );
-
-/// denyemailaddresses
-    $mail['denyemailaddresses'] = new configvar (get_string('configdenyemailaddresses', 'admin'),
-        '<input name="denyemailaddresses" type="text" size="60" value="'.s($config->denyemailaddresses).'" alt="denyemailaddresses" />' );
-
-    if (!empty($CFG->unicodedb)) { ///These options are only available if running under unicodedb
-    /// sitemailcharset
-        unset($options);
-        unset($charsets);
-        $charsets = get_list_of_charsets();
-        $options['0'] = get_string('none');
-        $options = array_merge($options, $charsets);
-        $mail['sitemailcharset'] = new configvar (get_string('configsitemailcharset', 'admin'),
-            choose_from_menu($options, 'sitemailcharset', $config->sitemailcharset, '', '', '', true));
-
-    /// allowusermailcharset
-        $mail['allowusermailcharset'] = new configvar (get_string('configallowusermailcharset', 'admin'),
-            choose_from_menu($noyesoptions, 'allowusermailcharset', $config->allowusermailcharset, '', '', '', true));
-    }
-    
-/// enable stats
-if (empty($CFG->disablestatsprocessing)) {
-    $stats['enablestats'] = new configvar (get_string('configenablestats','admin'),
-        choose_from_menu($noyesoptions, 'enablestats', $config->enablestats, '', '', '', true) );
-
-    unset($options);
-    $options['none'] = get_string('none');
-    $options[60*60*24*7] = get_string('numweeks','moodle',1);
-    $options[60*60*24*14] = get_string('numweeks','moodle',2);
-    $options[60*60*24*21] = get_string('numweeks','moodle',3);
-    $options[60*60*24*28] = get_string('nummonths','moodle',1);
-    $options[60*60*24*56] = get_string('nummonths','moodle',2);
-    $options[60*60*24*84] = get_string('nummonths','moodle',3);
-    $options[60*60*24*112] = get_string('nummonths','moodle',4);
-    $options[60*60*24*140] = get_string('nummonths','moodle',5);
-    $options[60*60*24*168] = get_string('nummonths','moodle',6);
-    $options['all'] = get_string('all');
-    
-    $stats['statsfirstrun'] = new configvar (get_string('configstatsfirstrun','admin'),
-       choose_from_menu($options,'statsfirstrun',$config->statsfirstrun,'','','',true) );
-
-    unset($options);
-    $options[0] = get_string('untilcomplete');
-    $options[60*60] = '1 '.get_string('hour');
-    $options[60*60*2] = '2 '.get_string('hours');
-    $options[60*60*3] = '3 '.get_string('hours');
-    $options[60*60*4] = '4 '.get_string('hours');
-    $options[60*60*5] = '5 '.get_string('hours');
-    $options[60*60*6] = '6 '.get_string('hours');
-    $options[60*60*7] = '7 '.get_string('hours');
-    $options[60*60*8] = '8 '.get_string('hours');
-
-    if (empty($config->statsruntimestarthour)) {
-        $config->statsruntimestarthour = 0;
-    }
-    if (empty($config->statsruntimestartminute)) {
-        $config->statsruntimestartminute = 0;
-    }
-
-    $stats['statsmaxruntime'] = new configvar (get_string('configstatsmaxruntime','admin'),
-      choose_from_menu($options,'statsmaxruntime',$config->statsmaxruntime,'','','',true) );                                        
-
-    $stats['statsruntimestart'] = new configvar (get_string('configstatsruntimestart','admin'),
-      print_time_selector("statsruntimestarthour","statsruntimestartminute",make_timestamp(2000,1,1,$config->statsruntimestarthour,$config->statsruntimestartminute),5,true) );
-
-    $stats['statsuserthreshold'] = new configvar (get_string('configstatsuserthreshold','admin'),
-      '<input type="text" name="statsuserthreshold" size="4" value="'.$config->statsuserthreshold.'" />');
-}                                        
-
-////////////////////////////////////////////////////////////////////
-
-    $configvars['interface']       = $interface;
-    $configvars['security']        = $security;
-    $configvars['operatingsystem'] = $operatingsystem;
-    $configvars['maintenance']     = $maintenance;
-    $configvars['mail']            = $mail;
-    $configvars['user']            = $user;
-    $configvars['permissions']     = $permissions;
-    $configvars['requestedcourse'] = $reqcourse;
-    $configvars['misc']            = $misc;
-if (empty($CFG->disablestatsprocessing)) {
-    $configvars['stats']           = $stats;
-}
-
-?>
@@ -87,6 +87,8 @@
                            mtrace("Error: could not update timestamp for $mod->fullname");
                        }
                    }
+                /// Reset possible changes by modules to time_limit. MDL-11597
+                    @set_time_limit(0);
                    mtrace("done.");
                }
            }
@@ -111,6 +113,8 @@
                            mtrace('Error: could not update timestamp for '.$block->name);
                        }
                    }
+                /// Reset possible changes by blocks to time_limit. MDL-11597
+                    @set_time_limit(0);
                    mtrace('done.');
                }
            }
@@ -307,7 +311,7 @@
    if (!empty($CFG->enablestats) and empty($CFG->disablestatsprocessing)) {

        // check we're not before our runtime
-        $timetocheck = strtotime("$CFG->statsruntimestarthour:$CFG->statsruntimestartminute today");
+        $timetocheck = strtotime("today $CFG->statsruntimestarthour:$CFG->statsruntimestartminute");

        if (time() > $timetocheck) {
            $time = 60*60*20; // set it to 20 here for first run... (overridden by $CFG)
@@ -54,7 +54,7 @@ function delete_subdirectories($rootdir) {

    $dir = opendir($rootdir);

-    while ($file = readdir($dir)) {
+    while (false !== ($file = readdir($dir))) {
        if ($file != '.' and $file != '..') {
            $fullfile = $rootdir .'/'. $file;
            if (filetype($fullfile) == 'dir') {
@@ -104,4 +104,73 @@
      </PHP_EXTENSION>
    </PHP_EXTENSIONS>
  </MOODLE>
+  <MOODLE version="1.9">
+    <UNICODE level="required">
+      <FEEDBACK>
+        <ON_ERROR message="unicoderequired" />
+      </FEEDBACK>
+    </UNICODE>
+    <DATABASE level="required">
+      <VENDOR name="mysql" version="4.1.16">
+        <FEEDBACK>
+          <ON_ERROR message="mysql416required" />
+        </FEEDBACK>
+        <BYPASS function="bypass_mysql416_reqs" message="mysql416bypassed" />
+      </VENDOR>
+      <VENDOR name="postgres" version="8.0" />
+      <VENDOR name="mssql" version="9.0" />
+      <VENDOR name="odbc_mssql" version="9.0" />
+      <VENDOR name="mssql_n" version="9.0" />
+      <VENDOR name="oracle" version="9.0" />
+    </DATABASE>
+    <PHP version="4.3.0" level="required">
+      <RESTRICT function="restrict_php50_version" message="php50restricted" />
+    </PHP>
+    <PHP_EXTENSIONS>
+      <PHP_EXTENSION name="iconv" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="iconvrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="mbstring" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="mbstringrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+    </PHP_EXTENSIONS>
+  </MOODLE>
+  <MOODLE version="2.0">
+    <UNICODE level="required">
+      <FEEDBACK>
+        <ON_ERROR message="unicoderequired" />
+      </FEEDBACK>
+    </UNICODE>
+    <DATABASE level="required">
+      <VENDOR name="mysql" version="4.1.16">
+        <FEEDBACK>
+          <ON_ERROR message="mysql416required" />
+        </FEEDBACK>
+        <BYPASS function="bypass_mysql416_reqs" message="mysql416bypassed" />
+      </VENDOR>
+      <VENDOR name="postgres" version="8.0" />
+      <VENDOR name="mssql" version="9.0" />
+      <VENDOR name="odbc_mssql" version="9.0" />
+      <VENDOR name="mssql_n" version="9.0" />
+      <VENDOR name="oracle" version="9.0" />
+    </DATABASE>
+    <PHP version="5.2.4" level="required">
+    </PHP>
+    <PHP_EXTENSIONS>
+      <PHP_EXTENSION name="iconv" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="iconvrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="mbstring" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="mbstringrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+    </PHP_EXTENSIONS>
+  </MOODLE>
 </COMPATIBILITY_MATRIX>
@@ -525,11 +525,203 @@ class problem_000011 extends problem_base {
            }
            return 'Error counter was cleared.';
        } else {
-            return '<p>Session errors can be caused by:<ul><li>unresolved problem in server software (aka random switching of users),</li><li>blocked or modified cookies,</li><li>deleting of active session files.</li></ul></p><p><a href="'.me().'&resetsesserrorcounter=1">Reset counter.</a></p>';
+            return '<p>Session errors can be caused by:</p><ul>' .
+            '<li>unresolved problem in server software (aka random switching of users),</li>' .
+            '<li>blocked or modified cookies,</li>' .
+            '<li>deleting of active session files.</li>' .
+            '</ul><p><a href="'.me().'&amp;resetsesserrorcounter=1">Reset counter</a></p>';
        }
    }
 }

+class problem_000012 extends problem_base {
+    function title() {
+        return 'Random questions data consistency';
+    }
+    function exists() {
+        return record_exists_select('question', "qtype = 'random' AND parent <> id");
+    }
+    function severity() {
+        return SEVERITY_ANNOYANCE;
+    }
+    function description() {
+        return '<p>For random questions, question.parent should equal question.id. ' .
+        'There are some questions in your database for which this is not true. ' .
+        'One way that this could have happened is for random questions restored from backup before ' .
+        '<a href="http://tracker.moodle.org/browse/MDL-5482">MDL-5482</a> was fixed.</p>';
+    }
+    function solution() {
+        global $CFG;
+        return '<p>Upgrade to Moodle 1.9.1 or later, or manually execute the SQL</p>' .
+        '<pre>UPDATE ' . $CFG->prefix . 'question SET parent = id WHERE qtype = \'random\' and parent &lt;> id;</pre>';
+    }
+}
+
+class problem_000013 extends problem_base {
+    function title() {
+        return 'Multi-answer questions data consistency';
+    }
+    function exists() {
+        global $CFG;
+        $positionexpr = sql_position(sql_concat("','", "q.id", "','"), 
+                sql_concat("','", "qma.sequence", "','"));
+        return record_exists_sql("
+                SELECT * FROM {$CFG->prefix}question q
+                    JOIN {$CFG->prefix}question_multianswer qma ON $positionexpr > 0
+                WHERE qma.question <> q.parent") ||
+            record_exists_sql("
+                SELECT * FROM {$CFG->prefix}question q
+                    JOIN {$CFG->prefix}question parent_q ON parent_q.id = q.parent
+                WHERE q.category <> parent_q.category");
+    }
+    function severity() {
+        return SEVERITY_ANNOYANCE;
+    }
+    function description() {
+        return '<p>For each sub-question whose id is listed in ' .
+        'question_multianswer.sequence, its question.parent field should equal ' .
+        'question_multianswer.question; and each sub-question should be in the same ' .
+        'category as its parent. There are questions in your database for ' .
+        'which this is not the case. One way that this could have happened is ' .
+        'for multi-answer questions restored from backup before ' .
+        '<a href="http://tracker.moodle.org/browse/MDL-14750">MDL-14750</a> was fixed.</p>';
+    }
+    function solution() {
+        return '<p>Upgrade to Moodle 1.9.1 or later, or manually execute the ' .
+        'code in question_multianswer_fix_subquestion_parents_and_categories in ' .
+        '<a href="http://cvs.moodle.org/moodle/question/type/multianswer/db/upgrade.php?revision=1.1.10.2&amp;view=markup">/question/type/multianswer/db/upgrade.php' .
+        'from the 1.9 stable branch</a>.</p>';
+    }
+}
+
+class problem_000014 extends problem_base {
+    function title() {
+        return 'Only multianswer and random questions should be the parent of another question';
+    }
+    function exists() {
+        global $CFG;
+        return record_exists_sql("
+                SELECT * FROM {$CFG->prefix}question q
+                    JOIN {$CFG->prefix}question parent_q ON parent_q.id = q.parent
+                WHERE parent_q.qtype NOT IN ('random', 'multianswer')");
+    }
+    function severity() {
+        return SEVERITY_ANNOYANCE;
+    }
+    function description() {
+        return '<p>You have questions that violate this in your databse. ' .
+        'You will need to investigate to determine how this happened.</p>';
+    }
+    function solution() {
+        return '<p>It is impossible to give a solution without knowing more about ' .
+        ' how the problem was caused. You may be able to get help from the ' .
+        '<a href="http://moodle.org/mod/forum/view.php?f=121">Quiz forum</a>.</p>';
+    }
+}
+
+class problem_000017 extends problem_base {
+    function title() {
+        return 'Question categories tree structure';
+    }
+    function find_problems() {
+        static $answer = null;
+
+        if (is_null($answer)) {
+            $categories = get_records('question_categories', '', '', 'id');
+
+            // Look for missing parents.
+            $missingparent = array();
+            foreach ($categories as $category) {
+                if ($category->parent != 0 && !array_key_exists($category->parent, $categories)) {
+                    $missingparent[$category->id] = $category;
+                }
+            }
+
+            // Look for loops.
+            $loops = array();
+            while (!empty($categories)) {
+                $current = array_pop($categories);
+                $thisloop = array($current->id => $current);
+                while (true) {
+                    if (isset($thisloop[$current->parent])) {
+                        // Loop detected
+                        $loops[$current->id] = $thisloop;
+                        break;
+                    } else if (!isset($categories[$current->parent])) {
+                        // Got to the top level, or a category we already know is OK.
+                        break;
+                    } else {
+                        // Continue following the path.
+                        $current = $categories[$current->parent];
+                        $thisloop[$current->id] = $current;
+                        unset($categories[$current->id]);
+                    }
+                }
+            }
+
+            $answer = array($missingparent, $loops);
+        }
+
+        return $answer;
+    }
+    function exists() {
+        list($missingparent, $loops) = $this->find_problems();
+        return !empty($missingparent) || !empty($loops);
+    }
+    function severity() {
+        return SEVERITY_ANNOYANCE;
+    }
+    function description() {
+        list($missingparent, $loops) = $this->find_problems();
+
+        $description = '<p>The question categories should be arranged into tree ' .
+                ' structures by the question_categories.parent field. Sometimes ' .
+                ' this tree structure gets messed up.</p>';
+
+        if (!empty($missingparent)) {
+            $description .= '<p>The following categories are missing their parents:</p><ul>';
+            foreach ($missingparent as $cat) {
+                $description .= "<li>Category $cat->id: " . s($cat->name) . "</li>\n";
+            }
+            $description .= "</ul>\n";
+        }
+
+        if (!empty($loops)) {
+            $description .= '<p>The following categories form a loop of parents:</p><ul>';
+            foreach ($loops as $loop) {
+                $description .= "<li><ul>\n";
+                foreach ($loop as $cat) {
+                    $description .= "<li>Category $cat->id: " . s($cat->name) . " has parent $cat->parent</li>\n";
+                }
+                $description .= "</ul></li>\n";
+            }
+            $description .= "</ul>\n";
+        }
+
+        return $description;
+    }
+    function solution() {
+        global $CFG;
+        list($missingparent, $loops) = $this->find_problems();
+
+        $solution = '<p>Consider executing the following SQL queries. These fix ' .
+                'the problem by moving some categories to the top level.</p>';
+
+        if (!empty($missingparent)) {
+            $solution .= "<pre>UPDATE " . $CFG->prefix . "question_categories\n" .
+                    "        SET parent = 0\n" .
+                    "        WHERE id IN (" . implode(',', array_keys($missingparent)) . ");</pre>\n";
+        }
+
+        if (!empty($loops)) {
+            $solution .= "<pre>UPDATE " . $CFG->prefix . "question_categories\n" .
+                    "        SET parent = 0\n" .
+                    "        WHERE id IN (" . implode(',', array_keys($loops)) . ");</pre>\n";
+        }
+
+        return $solution;
+    }
+}

 class problem_00000x extends problem_base {
    function title() {
@@ -239,7 +239,7 @@

                require_once($CFG->libdir.'/environmentlib.php');
                print_heading(get_string('environment', 'admin'));
-                if (check_moodle_environment($release, $environment_results, true)) {
+                if (!check_moodle_environment($release, $environment_results, true)) {
                    notice_yesno(get_string('environmenterrorupgrade', 'admin'), 
                                 'index.php?confirmupgrade=1&confirmrelease=1', 'index.php');
                } else {
@@ -488,14 +488,21 @@
        print_spacer(10,10);
    }

-    if (ini_get_bool('register_globals') && !ini_get_bool('magic_quotes_gpc')) {
-        print_simple_box(get_string('globalsquoteswarning', 'admin'), 'center', '60%');
+    if (ini_get_bool('register_globals')) {
+        print_simple_box(get_string('globalswarning', 'admin'), 'center', '60%');
    }

    if (is_dataroot_insecure()) {
        print_simple_box(get_string('datarootsecuritywarning', 'admin', $CFG->dataroot), 'center', '60%');
    }

+    if (substr($CFG->wwwroot, -1) == '/') {
+        print_simple_box(get_string('cfgwwwrootslashwarning', 'admin'), 'center', '60%');
+    }
+    if (strpos($ME, $CFG->httpswwwroot.'/') === false) {
+        print_simple_box(get_string('cfgwwwrootwarning', 'admin'), 'center', '60%');
+    }
+
 /// If no recently cron run
    $lastcron = get_field_sql('SELECT max(lastcron) FROM ' . $CFG->prefix . 'modules');
    if (time() - $lastcron > 3600 * 24) {
@@ -48,9 +48,8 @@
            ?>
        </label>
        <br />
-        <input name="add" type="submit" id="add" value="&larr;" />
-        <br />
-        <input name="remove" type="submit" id="remove" value="&rarr;" />
+        <input name="add" id="add" type="submit" value="<?php echo '&nbsp;&nbsp;&nbsp;'.$THEME->larrow.'&nbsp;'.get_string('add'); ?>" title="<?php print_string('add'); ?>" /><br />
+        <input name="remove" id="remove" type="submit" value="<?php echo '&nbsp;&nbsp;&nbsp;'.get_string('remove'). '&nbsp;'.$THEME->rarrow.'&nbsp;'; ?>" title="<?php print_string('remove'); ?>" />
        <br />
      </td>
      <td valign="top">
@@ -5,7 +5,6 @@ $temp = new admin_settingpage('locationsettings', get_string('locationsettings',
 $options = get_list_of_timezones();
 $options[99] = get_string('serverlocaltime');
 $temp->add(new admin_setting_configselect('timezone', get_string('timezone','admin'), get_string('configtimezone', 'admin'), 99, $options));
-$options = get_list_of_timezones();
 $options[99] = get_string('timezonenotforced', 'admin');
 $temp->add(new admin_setting_configselect('forcetimezone', get_string('forcetimezone', 'admin'), get_string('helpforcetimezone', 'admin'), 99, $options));
 $options = get_list_of_countries();
@@ -32,6 +32,7 @@ $temp->add(new admin_setting_configselect('bloglevel', get_string('bloglevel', '
                                                                                                                                          2 => get_string('groupblogs','blog'),
                                                                                                                                          1 => get_string('personalblogs','blog'),
                                                                                                                                          0 => get_string('disableblogs','blog'))));
+$temp->add(new admin_setting_configcheckbox('profilesforenrolledusersonly', get_string('profilesforenrolledusersonly','admin'),get_string('configprofilesforenrolledusersonly', 'admin'),'1'));

 $ADMIN->add('security', $temp);

@@ -270,7 +270,6 @@ if ($um->preprocess_files() && confirm_sesskey()) {
                            //This can be used to obtain a list of userids for existing users
                            notify("$olduser->id ".get_string('usernotaddedregistered', 'error', $username));
                            $userserrors++;
-                            continue;
                        }

                    } else { // new user
@@ -424,4 +423,3 @@ function my_file_get_contents($filename, $use_include_path = 0) {
 }

 ?>
-
@@ -86,6 +86,11 @@
        admin_externalpage_setup('editusers', $adminroot);
    }

+    if (empty($CFG->loginhttps)) {
+        $securewwwroot = $CFG->wwwroot;
+    } else {
+        $securewwwroot = str_replace('http:','https:',$CFG->wwwroot);
+    }

    if ($newuser) {                 // Create a new user

@@ -111,7 +116,7 @@
            }
        }

-        redirect("$CFG->wwwroot/user/edit.php?id=$user->id&amp;course=$site->id");
+        redirect("$securewwwroot/user/edit.php?id=$user->id&amp;course=$site->id");

    } else {                        // List all users for editing

@@ -330,7 +335,7 @@
                }

                if (has_capability('moodle/user:update', $sitecontext)) {
-                    $editbutton = "<a href=\"../user/edit.php?id=$user->id&amp;course=$site->id\">$stredit</a>";
+                    $editbutton = "<a href=\"$securewwwroot/user/edit.php?id=$user->id&amp;course=$site->id\">$stredit</a>";
                    if ($user->confirmed == 0) {
                        $confirmbutton = "<a href=\"user.php?confirmuser=$user->id&amp;sesskey=$USER->sesskey\">" . get_string('confirm') . "</a>";
                    } else {
@@ -112,7 +112,3 @@
 <?php
    include($CFG->dirroot.'/auth/ldap/config.html');
 ?>
-
-
-
-
@@ -15,4 +15,3 @@
    print_footer();
    exit;
 ?>
-
@@ -817,13 +817,27 @@ function auth_user_update($olduser, $newuser) {
    global $USER , $CFG;

    $pcfg = get_config('auth/ldap');
-    
+
+    $attrmap = auth_ldap_attributes();  
+
+    // Before doing anything else, make sure we really need to update anything
+    // in the external LDAP server.
+    $update_external = false;
+    foreach ($attrmap as $key => $ldapkeys) {
+        if (!empty($pcfg->{'field_updateremote_'.$key})) {
+            $update_external = true;
+            break;
+        }
+    }
+    if (!$update_external) {
+        return true;
+    }
+
    $ldapconnection = auth_ldap_connect();
    
    $result = array();
    $search_attribs = array();

-    $attrmap = auth_ldap_attributes();  
    foreach ($attrmap as $key=>$values) {
        if (!is_array($values)) {
            $values = array($values);
@@ -842,8 +856,18 @@ function auth_user_update($olduser, $newuser) {
    if ($user_info_result){

        $user_entry = auth_ldap_get_entries($ldapconnection, $user_info_result);
-        if (count($user_entry) > 1) {
-            trigger_error("ldap: Strange! More than one user record found in ldap. Only using the first one.");
+        if (empty($user_entry)) {
+            $error = 'ldap: Could not find user while updating externally. '.
+                     'Details follow: search base: \''.$user_dn.'\'; search filter: \''.
+                     $CFG->ldap_objectclass.'\'; search attributes: ';
+            foreach ($search_attribs as $attrib) {
+                $error .= $attrib.' ';
+            }
+            error_log($error);
+            return false; // old user not found!
+        } else if (count($user_entry) > 1) {
+            error_log('ldap: Strange! More than one user record found in ldap. Only using the first one.');
+            return false;
        }
        $user_entry = $user_entry[0];

@@ -1002,15 +1026,33 @@ function auth_user_update_password($username, $newpassword) {
                          . ldap_err2str(ldap_errno($ldapconnection)));
            }    
            break;
+
+        case 'ad':
+            // Passwords in Active Directory must be encoded as Unicode
+            // strings (UCS-2 Little Endian format) and surrounded with
+            // double quotes. See http://support.microsoft.com/?kbid=269190
+            if (!function_exists('mb_convert_encoding')) {
+                error_log ('You need the mbstring extension to change passwords in Active Directory');
+                return false;
+            }
+            $newpassword = mb_convert_encoding('"'.$newpassword.'"', "UCS-2LE", "auto");
+            $result = ldap_modify($ldapconnection, $user_dn, array('unicodePwd' => $newpassword));
+            if(!$result){
+                error_log('LDAP Error in auth_user_update_password(). Error code: ' 
+                          . ldap_errno($ldapconnection) . '; Error string : '
+                          . ldap_err2str(ldap_errno($ldapconnection)));
+            }
+            break;
+
        default:
            $usedconnection = &$ldapconnection;
            // send ldap the password in cleartext, it will md5 it itself
            $result = ldap_modify($ldapconnection, $user_dn, array('userPassword' => $newpassword));
-    if(!$result){
-        error_log('LDAP Error in auth_user_update_password(). Error code: ' 
-                  . ldap_errno($ldapconnection) . '; Error string : '
-                  . ldap_err2str(ldap_errno($ldapconnection)));
-    }
+            if(!$result){
+                error_log('LDAP Error in auth_user_update_password(). Error code: ' 
+                          . ldap_errno($ldapconnection) . '; Error string : '
+                          . ldap_err2str(ldap_errno($ldapconnection)));
+            }
    
    }

@@ -1162,8 +1204,10 @@ function auth_ldap_init () {
        }
    }   
    //hack prefix to objectclass
-    if ('objectClass=' != substr($CFG->ldap_objectclass, 0, 12)) {
-       $CFG->ldap_objectclass = 'objectClass='.$CFG->ldap_objectclass;
+    if (empty($CFG->ldap_objectclass)) {        // Can't send empty filter
+        $CFG->ldap_objectclass = 'objectClass=*';
+    } else if (stripos($CFG->ldap_objectclass, 'objectClass=') !== 0) {
+        $CFG->ldap_objectclass = 'objectClass='.$CFG->ldap_objectclass;
    }
   
    //all chages go in $CFG , no need to return value
@@ -1318,6 +1362,11 @@ function auth_ldap_connect($binddn='',$bindpwd=''){
            ldap_set_option($connresult, LDAP_OPT_PROTOCOL_VERSION, $CFG->ldap_version);
        }

+        // Fix MDL-10921
+        if ($CFG->ldap_user_type == 'ad') {
+             ldap_set_option($connresult, LDAP_OPT_REFERRALS, 0);
+        }
+
        if (!empty($binddn)){
            //bind with search-user
            //$debuginfo .= 'Using bind user'.$binddn.'and password:'.$bindpwd; 
@@ -47,4 +47,3 @@ function auth_user_login ($username, $password) {
    $rauth->close();
 }
 ?>
-
@@ -9,7 +9,7 @@ require_once($CFG->dirroot.'/backup/bb/xsl_emulate_xslt.inc');
  
 function get_subdirs($directory){
    $opendirectory = opendir( $directory );
-    while($filename = readdir($opendirectory)) {
+    while(false !== ($filename = readdir($opendirectory))) {
        if (is_dir($directory.$filename) and $filename != ".." and $filename != "."){
            $subdirs[] = $filename;
        }
@@ -119,7 +119,7 @@
        }

        // Loop through all directory entries, and construct two temporary arrays containing files and sub directories
-        while($entry = readdir($handle)) {
+        while(false !== ($entry = readdir($handle))) {
            if (is_dir($dir. $slash .$entry) && $entry != ".." && $entry != "." && $entry != $excludeddir) {
                $dir_subdirs[] = $dir. $slash .$entry;
            }
@@ -196,7 +196,7 @@
        $results = null;
  
        $dir = opendir($rootdir);
-        while ($file=readdir($dir)) {
+        while (false !== ($file=readdir($dir))) {
            if ($file=="." || $file=="..") {
                continue;
            }
@@ -215,7 +215,7 @@
        $results = "";
 
        $dir = opendir($rootdir);
-        while ($file=readdir($dir)) {
+        while (false !== ($file=readdir($dir))) {
            if ($file=="." || $file=="..") {
                continue;
            }
@@ -302,7 +302,7 @@
            $status = mkdir($to_file,$CFG->directorypermissions);
        }
        $dir = opendir($from_file);
-        while ($file=readdir($dir)) {
+        while (false !== ($file=readdir($dir))) {
            if ($file=="." || $file=="..") {
                continue;
            }
@@ -19,13 +19,21 @@

    if ($form1 = data_submitted()) {
        $currentcourseshortname = $course_header->course_shortname; //"store_ShortName";
-        $course_header->course_shortname =  $form1->shortname;  //"update_ShortName";    
-        $course_header->course_fullname =   $form1->fullname;   //"update_FullName";  
-        $form1->startdate = make_timestamp($form1->startyear, $form1->startmonth, $form1->startday);          
-        $currentcoursestartdate = $course_header->course_startdate;
-        $coursestartdatedateoffset = $form1->startdate - $currentcoursestartdate;
-        $restore->course_startdateoffset = $coursestartdatedateoffset; //change to restore
-    } 
+        $course_header->course_shortname =  $form1->shortname;  //"update_ShortName";
+        $course_header->course_fullname =   $form1->fullname;   //"update_FullName";
+    /// Roll dates only if the backup course has a start date
+    /// (some formats like main page, social..., haven't it and rolling dates
+    /// from 0 produces crazy dates. MDL-10125
+        if ($course_header->course_startdate) {
+            $form1->startdate = make_timestamp($form1->startyear, $form1->startmonth, $form1->startday);
+            $currentcoursestartdate = $course_header->course_startdate;
+            $coursestartdatedateoffset = $form1->startdate - $currentcoursestartdate;
+            $restore->course_startdateoffset = $coursestartdatedateoffset; //change to restore
+        } else { // don't roll if the course hasn't start date
+            $coursestartdatedateoffset = 0;
+            $restore->course_startdateoffset = 0;
+        }
+    }

    ///Enforce SESSION->course_header rewrite (PHP 4.x needed because assigns are by value) MDL-8298
    $SESSION->course_header = $course_header;
@@ -201,7 +201,17 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
        echo "<td align=\"right\"> ";
        print_string("startdate"); 
        echo ":</td><td>"; 
-        print_date_selector("startday", "startmonth", "startyear", $form1->startdate);
+    /// Show the roll dates option only if the backup course has a start date
+    /// (some formats like main page, social..., haven't it and rolling dates
+    /// from 0 produces crazy dates. MDL-10125
+        if ($form1->startdate) {
+            print_date_selector("startday", "startmonth", "startyear", $form1->startdate);
+        } else {
+            print_string('notavailable');
+            echo '<input type="hidden" name="startyear" value="0" />';
+            echo '<input type="hidden" name="startmonth" value="0" />';
+            echo '<input type="hidden" name="startday" value="0" />';
+        }
        helpbutton("coursestartdate", get_string("startdate"));
        echo "</td></tr>";
    }
@@ -70,6 +70,44 @@
        if (!defined('RESTORE_SILENTLY')) {
            echo "<ul>";
        }
+
+        // Recode links in the course summary.
+        if (!defined('RESTORE_SILENTLY')) {
+            echo '<li>' . get_string('from') . ' ' . get_string('course');
+        }
+        $course = get_record('course', 'id', $restore->course_id, '', '', '', '', 'id,summary');
+        $coursesummary = restore_decode_content_links_worker($course->summary, $restore);
+        if ($coursesummary != $course->summary) {
+            $course->summary = addslashes($coursesummary);
+            if (!update_record('course', $course)) {
+                $status = false;
+            }
+        }
+        if (!defined('RESTORE_SILENTLY')) {
+            echo '</li>';
+        }
+
+        // Recode links in section summaries.
+        $sections = get_records('course_sections', 'course', $restore->course_id, 'id', 'id,summary');
+        if ($sections) {
+            if (!defined('RESTORE_SILENTLY')) {
+                echo '<li>' . get_string('from') . ' ' . get_string('sections');
+            }
+            foreach ($sections as $section) {
+                $sectionsummary = restore_decode_content_links_worker($section->summary, $restore);
+                if ($sectionsummary != $section->summary) {
+                    $section->summary = addslashes($sectionsummary);
+                    if (!update_record('course_sections', $section)) {
+                        $status = false;
+                    }
+                }
+            }
+            if (!defined('RESTORE_SILENTLY')) {
+                echo '</li>';
+            }
+        }
+
+        // Restore links in modules.
        foreach ($restore->mods as $name => $info) {
            //If the module is being restored
            if (isset($info->restore) && $info->restore == 1) {
@@ -85,12 +123,23 @@
                }
            }
        }
+
+        // TODO: process all html text also in blocks too
+
+        // Restore links in questions.
+        require_once("$CFG->dirroot/question/restorelib.php");
+        if (!defined('RESTORE_SILENTLY')) {
+            echo '<li>' . get_string('from') . ' ' . get_string('questions', 'quiz');
+        }
+        $status = question_decode_content_links_caller($restore);
+        if (!defined('RESTORE_SILENTLY')) {
+            echo '</li>';
+        }
+
        if (!defined('RESTORE_SILENTLY')) {
            echo "</ul>";
        }
-        
-        // TODO: process all html text also in blocks too
-        
+
        return $status;
    }
    
@@ -901,14 +950,18 @@
                            // Yu: This part is called repeatedly for every instance, 
                            // so it is necessary to set the granular flag and check isset() 
                            // when the first instance of this type of mod is processed.
-                            if (!isset($restore->mods[$mod->type]->granular) && isset($restore->mods[$mod->type]->instances) && is_array($restore->mods[$mod->type]->instances)) {
-                                // This defines whether we want to restore specific
-                                // instances of the modules (granular restore), or
-                                // whether we don't care and just want to restore
-                                // all module instances (non-granular).
-                                $restore->mods[$mod->type]->granular = true;
-                            } else {
-                                $restore->mods[$mod->type]->granular = false;
+                            //if (!isset($restore->mods[$mod->type]->granular) && isset($restore->mods[$mod->type]->instances) && is_array($restore->mods[$mod->type]->instances)) {
+                            
+                            if (!isset($restore->mods[$mod->type]->granular)) {
+                                if (isset($restore->mods[$mod->type]->instances) && is_array($restore->mods[$mod->type]->instances)) {                              
+                                    // This defines whether we want to restore specific
+                                    // instances of the modules (granular restore), or
+                                    // whether we don't care and just want to restore
+                                    // all module instances (non-granular).
+                                    $restore->mods[$mod->type]->granular = true;
+                                } else {
+                                    $restore->mods[$mod->type]->granular = false;
+                                }
                            }
                          
                            //Check if we've to restore this module (and instance) 
@@ -1111,7 +1164,7 @@
                    if (!$preferencescount) {
                        $continue = false;
                        if (!defined('RESTORE_SILENTLY')) {
-                            echo '<li>'.get_string('backupwithoutgradebook','grade').'</li>';
+                            echo '<li>'.get_string('backupwithoutgradebook','grades').'</li>';
                        }
                    }

@@ -1122,7 +1175,7 @@
                            if ($pref_rec->value == 0) {
                                $continue = false;
                                if (!defined('RESTORE_SILENTLY')) {
-                                    echo '<li>'.get_string('respectingcurrentdata','grade').'</li>';
+                                    echo '<li>'.get_string('respectingcurrentdata','grades').'</li>';
                                }
                            }
                        }
@@ -1138,7 +1191,7 @@
                            //Fetch recordset_size records in each iteration
                            $recs = get_records_select("backup_ids","table_name = 'grade_preferences' AND backup_code = '$restore->backup_unique_code'",
                                                       "old_id",
-                                                       "old_id, old_id",
+                                                       "old_id",
                                                       $counter,
                                                       $recordset_size);
                            if ($recs) {
@@ -1192,7 +1245,7 @@
                            //Fetch recordset_size records in each iteration
                            $recs = get_records_select("backup_ids","table_name = 'grade_letter' AND backup_code = '$restore->backup_unique_code'",
                                                       "old_id",
-                                                       "old_id, old_id",
+                                                       "old_id",
                                                       $counter,
                                                       $recordset_size);
                            if ($recs) {
@@ -1242,7 +1295,7 @@
                            //Fetch recordset_size records in each iteration
                            $recs = get_records_select("backup_ids","table_name = 'grade_category' AND backup_code = '$restore->backup_unique_code'",
                                                       "old_id",
-                                                       "old_id, old_id",
+                                                       "old_id",
                                                       $countercat,
                                                       $recordset_size);
                            if ($recs) {
@@ -1401,21 +1454,42 @@
            //in backup_ids->info will be the real info (serialized)
            $info = restore_read_xml_users($restore,$xml_file);
        }
-
+        
        //Now, get evey user_id from $info and user data from $backup_ids
        //and create the necessary records (users, user_students, user_teachers
        //user_course_creators and user_admins
        if (!empty($info->users)) {
            //For each user, take its info from backup_ids
            foreach ($info->users as $userid) {
-                $rec = backup_getid($restore->backup_unique_code,"user",$userid); 
+                $rec = backup_getid($restore->backup_unique_code,"user",$userid);
                $user = $rec->info;
+                foreach (array_keys(get_object_vars($user)) as $field) {
+                    if (!is_array($user->$field)) {
+                        $user->$field = backup_todb($user->$field);
+                        if (is_null($user->$field)) {
+                            $user->$field = '';
+                        }
+                    }
+                }

                //Now, recode some languages (Moodle 1.5)
                if ($user->lang == 'ma_nt') {
                    $user->lang = 'mi_nt';
                }

+                //Country list updates - MDL-13060 
+                //Any user whose country code has been deleted or modified needs to be assigned a valid one.
+                $country_update_map = array(
+                    'ZR' => 'CD', 
+                    'TP' => 'TL',
+                    'FX' => 'FR', 
+                    'KO' => 'RS', 
+                    'CS' => 'RS',
+                    'WA' => 'GB');
+                if (array_key_exists($user->country, $country_update_map)) {
+                    $user->country = $country_update_map[$user->country];
+                }
+
                //Check if it's admin and coursecreator
                $is_admin =         !empty($user->roles['admin']);
                $is_coursecreator = !empty($user->roles['coursecreator']);
@@ -1693,7 +1767,7 @@
                        $counter = 0;
                        while ($counter < $unreadcount) {
                            //Fetch recordset_size records in each iteration
-                            $recs = get_records_select("backup_ids","table_name = 'message' AND backup_code = '$restore->backup_unique_code'","old_id","old_id, old_id",$counter,$recordset_size);
+                            $recs = get_records_select("backup_ids","table_name = 'message' AND backup_code = '$restore->backup_unique_code'","old_id","old_id",$counter,$recordset_size);
                            if ($recs) {
                                foreach ($recs as $rec) {
                                    //Get the full record from backup_ids
@@ -1758,7 +1832,7 @@
                        $counter = 0;
                        while ($counter < $readcount) {
                            //Fetch recordset_size records in each iteration
-                            $recs = get_records_select("backup_ids","table_name = 'message_read' AND backup_code = '$restore->backup_unique_code'","old_id","old_id, old_id",$counter,$recordset_size);
+                            $recs = get_records_select("backup_ids","table_name = 'message_read' AND backup_code = '$restore->backup_unique_code'","old_id","old_id",$counter,$recordset_size);
                            if ($recs) {
                                foreach ($recs as $rec) {
                                    //Get the full record from backup_ids
@@ -1825,7 +1899,7 @@
                        $counter = 0;
                        while ($counter < $contactcount) {
                            //Fetch recordset_size records in each iteration
-                            $recs = get_records_select("backup_ids","table_name = 'message_contacts' AND backup_code = '$restore->backup_unique_code'","old_id","old_id, old_id",$counter,$recordset_size);
+                            $recs = get_records_select("backup_ids","table_name = 'message_contacts' AND backup_code = '$restore->backup_unique_code'","old_id","old_id",$counter,$recordset_size);
                            if ($recs) {
                                foreach ($recs as $rec) {
                                    //Get the full record from backup_ids
@@ -2083,7 +2157,18 @@
                
                        //Now search if that group exists (by name and description field) in 
                        //restore->course_id course 
-                        $gro_db = get_record("groups","courseid",$restore->course_id,"name",$gro->name,"description",$gro->description);
+                        //Going to compare LOB columns so, use the cross-db sql_compare_text() in both sides.
+                        $description_clause = '';
+                        if (!empty($gro->description)) { /// Only for groups having a description
+                            $literal_description = "'" . $gro->description . "'";
+                            $description_clause = " AND " . 
+                                                  sql_compare_text('description') . " = " . 
+                                                  sql_compare_text($literal_description);
+                        }
+                        $gro_db = get_record_sql("SELECT *
+                                                  FROM {$CFG->prefix}groups
+                                                  WHERE courseid = $restore->course_id AND
+                                                        name = '{$gro->name}'" . $description_clause);
                        //If it doesn't exist, create
                        if (!$gro_db) {
                            $create_group = true;
@@ -2255,19 +2340,6 @@
                                //Assign it to admin
                                $eve->userid = $adminid;
                            }
-
-                            //We must recode the repeatid if the event has it
-                            if (!empty($eve->repeatid)) {
-                                $repeat_rec = backup_getid($restore->backup_unique_code,"event_repeatid",$eve->repeatid);
-                                if ($repeat_rec) {    //Exists, so use it...
-                                    $eve->repeatid = $repeat_rec->new_id;
-                                } else {              //Doesn't exists, calculate the next and save it
-                                    $oldrepeatid = $eve->repeatid;
-                                    $max_rec = get_record_sql('SELECT 1, MAX(repeatid) AS repeatid FROM '.$CFG->prefix.'event');
-                                    $eve->repeatid = empty($max_rec) ? 1 : $max_rec->repeatid + 1;
-                                    backup_putid($restore->backup_unique_code,"event_repeatid", $oldrepeatid, $eve->repeatid);
-                                }
-                            }
 
                            //We have to recode the groupid field
                            $group = backup_getid($restore->backup_unique_code,"groups",$eve->groupid);
@@ -2280,6 +2352,22 @@

                            //The structure is equal to the db, so insert the event
                            $newid = insert_record ("event",$eve);
+
+                            //We must recode the repeatid if the event has it
+                            //The repeatid now refers to the id of the original event. (see Bug#5956)
+                            if ($newid && !empty($eve->repeatid)) {
+                                $repeat_rec = backup_getid($restore->backup_unique_code,"event_repeatid",$eve->repeatid);
+                                if ($repeat_rec) {    //Exists, so use it...
+                                    $eve->repeatid = $repeat_rec->new_id;
+                                } else {              //Doesn't exists, calculate the next and save it
+                                    $oldrepeatid = $eve->repeatid;
+                                    $eve->repeatid = $newid;
+                                    backup_putid($restore->backup_unique_code,"event_repeatid", $oldrepeatid, $eve->repeatid);
+                                }
+                                $eve->id = $newid;
+                                // update the record to contain the correct repeatid
+                                update_record('event',$eve);
+                            }
                        } else {
                            //get current event id
                            $newid = $eve_db->id;
@@ -2592,7 +2680,7 @@
            while ($counter < $count_logs) {
                //Get a chunk of records
                //Take old_id twice to avoid adodb limitation
-                $logs = get_records_select("backup_ids","table_name = 'log' AND backup_code = '$restore->backup_unique_code'","old_id","old_id,old_id",$counter,$recordset_size);
+                $logs = get_records_select("backup_ids","table_name = 'log' AND backup_code = '$restore->backup_unique_code'","old_id","old_id",$counter,$recordset_size);
                //We have logs
                if ($logs) {
                    //Iterate
@@ -5818,9 +5906,9 @@
            }
            if (!$status = restore_decode_content_links($restore)) {
                if (!defined('RESTORE_SILENTLY')) {
-                    notify("Could not refresh events for activities!");
+                    notify("Could not decode content links!");
                } else {
-                    $errorstr = "Could not refresh events for activities!";
+                    $errorstr = "Could not decode content links!";
                    return false;
                }
            }
@@ -6231,7 +6319,7 @@
            $newcontext = get_context_instance($contextlevel, $oldinstance->new_id);
            $assignment->contextid = $newcontext->id; // new context id
            // might already have same assignment           
-            role_assign($assignment->roleid, $assignment->userid, 0, $assignment->contextid, $assignment->timestart, $assignment->timeend, $assignment->hidden, $assignment->enrol);
+            role_assign($assignment->roleid, $assignment->userid, 0, $assignment->contextid, $assignment->timestart, $assignment->timeend, $assignment->hidden, $assignment->enrol, $assignment->timemodified);
            
        }  
    }
@@ -172,30 +172,9 @@ class block_admin extends block_list {
            }
        }

-    /// Should the following two be in this block?
-
-
-    /// View own activity report
-//        if ($course->showreports) {
-//            $this->content->items[]='<a href="user.php?id='.$this->instance->pageid.'&amp;user='.$USER->id.'">'.get_string('activityreport').'</a>';
-//            $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/report.gif" alt="" />';
-//        }
-
-
-    /// Edit your own profile
-
-//        $fullname = fullname($USER, has_capability('moodle/site:viewfullnames', $context));
-//        $editmyprofile = '<a title="'.$fullname.'" href="'.$CFG->wwwroot.'/user/edit.php?id='.$USER->id.'&amp;course='.$this->instance->pageid.'">'.get_string('editmyprofile').'</a>';
-//        if (empty($USER->description)) {
-//                //Accessibility: replace non-standard <blink> with CSS (<a> makes title visible in IE).
-//            $text = get_string('profile').' '.get_string('missingdescription');
-//            $this->content->items[]= $editmyprofile.' <a title="'.$text.'" class="useredit blink">*<span class="accesshide">'.$text.'</span></a>';
-//        } else {
-//            $this->content->items[]= $editmyprofile;
-//        }
-//        $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/user.gif" alt="" />';
-
-
+   /// Link to the user own profile
+        $this->content->items[]='<a href="'.$CFG->wwwroot.'/user/view.php?id='.$USER->id.'&amp;course='.$course->id.'">'.get_string('profile').'</a>';
+        $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/user.gif" alt="" />';

        return $this->content;
    }
@@ -12,7 +12,7 @@ class block_html extends block_base {
    }

    function specialization() {
-        $this->title = isset($this->config->title) ? $this->config->title : get_string('newhtmlblock', 'block_html');
+        $this->title = isset($this->config->title) ? format_string($this->config->title) : get_string('newhtmlblock', 'block_html');
    }

    function instance_allow_multiple() {
@@ -24,8 +24,13 @@ class block_html extends block_base {
            return $this->content;
        }

-        $filteropt = new stdClass;
-        $filteropt->noclean = true;
+        if (!empty($this->instance->pinned) or $this->instance->pagetype === 'course-view') {
+            // fancy html allowed only on course page and in pinned blocks for security reasons
+            $filteropt = new stdClass;
+            $filteropt->noclean = true;
+        } else {
+            $filteropt = null;
+        }

        $this->content = new stdClass;
        $this->content->text = isset($this->config->text) ? format_text($this->config->text, FORMAT_HTML, $filteropt) : '';
@@ -1,4 +1,11 @@
-<?php $usehtmleditor = can_use_html_editor(); ?>
+<?php
+    $usehtmleditor = can_use_html_editor();
+
+    $text = isset($this->config->text) ? $this->config->text : '';
+    if (empty($this->instance->pinned) and $this->instance->pagetype !== 'course-view') {
+        $text = clean_text($text, FORMAT_HTML);
+    }
+?>
 <table cellpadding="9" cellspacing="0">
 <tr valign="top">
    <td align="right"><?php print_string('configtitle', 'block_html'); ?>:</td>
@@ -6,7 +13,7 @@
 </tr>
 <tr valign="top">
    <td align="right"><?php print_string('configcontent', 'block_html'); ?>:</td>
-    <td><?php print_textarea($usehtmleditor, 25, 50, 0, 0, 'text', isset($this->config->text)?$this->config->text:'') ?></td>
+    <td><?php print_textarea($usehtmleditor, 25, 50, 0, 0, 'text', $text) ?></td>
 </tr>
 <tr>
    <td colspan="3" align="center">
@@ -1,204 +0,0 @@
-<?php  // $Id$
-
-    die; //must be fixed before enabling again, see SC#971
-
-    // All of this is standard Moodle fixtures
-
-    require_once('../config.php');
-    require_once($CFG->dirroot .'/course/lib.php');
-    require_once($CFG->dirroot .'/lib/blocklib.php');
-    require_once($CFG->dirroot .'/mod/resource/lib.php');
-    require_once($CFG->dirroot .'/mod/forum/lib.php');
-
-    optional_param('blockaction');
-    optional_param('instanceid', 0, PARAM_INT);
-    optional_param('blockid',    0, PARAM_INT);
-
-    require_login();
-
-    // Begin snippet -----------------------------------------------------------------
-    // This snippet should normally be defined in another file, but I 've put it all
-    // in here to keep it simple.
-
-    // First of all define the string identifier for this "type" of page.
-    define('MOODLE_PAGE_TEST', 'testpage');
-
-    // Also, define identifiers for any non-standard block positions we want to support.
-    define('BLOCK_POS_CENTERUP', 'cu');
-    define('BLOCK_POS_CENTERDOWN', 'cd');
-
-    // The actual Page derived class
-    class page_test extends page_base {
-
-        // Mandatory; should return our identifier.
-        function get_type() {
-            return MOODLE_PAGE_TEST;
-        }
-
-        // For this test page, only admins are going to be allowed editing (for simplicity).
-        function user_allowed_editing() {
-            return isadmin();
-        }
-
-        // Also, admins are considered to have "always on" editing (I wanted to avoid duplicating
-        // the code that turns editing on/off here; you can roll your own or copy course/view.php).
-        function user_is_editing() {
-            return isadmin();
-        }
-
-        // Simple method that accepts one parameter and prints the header. Here we just ignore
-        // the parameter entirely.
-        function print_header($title) {
-            print_header("Page testing page", 'SAMPLE CUSTOM PAGE', 'home');
-        }
-        
-        // This should point to the script that displays us; it's straightforward in this case.
-        function url_get_path() {
-            global $CFG;
-            return $CFG->wwwroot .'/blocks/pagedemo.php';
-        }
-
-        // We do not need any special request variables such as ID in this case, so we 're not
-        // going to have to override url_get_parameters() here; the default suits us nicely.
-
-        // Having defined all identifiers we need, here we declare which block positions we are
-        // going to support.
-        function blocks_get_positions() {
-           return array(BLOCK_POS_LEFT, BLOCK_POS_RIGHT, BLOCK_POS_CENTERUP, BLOCK_POS_CENTERDOWN);
-        }
-
-        // And here we declare where new blocks will appear (arbitrary choice).
-        function blocks_default_position() {
-            return BLOCK_POS_CENTERUP;
-        }
-
-        // Since we 're not going to be creating multiple instances of this "page" (as we do with
-        // courses), we don't need  to provide default blocks. Otherwise we 'd need to override
-        // the blocks_get_default() method.
-
-        // And finally, a little block move logic. Given a block's previous position and where
-        // we want to move it to, return its new position. Pretty self-documenting.
-        function blocks_move_position(&$instance, $move) {
-            if($instance->position == BLOCK_POS_LEFT && $move == BLOCK_MOVE_RIGHT) {
-                return BLOCK_POS_CENTERUP;
-            } else if ($instance->position == BLOCK_POS_RIGHT && $move == BLOCK_MOVE_LEFT) {
-                return BLOCK_POS_CENTERUP;
-            } else if (($instance->position == BLOCK_POS_CENTERUP || $instance->position == BLOCK_POS_CENTERDOWN) && $move == BLOCK_MOVE_LEFT) {
-                return BLOCK_POS_LEFT;
-            } else if (($instance->position == BLOCK_POS_CENTERUP || $instance->position == BLOCK_POS_CENTERDOWN) && $move == BLOCK_MOVE_RIGHT) {
-                return BLOCK_POS_RIGHT;
-            } else if ($instance->position == BLOCK_POS_CENTERUP && $move == BLOCK_MOVE_DOWN) {
-                return BLOCK_POS_CENTERDOWN;
-            } else if ($instance->position == BLOCK_POS_CENTERDOWN && $move == BLOCK_MOVE_UP) {
-                return BLOCK_POS_CENTERUP;
-            }
-            return $instance->position;
-        }
-    }
-    // End snippet -------------------------------------------------------------------
-
-    /// Bounds for block widths on this page
-    define('BLOCK_L_MIN_WIDTH', 160);
-    define('BLOCK_L_MAX_WIDTH', 210);
-    define('BLOCK_R_MIN_WIDTH', 160);
-    define('BLOCK_R_MAX_WIDTH', 210);
-    define('BLOCK_C_MIN_WIDTH', 250);
-    define('BLOCK_C_MAX_WIDTH', 350);
-
-
-    // Before creating our page object, we need to map our page identifier to the actual name
-    // of the class which will be handling its operations. Pretty simple, but essential.
-    page_map_class(MOODLE_PAGE_TEST, 'page_test');
-
-    // Now, create our page object. The identifier "1" is passed arbitrarily because we don't
-    // have multiple "testpages"; if we did, that would be the "testpageid" from the database.
-    $PAGE = page_create_object(MOODLE_PAGE_TEST, 1);
-
-    $PAGE->print_header(NULL);
-    $editing = $PAGE->user_is_editing();
-
-    // That's it! From now on, everything is simply copy-pasted from course/view.php with a few
-    // minor tweaks to display the page layout!
-
-    // Calculate the preferred width for left, right and center (both center positions will use the same)
-    if (empty($preferred_width_left)) {
-        $preferred_width_left =  blocks_preferred_width($pageblocks[BLOCK_POS_LEFT]);
-    }
-    if (empty($preferred_width_right)) {
-        $preferred_width_right = blocks_preferred_width($pageblocks[BLOCK_POS_RIGHT]);
-    }
-    if (empty($preferred_width_centerup)) {
-        $preferred_width_centerup = blocks_preferred_width($pageblocks[BLOCK_POS_CENTERUP]);
-    }
-    if (empty($preferred_width_centerdown)) {
-        $preferred_width_centerdown =  blocks_preferred_width($pageblocks[BLOCK_POS_CENTERDOWN]);
-    }
-    $preferred_width_left = min($preferred_width_left, BLOCK_L_MAX_WIDTH);
-    $preferred_width_left = max($preferred_width_left, BLOCK_L_MIN_WIDTH);
-    $preferred_width_right = min($preferred_width_right, BLOCK_R_MAX_WIDTH);
-    $preferred_width_right = max($preferred_width_right, BLOCK_R_MIN_WIDTH);
-    $preferred_width_center = max($preferred_width_centerup, $preferred_width_centerdown);
-    $preferred_width_center = min($preferred_width_center, BLOCK_C_MAX_WIDTH);
-    $preferred_width_center = max($preferred_width_center, BLOCK_C_MIN_WIDTH);
-
-    // Display the blocks and allow blocklib to handle any block action requested
-    $pageblocks = blocks_get_by_page($PAGE);
-
-    if($editing) {
-        if (!empty($blockaction) && confirm_sesskey()) {
-            if (!empty($blockid)) {
-                blocks_execute_action($PAGE, $pageblocks, strtolower($blockaction), intval($blockid));
-                
-            }
-            else if (!empty($instanceid)) {
-                $instance = blocks_find_instance($instanceid, $pageblocks);
-                blocks_execute_action($PAGE, $pageblocks, strtolower($blockaction), $instance);
-            }
-            // This re-query could be eliminated by judicious programming in blocks_execute_action(),
-            // but I'm not sure if it's worth the complexity increase...
-            $pageblocks = blocks_get_by_page($PAGE);
-        }
-    }
-    
-    // The actual display logic is here
-    echo '<table style="width: 100%;"><tr>';
-
-    if(blocks_have_content($pageblocks,BLOCK_POS_LEFT) || $editing) {
-        echo '<td style="vertical-align: top; width: '.$preferred_width_left.'px;">';
-        blocks_print_group($PAGE, $pageblocks,BLOCK_POS_LEFT);
-        echo '</td>';
-    }
-
-    echo '<td style="border: 1px black solid; width: '.$preferred_width_center.'px;"><p style="text-align: center; padding: 10px; background: black; color: white;">Center-up position:</p>';
-    if(blocks_have_content($pageblocks,BLOCK_POS_CENTERUP) || $editing) {
-        blocks_print_group($PAGE, $pageblocks,BLOCK_POS_CENTERUP);
-    }
-
-    echo '<div style="padding: 10px; background: gold; text-align: center;">Content Here';
-    
-    print_object(make_timestamp(2005, 6, 1, 0, 0, 0));
-
-    echo '</div>';
-
-    echo '<p style="text-align: center; padding: 10px; background: black; color: white;">Center-down position:</p>';
-    if(blocks_have_content($pageblocks,BLOCK_POS_CENTERDOWN) || $editing) {
-        blocks_print_group($PAGE, $pageblocks,BLOCK_POS_CENTERDOWN);
-    }
-    echo '</td>';
-
-    if(blocks_have_content($pageblocks,BLOCK_POS_RIGHT) || $editing) {
-        echo '<td style="vertical-align: top; width: '.$preferred_width_right.'px;">';
-        blocks_print_group($PAGE, $pageblocks,BLOCK_POS_RIGHT);
-        if ($editing) {
-            blocks_print_adminblock($PAGE, $pageblocks);
-        }
-        echo '</td>';
-    }
-
-    // Finished! :-)
-
-    echo '</tr></table>';
-    print_footer();
-
-
-?>
@@ -8,7 +8,7 @@ class block_participants extends block_list {

    function get_content() {
          
-        global $USER, $CFG;
+        global $USER, $CFG, $COURSE;
    
        // the following 3 lines is need to pass _self_test();
        if (empty($this->instance->pageid)) {
@@ -21,7 +21,8 @@ class block_participants extends block_list {
              $currentcontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
              $canviewparticipants = has_capability('moodle/site:viewparticipants', $currentcontext);
        } else { // course context
-            $currentcontext = get_context_instance(CONTEXT_COURSE, $this->instance->pageid);
+            /// MDL-13252 Always get the course context or else the context may be incorrect in the user/index.php
+            $currentcontext = get_context_instance(CONTEXT_COURSE, $COURSE->id);
            $canviewparticipants = has_capability('moodle/course:viewparticipants', $currentcontext);
        }
        
@@ -48,8 +49,7 @@ class block_participants extends block_list {
            $this->instance->pageid = SITEID;
        }

-        if ($this->instance->pageid != SITEID
-                || $canviewparticipants) {
+        if ($COURSE->id != SITEID || $canviewparticipants) {

            $this->content->items[] = '<a title="'.get_string('listofallpeople').'" href="'.
                                      $CFG->wwwroot.'/user/index.php?contextid='.$currentcontext->id.'">'.get_string('participants').'</a>';
@@ -273,8 +273,12 @@ if ($act == 'updfeed') {
            if (file_exists($CFG->dirroot .'/blog/lib.php')) {
                //Blog module is installed - provide "blog this" link
                print '<td align="right">'."\n";
-                print '<img src="'. $CFG->pixpath .'/blog/blog.gif" alt="'. get_string('blogthis', 'blog').'" title="'. get_string('blogthis', 'blog') .'" border="0" align="middle" />'."\n";
-                print '<a href="'. $CFG->wwwroot .'/blog/blogthis.php?userid='. $userid .'&act=use&item='. $y .'&rssid='. $rssid .'"><small><strong>'. get_string('blogthis', 'blog') .'</strong></small></a>'."\n";
+                
+                /// MDL-9291, blog this feature needs further discussion/implementation
+                /// temporarily disabling for now.
+                
+                // print '<img src="'. $CFG->pixpath .'/blog/blog.gif" alt="'. get_string('blogthis', 'blog').'" title="'. get_string('blogthis', 'blog') .'" border="0" align="middle" />'."\n";
+                //print '<a href="'. $CFG->wwwroot .'/blog/blogthis.php?userid='. $USER->id .'&act=use&item='. $y .'&rssid='. $rssid .'"><small><strong>'. get_string('blogthis', 'blog') .'</strong></small></a>'."\n";
            } else {
                print '<td>&nbsp;';
            }
@@ -84,7 +84,8 @@ switch ($filtertype) {
        if ($CFG->bloglevel < BLOG_GROUP_LEVEL) {
            error('Group blogs is not enabled');
        }
-        if (!$group = get_record('groups','id',$groupid)) {
+        // fix for MDL-9268
+        if (!$group = get_record('groups','id',$filterselect)) {
            error('Incorrect group id specified');
        }
        if (!$course = get_record('course', 'id', $group->courseid)) {
@@ -154,9 +154,9 @@
        global $USER, $CFG, $COURSE, $ME;

        $template['body'] = format_text($blogEntry->summary, $blogEntry->format);
-        $template['title'] = '<a name="'. $blogEntry->subject .'"></a>';
+        $template['title'] = '<a name="'. s($blogEntry->subject) .'"></a>';
        //enclose the title in nolink tags so that moodle formatting doesn't autolink the text
-        $template['title'] .= '<span class="nolink">'.$blogEntry->subject.'</span>';
+        $template['title'] .= '<span class="nolink">'. format_string($blogEntry->subject) .'</span>';
        $template['userid'] = $blogEntry->userid;
        $template['author'] = fullname(get_record('user','id',$blogEntry->userid));
        $template['lastmod'] = userdate($blogEntry->lastmodified);
@@ -351,7 +351,7 @@
            break;

            case BLOG_COURSE_LEVEL:
-                $mycourses = array_keys(get_my_courses($targetuserid));
+                $mycourses = array_keys(get_my_courses($USER->id));
                $usercourses = array_keys(get_my_courses($targetuserid));
                $shared = array_intersect($mycourses, $usercourses);
                if (!empty($shared)) {
@@ -361,7 +361,7 @@
            break;

            case BLOG_GROUP_LEVEL:
-                $mycourses = array_keys(get_my_courses($targetuserid));
+                $mycourses = array_keys(get_my_courses($USER->id));
                $usercourses = array_keys(get_my_courses($targetuserid));
                $shared = array_intersect($mycourses, $usercourses);
                foreach ($shared as $courseid) {
@@ -399,6 +399,8 @@

        global $CFG, $USER;

+        $typesql = " AND p.module = 'blog' ";   
+        
        /// set the tag id for searching
        if ($tagid) {
            $tag = $tagid;
@@ -444,12 +446,18 @@
        }

        if (isloggedin() && !has_capability('moodle/legacy:guest', get_context_instance(CONTEXT_SYSTEM, SITEID), $USER->id, false)) {
-            $permissionsql =  '(p.publishstate = \'site\' OR p.publishstate = \'public\' OR p.userid = '.$USER->id.')';
+            $permissionsql =  'AND (p.publishstate = \'site\' OR p.publishstate = \'public\' OR p.userid = '.$USER->id.')';
        } else {
-            $permissionsql =  'p.publishstate = \'public\'';
+            $permissionsql =  'AND p.publishstate = \'public\'';
+        }
+        
+        // fix for MDL-9165, use with readuserblogs capability in a user context can read that user's private blogs
+        // admins can see all blogs regardless of publish states, as described on the help page
+        if (has_capability('moodle/user:readuserblogs', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
+            $permissionsql = ''; 
+        } else if ($filtertype=='user' && has_capability('moodle/user:readuserblogs', get_context_instance(CONTEXT_USER, $filterselect))) {
+            $permissionsql = '';  
        }
-
-
        /****************************************
         * depending on the type, there are 4   *
         * different possible sqls              *
@@ -469,7 +477,7 @@
                        .$CFG->prefix.'user u
                        WHERE p.userid = u.id '.$tagquerysql.'
                        AND u.deleted = 0
-                        AND '.$permissionsql;
+                        '.$permissionsql.$typesql;

            break;

@@ -483,20 +491,25 @@
                        AND ra.contextid '.get_related_contexts_string($context).'
                        AND u.id = p.userid
                        AND u.deleted = 0
-                        AND '.$permissionsql;
+                        '.$permissionsql.$typesql;

            break;

            case 'group':
-
                $SQL = 'SELECT '.$requiredfields.' FROM '.$CFG->prefix.'post p, '.$tagtablesql
                        .$CFG->prefix.'groups_members m, '.$CFG->prefix.'user u
                        WHERE p.userid = m.userid '.$tagquerysql.'
                        AND u.id = p.userid
                        AND m.groupid = '.$filterselect.'
+                        AND (p.publishstate = \'site\' OR p.publishstate = \'public\' OR p.userid = '.$USER->id.')';
+                
+                /*$SQL = 'SELECT '.$requiredfields.' FROM '.$CFG->prefix.'post p, '.$tagtablesql
+                        .groups_members_from_sql().', '.$CFG->prefix.'user u
+                        WHERE '.groups_members_where_sql($filterselect, 'p.userid').'
+                        AND u.id = p.userid
                        AND u.deleted = 0
-                        AND '.$permissionsql;
-
+                        '.$permissionsql.$typesql;
+                */
            break;

            case 'user':
@@ -506,7 +519,7 @@
                        WHERE p.userid = u.id '.$tagquerysql.'
                        AND u.id = '.$filterselect.'
                        AND u.deleted = 0
-                        AND '.$permissionsql;
+                        '.$permissionsql.$typesql;
            break;
        }

@@ -205,13 +205,14 @@
                if (count($err) == 0) {
                    $form->timemodified = time();

-                    if ($form->repeat) {
-                        $fetch = get_record_sql('SELECT 1, MAX(repeatid) AS repeatid FROM '.$CFG->prefix.'event');
-                        $form->repeatid = empty($fetch) ? 1 : $fetch->repeatid + 1;
-                    }
-
                    /// Get the event id for the log record.
                    $eventid = insert_record('event', $form, true);
+                    
+                    /// Use the event id as the repeatid to link repeat entries together
+                    if ($form->repeat) {
+                        $form->repeatid = $form->id = $eventid;
+                        update_record('event', $form);         // update the row, to set its repeatid        	
+                    }

                    /// Log the event entry.
                    add_to_log($form->courseid, 'calendar', 'add', 'event.php?action=edit&amp;id='.$eventid, stripslashes($form->name));
@@ -3,13 +3,13 @@
 <form method="get" action="export_execute.php">
 <?php print_string('iwanttoexport', 'calendar'); ?>:
 <div class="indent">
-    <input type="radio" name="preset_what" id="pw_all" value="all" /><label for="pw_all"><?php print_string('eventsall', 'calendar'); ?></label><br />
+    <input type="radio" name="preset_what" id="pw_all" value="all" checked="checked"/><label for="pw_all"><?php print_string('eventsall', 'calendar'); ?></label><br />
    <input type="radio" name="preset_what" id="pw_course" value="courses" /><label for="pw_course"><?php print_string('eventsrelatedtocourses', 'calendar'); ?></label><br />
 </div>
 <?php print_string('for', 'calendar'); ?>:
 <div class="indent">
    <?php if($allowthisweek) { ?>
-    <input type="radio" name="preset_time" id="pt_wknow" value="weeknow" /><label for="pt_wknow"><?php print_string('weekthis', 'calendar'); ?></label><br />
+    <input type="radio" name="preset_time" id="pt_wknow" value="weeknow" checked="checked"/><label for="pt_wknow"><?php print_string('weekthis', 'calendar'); ?></label><br />
    <?php } ?>
    <?php if($allownextweek) { ?>
    <input type="radio" name="preset_time" id="pt_wknext" value="weeknext" /><label for="pt_wknext"><?php print_string('weeknext', 'calendar'); ?></label><br />
@@ -16,8 +16,8 @@ $day  = optional_param('cal_d', 0, PARAM_INT);
 $mon  = optional_param('cal_m', 0, PARAM_INT);
 $yr   = optional_param('cal_y', 0, PARAM_INT);

-$what = optional_param('preset_what', '', PARAM_ALPHA);
-$time = optional_param('preset_time', '', PARAM_ALPHA);
+$what = optional_param('preset_what', 'all', PARAM_ALPHA);
+$time = optional_param('preset_time', 'weeknow', PARAM_ALPHA);

 $now = usergetdate(time());
 // Let's see if we have sufficient and correct data
@@ -1178,15 +1178,11 @@ function calendar_edit_event_allowed($event) {
    if (has_capability('moodle/calendar:manageentries', $sitecontext)) {
        return true;
    }
-
-    // editting userid account
-    if ($event->userid) {  
-        if ($event->userid == $USER->id) {
-            return (has_capability('moodle/calendar:manageownentries', $sitecontext));
-        }
-    } else if ($event->groupid) {
-        $group = get_record('groups', 'id', $event->groupid);
-        if($group === false) {
+    
+    // if groupid is set, it's definitely a group event
+    if ($event->groupid) {
+        //TODO:check.
+        if (! groups_group_exists($event->groupid)) {
            return false;
        } 
        
@@ -1194,10 +1190,15 @@ function calendar_edit_event_allowed($event) {
        // to edit group calendar too
        // there is no need to check membership, because if you have this capability
        // you will have a role in this group context
-        return has_capability('moodle/calendar:manageentries', get_context_instance(CONTEXT_GROUP, $group->id));  
+        return has_capability('moodle/calendar:manageentries', get_context_instance(CONTEXT_GROUP, $event->groupid)); 
    } else if ($event->courseid) {
-        return has_capability('moodle/calendar:manageentries', get_context_instance(CONTEXT_COURSE, $event->courseid)); 
-    }
+    // if groupid is not set, but course is set,
+    // it's definiely a course event
+        return has_capability('moodle/calendar:manageentries', get_context_instance(CONTEXT_COURSE, $event->courseid));  
+    } else if ($event->userid && $event->userid == $USER->id) {  
+    // if course is not set, but userid id set, it's a user event
+        return (has_capability('moodle/calendar:manageownentries', $sitecontext));
+    } 
    return false;
 }

@@ -156,6 +156,11 @@
            }

            $choices = $choices + $roles;
+            
+            // fix for MDL-9197
+            foreach ($choices as $choiceid => $choice) {
+                $choices[$choiceid] = format_string($choice);
+            }

            choose_from_menu ($choices, 'defaultrole', $form->defaultrole, '');
            helpbutton("coursedefaultrole", get_string("defaultrole"));
@@ -1,177 +1,122 @@
 <?php // $Id$
      // Edit course settings

-    require_once("../config.php");
-    require_once("lib.php");
-    require_once("$CFG->libdir/blocklib.php");
-    require_once("$CFG->dirroot/enrol/enrol.class.php");
+    require_once('../config.php');
+    require_once($CFG->dirroot.'/enrol/enrol.class.php');
+    require_once($CFG->libdir.'/blocklib.php');
+    require_once('lib.php');
+    require_once('edit_form.php');

-    include_once $CFG->libdir.'/formslib.php';
+    $id         = optional_param('id', 0, PARAM_INT);       // course id
+    $categoryid = optional_param('category', 0, PARAM_INT); // course category - can be changed in edit form

    require_login();

-    $mform =& new moodleform('edit_course', 'post', 'edit2.php');
-
-    $mform->acceptGet('id', 'category');
-
-    $id       = $mform->optional_param('id', 0, PARAM_INT); // course id
-    $category = $mform->optional_param('category', 0, PARAM_INT); // possible default category
-
-   
-    $disable_meta = false;
-    $focus = "";
-
-    if ($id) {
-        if (! $course = get_record("course", "id", $id)) {
-            error("Course ID was incorrect");
+/// basic access control checks
+    if ($id) { // editing course
+        if (!$course = get_record('course', 'id', $id)) {
+            error('Course ID was incorrect');
        }
+        $category = get_record('course_categories', 'id', $course->category);
+        require_capability('moodle/course:update', get_context_instance(CONTEXT_COURSE, $course->id));

-		$context = get_context_instance(CONTEXT_COURSE, $course->id);
-		
-        if (!has_capability('moodle/course:update', $context)) {
-            error("You do not currently have editing privileges!");
+    } else if ($categoryid) { // creating new course in this category
+        $course = null;
+        if (!$category = get_record('course_categories', 'id', $categoryid)) {
+            error('Category ID was incorrect');
        }
-        
-        if (course_in_meta($course)) {
-            $disable_meta = get_string('metaalreadyinmeta');
-        } else if ($course->metacourse) {
-            if (count_records("course_meta","parent_course",$course->id) > 0) {
-                $disable_meta = get_string('metaalreadyhascourses');
-            }
-        } else {
-            $managers = count(get_users_by_capability($context, 'moodle/course:managemetacourse'));
-            $participants = count(get_users_by_capability($context, 'moodle/course:view'));
-            if ($participants > $managers) {
-                $disable_meta = get_string('metaalreadyhasenrolments');
-            }
-        }
-    } else {  // Admin is creating a new course
-
-		$context = get_context_instance(CONTEXT_SYSTEM, SITEID);
-		if (!has_capability('moodle/course:create',$context)) {
-            error("You do not currently have course creation privileges!");
-        }
-
-        $course = NULL;
+        require_capability('moodle/course:create', get_context_instance(CONTEXT_COURSECAT, $category->id));
+    } else {
+        error('Either course id or category must be specified');
    }

-    if (! $site = get_site()) {
-        redirect("$CFG->wwwroot/$CFG->admin/index.php");
-    }
-
-
-
-    include("edit_form.php");
-            
-
-
-/// If data submitted, then process and store.
-// data_submitted tries to validate form data and returns false if 
-// the user inputted data is invalid and the form should be redisplayed with 
-// feedback.
-
-    if ($fromform=$mform->data_submitted()) {
-
-        
-        if (!empty($fromform->enrolstartdisabled)){
-            $fromform->enrolstartdate = 0;
-        }
-
-        if (!empty($fromform->enrolenddisabled)) {
-            $fromform->enrolenddate = 0;
-        }
+/// prepare course
+    if (!empty($course)) {
        $allowedmods = array();
-        if (!empty($fromform->allowedmods)) {
-            $allowedmods = $fromform->allowedmods;
-            unset($fromform->allowedmods);
-        }
-        
-        $fromform->timemodified = time();
-
-        if ($fromform->defaultrole == -1) {   // Just leave it however it is
-            unset($fromform->defaultrole);
-        }        
        if (!empty($course)) {
-            // Test for and remove blocks which aren't appropriate anymore
-            $page = page_create_object(PAGE_COURSE_VIEW, $course->id);
-            blocks_remove_inappropriate($page);
-
-            // Update with the new data
-            if (update_record('course', $fromform)) {
-                add_to_log($course->id, "course", "update", "edit.php?id=$id", "");
-                if (has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
-                    $course->restrictmodules = $fromform->restrictmodules;
-                    update_restricted_mods($course,$allowedmods);
+            if ($am = get_records('course_allowed_modules','course',$course->id)) {
+                foreach ($am as $m) {
+                    $allowedmods[] = $m->module;
                }
-                fix_course_sortorder();
-                // everything ok, no need to display any message in redirect
-                redirect("view.php?id=$course->id");
            } else {
-                error("Serious Error! Could not update the course record! (id = $fromform->id)");
+                if (empty($course->restrictmodules)) {
+                    $allowedmods = explode(',',$CFG->defaultallowedmodules);
+                } // it'll be greyed out but we want these by default anyway.
            }
-        } else {
-            $fromform->timecreated = time();
-
-            // place at beginning of category
-            fix_course_sortorder();
-            $fromform->sortorder = get_field_sql("SELECT min(sortorder)-1 FROM {$CFG->prefix}course WHERE category=$fromform->category");                
-            if (empty($fromform->sortorder)) {
-                $fromform->sortorder = 100;
+            $course->allowedmods = $allowedmods;
+    
+            if ($course->enrolstartdate){
+                $course->enrolstartdisabled = 0;
            }
-            // fill in default teacher and student names to keep backwards compatibility
-            $fromform->teacher = addslashes(get_string('defaultcourseteacher'));
-            $fromform->teachers = addslashes(get_string('defaultcourseteachers'));
-            $fromform->student = addslashes(get_string('defaultcoursestudent'));
-            $fromform->students = addslashes(get_string('defaultcoursestudents'));
-
-            if ($newcourseid = insert_record('course', $fromform)) {  // Set up new course
-                
-                // Setup the blocks
-                $page = page_create_object(PAGE_COURSE_VIEW, $newcourseid);
-                blocks_repopulate_page($page); // Return value not checked because you can always edit later
-
-                if (has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
-                    $course = get_record("course","id",$newcourseid);
-                    update_restricted_mods($course,$allowedmods);
-                }
-
-                $section = NULL;
-                $section->course = $newcourseid;   // Create a default section.
-                $section->section = 0;
-                $section->id = insert_record("course_sections", $section);
-
-                fix_course_sortorder();
-                add_to_log(SITEID, "course", "new", "view.php?id=$newcourseid", "$fromform->fullname (ID $newcourseid)")        ;
-                $context = get_context_instance(CONTEXT_COURSE, $newcourseid);
-
-                if ($fromform->metacourse and has_capability('moodle/course:managemetacourse', $context)) { // Redirect users with metacourse capability to student import
-                        redirect($CFG->wwwroot."/course/importstudents.php?id=$newcourseid");
-
-                } else if (has_capability('moodle/role:assign', $context)) { // Redirect users with assign capability to assign users to different roles
-                    redirect($CFG->wwwroot."/$CFG->admin/roles/assign.php?contextid=$context->id");
-
-                } else {          // Add current teacher and send to course
-
-                    // find a role with legacy:edittingteacher
-                    if ($teacherroles = get_roles_with_capability('moodle/legacy:editingteacher', CAP_ALLOW, $context)) {
-                        // assign the role to this user
-                        $teachereditrole = array_shift($teacherroles);
-                        role_assign($teachereditrole->id, $USER->id, 0, $context->id);
-                    }
-                    
-                    redirect("view.php?id=$newcourseid");
-                }
-
-
-            } else {
-                error("Serious Error! Could not create the new course!");
+    
+            if ($course->enrolenddate) {
+                $course->enrolenddisabled = 0;
            }
        }
-        die;
    }


-//print the form
+/// first create the form
+    $editform = new course_edit_form('edit.php', compact('course', 'category'));
+    // now override defaults if course already exists
+    if (!empty($course)) {
+        $editform->set_data($course);
+    }
+    if ($editform->is_cancelled()){
+        if (empty($course)) {
+            redirect($CFG->wwwroot);
+        } else {
+            redirect($CFG->wwwroot.'/course/view.php?id='.$course->id);
+        }
+
+    } else if ($data = $editform->get_data()) {
+    
+/// process data if submitted
+
+        //preprocess data
+        if ($data->enrolstartdisabled){
+            $data->enrolstartdate = 0;
+        }
+
+        if ($data->enrolenddisabled) {
+            $data->enrolenddate = 0;
+        }
+
+        $data->timemodified = time();
+
+        if (empty($course)) {
+            if (!$course = create_course($data)) {
+                print_error('coursenotcreated');
+            }
+
+            $context = get_context_instance(CONTEXT_COURSE, $course->id);
+
+            // assign default role to creator if not already having permission to manage course assignments
+            if (!has_capability('moodle/course:view', $context) or !has_capability('moodle/role:assign', $context)) {
+                role_assign($CFG->creatornewroleid, $USER->id, 0, $context->id);
+            }        
+
+            if ($data->metacourse and has_capability('moodle/course:managemetacourse', $context)) {
+                // Redirect users with metacourse capability to student import
+                redirect($CFG->wwwroot."/course/importstudents.php?id=$course->id");
+            } else {
+                // Redirect to roles assignment
+                redirect($CFG->wwwroot."/$CFG->admin/roles/assign.php?contextid=$context->id");
+            }
+            
+        } else {
+            if (!update_course($data)) {
+                print_error('coursenotupdated');
+            }
+
+            redirect($CFG->wwwroot."/course/view.php?id=$course->id");
+        }
+    }
+
+
+/// Print the form
+
+    $site = get_site();

    $streditcoursesettings = get_string("editcoursesettings");
    $straddnewcourse = get_string("addnewcourse");
@@ -179,20 +124,19 @@
    $strcategories = get_string("categories");

    if (!empty($course)) {
-        print_header($streditcoursesettings, "$course->fullname",
+        print_header($streditcoursesettings, $course->fullname,
                     "<a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a>
-                      -> $streditcoursesettings", $focus);
+                      -> $streditcoursesettings", $editform->focus());
    } else {
-        print_header("$site->shortname: $straddnewcourse", "$site->fullname",
-                     "<a href=\"../$CFG->admin/index.php\">$stradministration</a> -> ".
-                     "<a href=\"index.php\">$strcategories</a> -> $straddnewcourse", $focus);
+        print_header("$site->shortname: $straddnewcourse", $site->fullname,
+                     "<a href=\"$CFG->wwwroot/$CFG->admin/index.php\">$stradministration</a> -> ".
+                     "<a href=\"index.php\">$strcategories</a> -> $straddnewcourse", $editform->focus());
    }

-
    print_heading($streditcoursesettings);

-    $mform->display();
-    
+    $editform->display();
+
    print_footer($course);

 ?>
@@ -1,392 +1,382 @@
-<?php
-/// For moodleform we reconstruct all the data about the form after submission before we
-/// extract data submitted. So we can then tell for select, checkbox and radio fields what
-/// options could have been submitted by the form eg submitted value for a single selection
-/// select field must be one of the options of the select field.
+<?php  //$Id$

-// $toform will be used for the default value of a field if no data has been submitted.
+require_once($CFG->libdir.'/formslib.php');

-    if (!empty($course)) {
-        //this is what we do if we are editing a record from the db
-        $toform = $course;
-        $toform->allowedmods = array();
-        if ($am = get_records("course_allowed_modules","course",$course->id)) {
-            foreach ($am as $m) {
-                $toform->allowedmods[] = $m->module;
+class course_edit_form extends moodleform {
+
+    function definition() {
+        global $USER, $CFG;
+
+        $mform    =& $this->_form;
+
+        $course   = $this->_customdata['course'];
+        $category = $this->_customdata['category'];
+
+        $systemcontext = get_context_instance(CONTEXT_SYSTEM);
+        $categorycontext = get_context_instance(CONTEXT_COURSECAT, $category->id);
+
+        $disable_meta = false; // basic meta course state protection; server-side security checks not needed
+
+        if (!empty($course)) {
+            $coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);
+            $context = $coursecontext;
+
+            if (course_in_meta($course)) {
+                $disable_meta = get_string('metaalreadyinmeta');
+
+            } else if ($course->metacourse) {
+                if (count_records('course_meta', 'parent_course', $course->id) > 0) {
+                    $disable_meta = get_string('metaalreadyhascourses');
+                }
+
+            } else {
+                $managers = count(get_users_by_capability($coursecontext, 'moodle/course:managemetacourse'));
+                $participants = count(get_users_by_capability($coursecontext, 'moodle/course:view'));
+                if ($participants > $managers) {
+                    $disable_meta = get_string('metaalreadyhasenrolments');
+                }
            }
        } else {
-            if (empty($course->restrictmodules)) {
-                $toform->allowedmods = explode(',',$CFG->defaultallowedmodules);
-            } // it'll be greyed out but we want these by default anyway.
-        }        
-    } else {
-        //this is a brand new course!
-        $toform->startdate = time() + 3600 * 24;
-        $toform->fullname = get_string("defaultcoursefullname");
-        $toform->shortname = get_string("defaultcourseshortname");
-        $toform->summary = get_string("defaultcoursesummary");
-        $toform->format = "weeks";
-        $toform->password = "";
-        $toform->guest = 0;
-        $toform->numsections = 10;
-        $toform->idnumber = '';
-        $toform->cost = '';
-        $toform->currency = empty($CFG->enrol_currency) ? 'USD' : $CFG->enrol_currency;
-        $toform->newsitems = 5;
-        $toform->showgrades = 1;
-        $toform->groupmode = 0;
-        $toform->groupmodeforce = 0;
-        $toform->category = $category;
-        $toform->id = "";
-        $toform->visible = 1;
-        $toform->allowedmods = array();
-        if ($CFG->restrictmodulesfor == 'all') {
-            $toform->allowedmods = explode(',',$CFG->defaultallowedmodules);
-            if (!empty($CFG->restrictbydefault)) {
-                $toform->restrictmodules = 1;
-            }
+            $coursecontext = null;
+            $context = $categorycontext;
        }

+/// form definition with new course defaults
+//--------------------------------------------------------------------------------
+        $mform->addElement('header','general', get_string('general', 'form'));

-    }
+        //must have create course capability in both categories in order to move course
+        if (has_capability('moodle/course:create', $categorycontext)) {
+            $displaylist = array();
+            $parentlist = array();
+            make_categories_list($displaylist, $parentlist);
+            foreach ($displaylist as $key=>$val) {
+                if (!has_capability('moodle/course:create', get_context_instance(CONTEXT_COURSECAT, $key))) {
+                    unset($displaylist[$key]);
+                }
+            }
+            $mform->addElement('select', 'category', get_string('category'), $displaylist);
+        } else {
+            $mform->addElement('hidden', 'category', null);
+        }
+        $mform->setHelpButton('category', array('coursecategory', get_string('category')));
+        $mform->setDefault('category', $category->id);
+        $mform->setType('category', PARAM_INT);

-    $mform->addElement('header','general', get_string("general"));
-    if (has_capability('moodle/course:create', get_context_instance(CONTEXT_COURSECAT, $toform->category))) { 
-        $displaylist = array();
-        $parentlist = array();
-        make_categories_list($displaylist, $parentlist);
-        $mform->addElement('select', "category", get_string("category"), $displaylist );
-    }
-    $mform->setDefault('fullname', $toform->fullname);
-    $mform->addElement('text','fullname', get_string("fullname"),'maxlength="254" size="50"');
-    $mform->setDefault('shortname', $toform->shortname);
-    $mform->addElement('text','shortname', get_string("shortname"),'maxlength="15" size="10"');
-    $mform->setDefault('idnumber', $toform->idnumber);
-    $mform->addElement('text','idnumber', get_string("idnumbercourse"),'maxlength="100"  size="10"');
-    $mform->setDefault('summary', $toform->summary);
-    $mform->addElement('htmleditor','summary', get_string("summary"), array('rows'=>'10', 'cols'=>'65'));
+        $mform->addElement('text','fullname', get_string('fullname'),'maxlength="254" size="50"');
+        $mform->setHelpButton('fullname', array('coursefullname', get_string('fullname')), true);
+        $mform->setDefault('fullname', get_string('defaultcoursefullname'));
+        $mform->addRule('fullname', get_string('missingfullname'), 'required', null, 'client');
+        $mform->setType('fullname', PARAM_MULTILANG);

-    $mform->setDefault('format', $toform->format);
-    $courseformats = get_list_of_plugins("course/format");
-    $formcourseformats = array();
+        $mform->addElement('text','shortname', get_string('shortname'),'maxlength="15" size="10"');
+        $mform->setHelpButton('shortname', array('courseshortname', get_string('shortname')), true);
+        $mform->setDefault('shortname', get_string('defaultcourseshortname'));
+        $mform->addRule('shortname', get_string('missingshortname'), 'required', null, 'client');
+        $mform->setType('shortname', PARAM_MULTILANG);

-    foreach ($courseformats as $courseformat) {
-        $formcourseformats["$courseformat"] = get_string("format$courseformat");
-    }
+        $mform->addElement('text','idnumber', get_string('idnumbercourse'),'maxlength="100"  size="10"');
+        $mform->setHelpButton('idnumber', array('courseidnumber', get_string('idnumbercourse')), true);
+        $mform->setType('idnumber', PARAM_RAW);

-    $mform->addElement('select', 'format', get_string("format"), $formcourseformats );
+        $mform->addElement('htmleditor','summary', get_string('summary'), array('rows'=> '10', 'cols'=>'65'));
+        $mform->setHelpButton('summary', array('text', get_string('helptext')), true);
+        $mform->setDefault('summary', get_string('defaultcoursesummary'));
+        $mform->addRule('summary', get_string('missingsummary'), 'required', null, 'client');
+        $mform->setType('summary', PARAM_RAW);

-    $mform->setDefault('numsections', $toform->numsections);
-    for ($i=1; $i<=52; $i++) {
-      $sectionmenu[$i] = "$i";
-    } 
-    $mform->addElement('select', 'numsections', get_string("numberweeks"), $sectionmenu);
-    $mform->setDefault('startdate', $toform->startdate);
-    $mform->addElement('date_selector', 'startdate', get_string('startdate'));
+        $courseformats = get_list_of_plugins('course/format');
+        $formcourseformats = array();
+        foreach ($courseformats as $courseformat) {
+            $formcourseformats["$courseformat"] = get_string("format$courseformat","format_$courseformat");
+            if($formcourseformats["$courseformat"]=="[[format$courseformat]]") {
+                $formcourseformats["$courseformat"] = get_string("format$courseformat");
+            }
+        }
+        $mform->addElement('select', 'format', get_string('format'), $formcourseformats);
+        $mform->setHelpButton('format', array('courseformats', get_string('courseformats')), true);
+        $mform->setDefault('format', 'weeks');

-    $mform->setDefault('hiddensections',(isset($toform->hiddensections))?$toform->hiddensections:0);
-    unset($choices);
-    $choices["0"] = get_string("hiddensectionscollapsed");
-    $choices["1"] = get_string("hiddensectionsinvisible");
-    $mform->addElement('select', 'hiddensections', get_string("hiddensections"), $choices);
+        for ($i=1; $i<=52; $i++) {
+          $sectionmenu[$i] = "$i";
+        }
+        $mform->addElement('select', 'numsections', get_string('numberweeks'), $sectionmenu);
+        $mform->setDefault('numsections', 10);

-    $mform->setDefault('newsitems', $toform->newsitems);
-    $newsitem = get_string("newsitem");
-    $newsitems = get_string("newsitems");
-    $options = array("0" => "0 $newsitems",
-                    "1" => "1 $newsitem",
-                    "2" => "2 $newsitems",
-                    "3" => "3 $newsitems",
-                    "4" => "4 $newsitems",
-                    "5" => "5 $newsitems",
-                    "6" => "6 $newsitems",
-                    "7" => "7 $newsitems",
-                    "8" => "8 $newsitems",
-                    "9" => "9 $newsitems",
-                    "10" => "10 $newsitems");
-    $mform->addElement('select', 'newsitems', get_string("newsitemsnumber"), $options);
+        $mform->addElement('date_selector', 'startdate', get_string('startdate'));
+        $mform->setHelpButton('startdate', array('coursestartdate', get_string('startdate')), true);
+        $mform->setDefault('startdate', time() + 3600 * 24);

-    $mform->setDefault('showgrades', $toform->showgrades);
-    unset($choices);
-    $choices["0"] = get_string("no");
-    $choices["1"] = get_string("yes");
-    $mform->addElement('select', 'showgrades', get_string("showgrades"), $choices);
-    unset($choices);
-    $mform->setDefault('showreports',(isset($toform->showreports))?$toform->showreports:0);
-    $choices["0"] = get_string("no");
-    $choices["1"] = get_string("yes");
-    $mform->addElement('select', 'showreports', get_string("showreports"), $choices);
-    $mform->setDefault('maxbytes',(isset($toform->maxbytes))?$toform->maxbytes:0);
-    $choices = get_max_upload_sizes($CFG->maxbytes);
-    $mform->addElement('select', 'maxbytes', get_string("maximumupload"), $choices);
-    if (!empty($CFG->allowcoursethemes)) {
-        $mform->setDefault('theme',(isset($toform->theme))?$toform->theme:'');
-       
-        $themes=array();
-        $themes[''] = get_string("forceno");
-        $themes += get_list_of_themes();
-        $mform->addElement('select', 'theme', get_string("forcetheme"), $themes);
-    }
-    unset($choices);
-    $mform->setDefault('metacourse',(isset($toform->metacourse))?$toform->metacourse:0);
+        $choices = array();
+        $choices['0'] = get_string('hiddensectionscollapsed');
+        $choices['1'] = get_string('hiddensectionsinvisible');
+        $mform->addElement('select', 'hiddensections', get_string('hiddensections'), $choices);
+        $mform->setHelpButton('hiddensections', array('coursehiddensections', get_string('hiddensections')), true);
+        $mform->setDefault('hiddensections', 0);
+
+        $options = range(0, 10);
+        $mform->addElement('select', 'newsitems', get_string('newsitemsnumber'), $options);
+        $mform->setHelpButton('newsitems', array('coursenewsitems', get_string('newsitemsnumber')), true);
+        $mform->setDefault('newsitems', 5);
+
+        $mform->addElement('selectyesno', 'showgrades', get_string('showgrades'));
+        $mform->setHelpButton('showgrades', array('coursegrades', get_string('grades')), true);
+        $mform->setDefault('showgrades', 1);
+
+        $mform->addElement('selectyesno', 'showreports', get_string('showreports'));
+        $mform->setHelpButton('showreports', array('coursereports', get_string('activityreport')), true);
+        $mform->setDefault('showreports', 0);
+
+        $choices = get_max_upload_sizes($CFG->maxbytes);
+        $mform->addElement('select', 'maxbytes', get_string('maximumupload'), $choices);
+        $mform->setHelpButton('maxbytes', array('courseuploadsize', get_string('maximumupload')), true);
+
+        if (!empty($CFG->allowcoursethemes)) {
+            $themes=array();
+            $themes[''] = get_string('forceno');
+            $themes += get_list_of_themes();
+            $mform->addElement('select', 'theme', get_string('forcetheme'), $themes);
+        }

-    if (empty($disable_meta)) {
        $meta=array();
        $meta[0] = get_string('no');
        $meta[1] = get_string('yes');
-        $mform->addElement('select', 'metacourse', get_string("managemeta"), $meta);
-    }else{
-        $mform->addElement('static', 'metacourse', get_string("managemeta"), 
-            ((empty($toform->metacourse)) ? get_string("no") : get_string("yes"))
-                . " - $disable_meta ");
-        
-    }
-    
-    $mform->setDefault('defaultrole',(isset($toform->defaultrole))?$toform->defaultrole:0);
-    $roles = get_assignable_roles($context);
-    asort($roles);
-    $choices = array();
-
-    if ($sitedefaultrole = get_record('role', 'id', $CFG->defaultcourseroleid)) {
-        $choices[0] = get_string('sitedefault').' ('.$sitedefaultrole->name.')';
-    } else {
-        $choices[0] = get_string('sitedefault');
-    }
-
-    $choices = $choices + $roles;    
-    $defaultroleelement=$mform->addElement('select', 'defaultrole', get_string('defaultrole', 'role'), $choices );
-    if ($mform->exportValue('defaultrole') && !isset($roles[$mform->exportValue('defaultrole')])) {  // Existing setting is one we can't choose
-        if ($coursedefaultrole = get_record('role', 'id', $mform->exportValue('defaultrole'))) {
-            
-            $defaultroleelement->addOption(get_string('currentrole', 'role').' ('.$coursedefaultrole->name.')',-1);
+        if ($disable_meta === false) {
+            $mform->addElement('select', 'metacourse', get_string('managemeta'), $meta);
+            $mform->setHelpButton('metacourse', array('metacourse', get_string('metacourse')), true);
+            $mform->setDefault('metacourse', 0);
        } else {
-            $defaultroleelement->addOption(get_string('currentrole', 'role'),-1);
+            // no metacourse element - we do not want to change it anyway!
+            $mform->addElement('static', 'nometacourse', get_string('managemeta'),
+                ((empty($course->metacourse)) ? $meta[0] : $meta[1]) . " - $disable_meta ");
+            $mform->setHelpButton('nometacourse', array('metacourse', get_string('metacourse')), true);
        }
-    }
-    

-    $mform->addElement('header','enrolhdr', get_string("enrolment"));
-    $mform->setDefault('enrol',(isset($toform->enrol))?$toform->enrol:'');
-       
-    $modules = explode(',', $CFG->enrol_plugins_enabled);
-    foreach ($modules as $module) {
-        $name = get_string("enrolname", "enrol_$module");
-        $plugin = enrolment_factory::factory($module);
-        if (method_exists($plugin, 'print_entry')) {
-            $choices[$name] = $module;
+        $roles = get_assignable_roles($context);
+        if (!empty($course)) {
+            // add current default role, so that it is selectable even when user can not assign it
+            if ($current_role = get_record('role', 'id', $course->defaultrole)) {
+                $roles[$current_role->id] = strip_tags(format_string($current_role->name, true));
+            }
        }
-    }
-    asort($choices);
-    $choices = array_flip($choices);
-    $choices = array_merge(array('' => get_string('sitedefault').' ('.get_string("enrolname", "enrol_$CFG->enrol").')'), $choices);
-    $mform->addElement('select', 'enrol', get_string("enrolmentplugins"), $choices );
-    
-    $mform->setDefault('enrollable',(isset($toform->enrollable))?$toform->enrollable:1);
-    $radio = array();
-    $radio[] = &moodleform::createElement('radio', 'enrollable', null, get_string("no"), 0);
-    $radio[] = &moodleform::createElement('radio', 'enrollable', null, get_string("yes"), 1);
-    $radio[] = &moodleform::createElement('radio', 'enrollable', null, get_string("enroldate"), 2);
-    $mform->addGroup($radio, 'enrollable', get_string("enrollable"), ' ', false);
-    
-    $mform->setDefault('enrolstartdate',(isset($toform->enrolstartdate))?$toform->enrolstartdate:0);
-    $mform->setDefault('enrolstartdisabled',
-                            (!isset($toform->enrolstartdate)||
-                                (isset($toform->enrolstartdate)&&!$toform->enrolstartdate)
-                            ?1:0));
-    $enroldatestartgrp = array();
-    $enroldatestartgrp[] = &moodleform::createElement('date_selector', 'enrolstartdate');
-    $enroldatestartgrp[] = &moodleform::createElement('checkbox', 'enrolstartdisabled', null, get_string('disable'));
-    $mform->addGroup($enroldatestartgrp, '', get_string('enrolstartdate'), ' ', false);
-    
-    $mform->setDefault('enrolenddate',(isset($toform->enrolenddate))?$toform->enrolenddate:0);
-    $mform->setDefault('enrolenddisabled',
-                            (!isset($toform->enrolenddate)||
-                                (isset($toform->enrolenddate)&&!$toform->enrolenddate)
-                            ?1:0));
-    $enroldateendgrp = array();
-    $enroldateendgrp[] = &moodleform::createElement('date_selector', 'enrolenddate');
-    $enroldateendgrp[] = &moodleform::createElement('checkbox', 'enrolenddisabled', null, get_string('disable'));
-    $mform->addGroup($enroldateendgrp, 'enroldateendgrp', get_string('enrolenddate'), ' ', false);
-    
-    $mform->setDefault('enrolperiod',(isset($toform->enrolperiod))?$toform->enrolperiod:0);
-    $periodmenu=array();
-    $periodmenu[0] = get_string('unlimited');
-    for ($i=1; $i<=365; $i++) {
-        $seconds = $i * 86400;
-        $periodmenu[$seconds] = get_string('numdays', '', $i);
-    }
-    $mform->addElement('select', 'enrolperiod', get_string("enrolperiod"), $periodmenu);
-    
-    
-    $mform->addElement('header','expirynotifyhdr', get_string("expirynotify"));
-    
-    $mform->setDefault('expirynotify',(isset($toform->expirynotify))?$toform->expirynotify:0);
-    unset($choices);
-    $choices["0"] = get_string("no");
-    $choices["1"] = get_string("yes");
-    $mform->addElement('select', 'expirynotify', get_string("expirynotify"), $choices);
-    $mform->setDefault('notifystudents',(isset($toform->notifystudents))?$toform->notifystudents:0);
-    $mform->addElement('select', 'notifystudents', get_string("expirynotifystudents"), $choices);
-    $mform->setDefault('expirythreshold',(isset($toform->expirythreshold))?$toform->expirythreshold:10 * 86400);
-    $thresholdmenu=array();
-    for ($i=1; $i<=30; $i++) {
-        $seconds = $i * 86400;
-        $thresholdmenu[$seconds] = get_string('numdays', '', $i);
-    }
-    $mform->addElement('select', 'expirythreshold', get_string("expirythreshold"), $thresholdmenu);
-    
-    
-    $mform->addElement('header','', get_string("groupmode"));
+        $choices = array();
+        if ($sitedefaultrole = get_record('role', 'id', $CFG->defaultcourseroleid)) {
+            $choices[0] = get_string('sitedefault').' ('.$sitedefaultrole->name.')';
+        } else {
+            $choices[0] = get_string('sitedefault');
+        }
+        $choices = $choices + $roles;
+        $mform->addElement('select', 'defaultrole', get_string('defaultrole', 'role'), $choices);
+        $mform->setDefault('defaultrole', 0);

-    $mform->setDefault('groupmode', $toform->groupmode);
-    unset($choices);
-    $choices[NOGROUPS] = get_string("groupsnone");
-    $choices[SEPARATEGROUPS] = get_string("groupsseparate");
-    $choices[VISIBLEGROUPS] = get_string("groupsvisible");
-    $mform->addElement('select', 'groupmode', get_string("groupmode"), $choices);
-    $mform->setDefault('groupmodeforce', $toform->groupmodeforce);
-    unset($choices);
-    $choices["0"] = get_string("no");
-    $choices["1"] = get_string("yes");
-    $mform->addElement('select', 'groupmodeforce', get_string("force"), $choices);
+//--------------------------------------------------------------------------------
+        $mform->addElement('header','enrolhdr', get_string('enrolments'));

-    $mform->addElement('header','', get_string("availability"));
+        $choices = array();
+        $modules = explode(',', $CFG->enrol_plugins_enabled);
+        foreach ($modules as $module) {
+            $name = get_string('enrolname', "enrol_$module");
+            $plugin = enrolment_factory::factory($module);
+            if (method_exists($plugin, 'print_entry')) {
+                $choices[$name] = $module;
+            }
+        }
+        asort($choices);
+        $choices = array_flip($choices);
+        $choices = array_merge(array('' => get_string('sitedefault').' ('.get_string('enrolname', "enrol_$CFG->enrol").')'), $choices);
+        $mform->addElement('select', 'enrol', get_string('enrolmentplugins'), $choices);
+        $mform->setHelpButton('enrol', array('courseenrolmentplugins', get_string('enrolmentplugins')), true);

-    $mform->setDefault('visible', $toform->visible);
-    unset($choices);
-    $choices["0"] = get_string("courseavailablenot");
-    $choices["1"] = get_string("courseavailable");
-    $mform->addElement('select', 'visible', get_string("availability"), $choices);
-    $mform->setDefault('password', $toform->password);
-    $mform->addElement('text', 'password', get_string("enrolmentkey"), 'size="25"');
-    $mform->setDefault('guest', $toform->guest);
-    unset($choices);
-    $choices["0"] = get_string("guestsno");
-    $choices["1"] = get_string("guestsyes");
-    $choices["2"] = get_string("guestskey");
-    $mform->addElement('select', 'guest', get_string("opentoguests"), $choices);
-    if (isset($course) && method_exists(enrolment_factory::factory($course->enrol), 'print_entry') && $course->enrol != 'manual') {
-        $mform->setDefault('cost', $toform->cost);
-        $mform->setDefault('currency', $toform->currency);
-        $costgroup=array();
-        $currencies = get_list_of_currencies();
-        $costgroup[]= &moodleform::createElement('text','cost', '', 'maxlength="6" size="6"');
-        $costgroup[]= &moodleform::createElement('select', 'currency', '', $currencies);
-        $mform->addGroup($costgroup, 'costgrp', get_string("cost"), '&nbsp;', false);
+        $radio = array();
+        $radio[] = &MoodleQuickForm::createElement('radio', 'enrollable', null, get_string('no'), 0);
+        $radio[] = &MoodleQuickForm::createElement('radio', 'enrollable', null, get_string('yes'), 1);
+        $radio[] = &MoodleQuickForm::createElement('radio', 'enrollable', null, get_string('enroldate'), 2);
+        $mform->addGroup($radio, 'enrollable', get_string('enrollable'), ' ', false);
+        $mform->setHelpButton('enrollable', array('courseenrollable', get_string('enrollable')), true);
+        $mform->setDefault('enrollable', 1);
+
+        $enroldatestartgrp = array();
+        $enroldatestartgrp[] = &MoodleQuickForm::createElement('date_selector', 'enrolstartdate');
+        $enroldatestartgrp[] = &MoodleQuickForm::createElement('checkbox', 'enrolstartdisabled', null, get_string('disable'));
+        $mform->addGroup($enroldatestartgrp, 'enrolstartdategrp', get_string('enrolstartdate'), ' ', false);
+        $mform->setDefault('enrolstartdate', 0);
+        $mform->setDefault('enrolstartdisabled', 1);
+        $mform->disabledIf('enrolstartdategrp', 'enrolstartdisabled', 'checked');
+
+        $enroldateendgrp = array();
+        $enroldateendgrp[] = &MoodleQuickForm::createElement('date_selector', 'enrolenddate');
+        $enroldateendgrp[] = &MoodleQuickForm::createElement('checkbox', 'enrolenddisabled', null, get_string('disable'));
+        $mform->addGroup($enroldateendgrp, 'enroldateendgrp', get_string('enrolenddate'), ' ', false);
+        $mform->setDefault('enrolenddate', 0);
+        $mform->setDefault('enrolenddisabled', 1);
+        $mform->disabledIf('enroldateendgrp', 'enrolenddisabled', 'checked');
+
+        $periodmenu=array();
+        $periodmenu[0] = get_string('unlimited');
+        for ($i=1; $i<=365; $i++) {
+            $seconds = $i * 86400;
+            $periodmenu[$seconds] = get_string('numdays', '', $i);
+        }
+        $mform->addElement('select', 'enrolperiod', get_string('enrolperiod'), $periodmenu);
+        $mform->setDefault('enrolperiod', 0);
+
+//--------------------------------------------------------------------------------
+        $mform->addElement('header','expirynotifyhdr', get_string('expirynotify'));
+
+        $choices = array();
+        $choices['0'] = get_string('no');
+        $choices['1'] = get_string('yes');
+        $mform->addElement('select', 'expirynotify', get_string('notify'), $choices);
+        $mform->setHelpButton('expirynotify', array('expirynotify', get_string('expirynotify')), true);
+        $mform->setDefault('expirynotify', 0);
+
+        $mform->addElement('select', 'notifystudents', get_string('expirynotifystudents'), $choices);
+        $mform->setHelpButton('notifystudents', array('expirynotifystudents', get_string('expirynotifystudents')), true);
+        $mform->setDefault('notifystudents', 0);
+
+        $thresholdmenu=array();
+        for ($i=1; $i<=30; $i++) {
+            $seconds = $i * 86400;
+            $thresholdmenu[$seconds] = get_string('numdays', '', $i);
+        }
+        $mform->addElement('select', 'expirythreshold', get_string('expirythreshold'), $thresholdmenu);
+        $mform->setHelpButton('expirythreshold', array('expirythreshold', get_string('expirythreshold')), true);
+        $mform->setDefault('expirythreshold', 10 * 86400);
+
+//--------------------------------------------------------------------------------
+        $mform->addElement('header','', get_string('groups', 'group'));
+
+        $choices = array();
+        $choices[NOGROUPS] = get_string('no');
+        $choices[SEPARATEGROUPS] = get_string('separate');
+        $choices[VISIBLEGROUPS] = get_string('visible');
+        $mform->addElement('select', 'groupmode', get_string('groupmode'), $choices);
+        $mform->setHelpButton('groupmode', array('groupmode', get_string('groupmode')), true);
+        $mform->setDefault('groupmode', 0);
+
+        $choices = array();
+        $choices['0'] = get_string('no');
+        $choices['1'] = get_string('yes');
+        $mform->addElement('select', 'groupmodeforce', get_string('force'), $choices);
+        $mform->setHelpButton('groupmodeforce', array('groupmodeforce', get_string('groupmodeforce')), true);
+        $mform->setDefault('groupmodeforce', 0);
+
+//--------------------------------------------------------------------------------
+        $mform->addElement('header','', get_string('availability'));
+
+        $choices = array();
+        $choices['0'] = get_string('courseavailablenot');
+        $choices['1'] = get_string('courseavailable');
+        $mform->addElement('select', 'visible', get_string('availability'), $choices);
+        $mform->setHelpButton('visible', array('courseavailability', get_string('availability')), true);
+        $mform->setDefault('visible', 1);
+
+        $mform->addElement('text', 'password', get_string('enrolmentkey'), 'size="25"');
+        $mform->setHelpButton('password', array('enrolmentkey', get_string('enrolmentkey')), true);
+        $mform->setDefault('password', '');
+        $mform->setType('password', PARAM_RAW);
+
+        $choices = array();
+        $choices['0'] = get_string('guestsno');
+        $choices['1'] = get_string('guestsyes');
+        $choices['2'] = get_string('guestskey');
+        $mform->addElement('select', 'guest', get_string('opentoguests'), $choices);
+        $mform->setHelpButton('guest', array('guestaccess', get_string('opentoguests')), true);
+        $mform->setDefault('guest', 0);
+
+        if (!empty($course) && method_exists(enrolment_factory::factory($course->enrol), 'print_entry') && $course->enrol != 'manual') {
+            $costgroup=array();
+            $currencies = get_list_of_currencies();
+            $costgroup[]= &MoodleQuickForm::createElement('text','cost', '', 'maxlength="6" size="6"');
+            $costgroup[]= &MoodleQuickForm::createElement('select', 'currency', '', $currencies);
+            $mform->addGroup($costgroup, 'costgrp', get_string('cost'), '&nbsp;', false);
+            //defining a rule for a form element within a group :
+            $costgrprules=array();
+            //set the message to null to tell Moodle to use a default message
+            //available for most rules, fetched from language pack (err_{rulename}).
+            $costgrprules['cost'][]=array(null, 'numeric', null, 'client');
+            $mform->addGroupRule('costgrp',$costgrprules);
+            $mform->setHelpButton('costgrp', array('cost', get_string('cost')), true);
+            $mform->setDefault('cost', '');
+            $mform->setDefault('currency', empty($CFG->enrol_currency) ? 'USD' : $CFG->enrol_currency);
+
+        }
+
+//--------------------------------------------------------------------------------
+        $mform->addElement('header','', get_string('language'));
+
+        $languages=array();
+        $languages[''] = get_string('forceno');
+        $languages += get_list_of_languages();
+        $mform->addElement('select', 'lang', get_string('forcelanguage'), $languages);
+
+//--------------------------------------------------------------------------------
+        if (has_capability('moodle/site:config', $systemcontext) && ((!empty($course->requested) && $CFG->restrictmodulesfor == 'requested') || $CFG->restrictmodulesfor == 'all')) {
+            $mform->addElement('header', '', get_string('restrictmodules'));
+
+            $options = array();
+            $options['0'] = get_string('no');
+            $options['1'] = get_string('yes');
+            $mform->addElement('select', 'restrictmodules', get_string('restrictmodules'), $options);
+            $mods = array(0=>get_string('allownone'));
+            $mods += get_records_menu('modules', '','','','id, name');
+
+
+            $mform->addElement('select', 'allowedmods', get_string('to'), $mods,
+                            array('multiple'=>'multiple', 'size'=>'10'));
+            $mform->disabledIf('allowedmods', 'restrictmodules', 'eq', 0);
+        } else {
+            $mform->addElement('hidden', 'restrictmodules', null);
+        }
+        if ($CFG->restrictmodulesfor == 'all') {
+            $mform->setDefault('allowedmods', explode(',',$CFG->defaultallowedmodules));
+            if (!empty($CFG->restrictbydefault)) {
+                $mform->setDefault('restrictmodules', 1);
+            }
+        }
+        $mform->setType('restrictmodules', PARAM_INT);
+
+//--------------------------------------------------------------------------------
+        $this->add_action_buttons();
+//--------------------------------------------------------------------------------
+        $mform->addElement('hidden', 'id', null);
+        $mform->setType('id', PARAM_INT);
+
+        // fill in default teacher and student names to keep backwards compatibility for a while
+        $mform->addElement('hidden', 'teacher', get_string('defaultcourseteacher'));
+        $mform->addElement('hidden', 'teachers', get_string('defaultcourseteachers'));
+        $mform->addElement('hidden', 'student', get_string('defaultcoursestudent'));
+        $mform->addElement('hidden', 'students', get_string('defaultcoursestudents'));
    }

-    $mform->addElement('header','', get_string("language"));
-    $mform->setDefault('lang',(isset($toform->lang))?$toform->lang:'');
-    $languages=array();
-    $languages[''] = get_string("forceno");
-    $languages += get_list_of_languages();
-    $mform->addElement('select', 'lang', get_string("forcelanguage"), $languages);

-    if(!has_capability('moodle/course:create', get_context_instance(CONTEXT_COURSECAT, $toform->category))) { 
-        $mform->addElement('hidden', 'category', null);
-    }
-    $mform->addElement('hidden', 'id', null);
-   
-    $mform->setDefault('restrictmodules',(isset($toform->restrictmodules))?$toform->restrictmodules:0);
-    if (has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID)) && ((!empty($course->requested) && $CFG->restrictmodulesfor == 'requested') || $CFG->restrictmodulesfor == 'all')) {         
-        unset($options);
-        $options[0] = get_string("no");
-        $options[1] = get_string("yes");
-        $mform->addElement('header', '', get_string("restrictmodules"));
-        $mform->addElement('select', 'restrictmodules', get_string("restrictmodules"), $options,
-                array('onChange'=>"document.getElementById('id_allowedmods').disabled=".
-                            "((this.selectedIndex==0)?true:false);"));
-        $mods = array(0=>get_string('allownone'));
-        $mods += get_records_menu("modules", '','','','id, name');
-        $disabled=($mform->exportValue('restrictmodules')==1) ? array() :array('disabled' => 'disabled') ;
-        
-        
-        $mform->setDefault('allowedmods', $toform->allowedmods);
-        $mform->addElement('select', 'allowedmods', get_string("to"),$mods,
-                        array('multiple'=>"multiple", 'size'=>"10", 'id'=>"allowedmods")
-                                +$disabled);
-    }else {
-        $mform->addElement('hidden', 'restrictmodules', $toform->restrictmodules);
-    }
-    $mform->setHelpButtons(array('category'=>array("coursecategory", get_string("category")),
-                             'fullname'=>array("coursefullname", get_string("fullname")),
-                             'shortname'=>array("courseshortname", get_string("shortname")),
-                             'idnumber'=>array("courseidnumber", get_string("idnumbercourse")),
-                             'summary'=>array("text", get_string("helptext")),
-                             'format'=>array("courseformats", get_string("courseformats")),
-                             'summary'=>array("coursestartdate", get_string("startdate")),
-                             'enrol'=>array("courseenrolmentplugins", get_string("enrolmentplugins")),
-                             'enrollable'=>array("courseenrollable", get_string("enrollable")),
-                             'expirynotify'=>array("expirynotify", get_string("expirynotify")),
-                             'notifystudents'=>array("expirynotifystudents", get_string("expirynotifystudents")),
-                             'expirythreshold'=>array("expirythreshold", get_string("expirythreshold")),
-                             'groupmode'=>array("groupmode", get_string("groupmode")),
-                             'groupmodeforce'=>array("groupmodeforce", get_string("groupmodeforce")),
-                             'visible'=>array("courseavailability", get_string("availability")),
-                             'password'=>array("enrolmentkey", get_string("enrolmentkey")),
-                             'guest'=>array("guestaccess", get_string("opentoguests")),
-                             'costgrp'=>array("cost", get_string("cost")),
-                             'hiddensections'=>array("coursehiddensections", get_string("hiddensections")),
-                             'newsitems'=>array("coursenewsitems", get_string("newsitemsnumber")),
-                             'showgrades'=>array("coursegrades", get_string("grades")),
-                             'showreports'=>array("coursereports", get_string("activityreport")),
-                             'maxbytes'=>array("courseuploadsize", get_string("maximumupload")),
-                             'metacourse'=>array("metacourse", get_string("metacourse")),
-                             'defaultrole'=>array("coursedefaultrole", get_string("defaultrole", 'role'))),
-                                    true);
-    $mform->addElement('submit', 'submit', get_string("savechanges"));
-    
-    $mform->addRule('fullname', get_string("missingfullname"), 'required', null, 'client');
-    $mform->addRule('shortname', get_string("missingshortname"), 'required', null, 'client');
-    $mform->addRule('summary', get_string("missingsummary"), 'required', null, 'client');
-    $mform->addRule('category', get_string("missingcategory"), 'required', null, 'client');
-    
-    /**
-     * a Form rule check - if we need to create rules which involve the contents of more than one 
-     * field this is the way to do it. We can do it all at once in one function or create several
-     * form rules.
-     *
-     * @param array $fields values from form without slashes
-     * @return mixed array of errors or true if passed check
-     */
-    function form_check($fields){
-        global $course;
+/// perform some extra moodle validation
+    function validation($data){
        $errors= array();
-        if ($foundcourses = get_records("course", "shortname", addslashes($fields['shortname']))) {
-            if (!empty($course->id)) {
-                unset($foundcourses[$course->id]);
+        if ($foundcourses = get_records('course', 'shortname', $data['shortname'])) {
+            if (!empty($data['id'])) {
+                unset($foundcourses[$data['id']]);
            }
            if (!empty($foundcourses)) {
                foreach ($foundcourses as $foundcourse) {
                    $foundcoursenames[] = $foundcourse->fullname;
                }
-                $foundcoursenamestring = addslashes(implode(',', $foundcoursenames));
-        
-                $errors['shortname']= get_string("shortnametaken", "", $foundcoursenamestring);
-                
-            }
-            
-            
-        }
-        if (empty($fields['enrolenddisabled'])){
-            $enrolenddate=make_timestamp($fields['enrolenddate']['year'],
-                                        $fields['enrolenddate']['month'],
-                                        $fields['enrolenddate']['day']);
-            $enrolstartdate=make_timestamp($fields['enrolstartdate']['year'],
-                                        $fields['enrolstartdate']['month'],
-                                        $fields['enrolstartdate']['day']);
-            if ($enrolenddate <= $enrolstartdate){
-                $errors['enroldateendgrp']=get_string("enrolenddaterror");
+                $foundcoursenamestring = implode(',', $foundcoursenames);
+                $errors['shortname']= get_string('shortnametaken', '', $foundcoursenamestring);
            }
        }
-        if (0==count($errors)){    
+
+        if (empty($data['enrolenddisabled'])){
+            if ($data['enrolenddate'] <= $data['enrolstartdate']){
+                $errors['enroldateendgrp'] = get_string('enrolenddaterror');
+            }
+        }
+
+        if (0 == count($errors)){
            return true;
-        }else {
+        } else {
            return $errors;
        }
    }
-    $mform->addFormRule('form_check');
-
-    $renderer =& $mform->defaultRenderer();
-    $renderer->addStopFieldsetElements('submit');
-?>
+}
+?>
@@ -238,17 +238,19 @@ while ($section <= $course->numsections) {

        $currenttopic = ($course->marker == $section);

+        $currenttext = '';
        if (!$thissection->visible) {
            $sectionstyle = ' hidden';
        } else if ($currenttopic) {
            $sectionstyle = ' current';
+            $currenttext = get_accesshide(get_string('currenttopic','access'));
        } else {
            $sectionstyle = '';
        }

        echo '<tr id="section-'.$section.'" class="section main'.$sectionstyle.'">';

-        echo '<td class="left side">&nbsp;</td>';
+        echo '<td class="left side">&nbsp;'.$currenttext.'</td>';

        echo '<td class="content">';
        if (!has_capability('moodle/course:viewhiddensections', $context) and !$thissection->visible) {   // Hidden for students
@@ -171,16 +171,18 @@

            $currenttopic = ($course->marker == $section);

+            $currenttext = '';
            if (!$thissection->visible) {
                $sectionstyle = ' hidden';
            } else if ($currenttopic) {
                $sectionstyle = ' current';
+                $currenttext = get_accesshide(get_string('currenttopic','access'));
            } else {
                $sectionstyle = '';
            }

            echo '<tr id="section-'.$section.'" class="section main'.$sectionstyle.'">';
-            echo '<td class="left side">'.$section.'</td>';
+            echo '<td class="left side">'.$currenttext.$section.'</td>';

            echo '<td class="content">';
            if (!has_capability('moodle/course:viewhiddensections', $context) and !$thissection->visible) {   // Hidden for students
@@ -13,9 +13,9 @@
    define('BLOCK_R_MIN_WIDTH', 100);
    define('BLOCK_R_MAX_WIDTH', 210);

-    $preferred_width_left  = bounded_number(BLOCK_L_MIN_WIDTH, blocks_preferred_width($pageblocks[BLOCK_POS_LEFT]),  
+    $preferred_width_left  = bounded_number(BLOCK_L_MIN_WIDTH, blocks_preferred_width($pageblocks[BLOCK_POS_LEFT]),
                                            BLOCK_L_MAX_WIDTH);
-    $preferred_width_right = bounded_number(BLOCK_R_MIN_WIDTH, blocks_preferred_width($pageblocks[BLOCK_POS_RIGHT]), 
+    $preferred_width_right = bounded_number(BLOCK_R_MIN_WIDTH, blocks_preferred_width($pageblocks[BLOCK_POS_RIGHT]),
                                            BLOCK_R_MAX_WIDTH);

    if ($week != -1) {
@@ -88,7 +88,7 @@
        echo '<tr id="section-0" class="section main">';
        echo '<td class="left side">&nbsp;</td>';
        echo '<td class="content">';
-        
+
        echo '<div class="summary">';
        $summaryformatoptions->noclean = true;
        echo format_text($thissection->summary, FORMAT_HTML, $summaryformatoptions);
@@ -99,7 +99,7 @@
                 'class="icon edit" alt="'.$streditsummary.'" /></a><br /><br />';
        }
        echo '</div>';
-        
+
        print_section($course, $thissection, $mods, $modnamesused);

        if (isediting($course->id)) {
@@ -162,28 +162,20 @@

            $currentweek = (($weekdate <= $timenow) && ($timenow < $nextweekdate));

+            $currenttext = '';
            if (!$thissection->visible) {
                $sectionstyle = ' hidden';
            } else if ($currentweek) {
                $sectionstyle = ' current';
+                $currenttext = get_accesshide(get_string('currentweek','access'));
            } else {
                $sectionstyle = '';
            }

            echo '<tr id="section-'.$section.'" class="section main'.$sectionstyle.'">';
-            echo '<td class="left side">&nbsp;</td>';
-
-
-            if (ajaxenabled() && $editing) {
-                // Temporarily hide the dates for the weeks. We do it this way
-                // for now. Eventually, we'll have to modify the javascript code
-                // to handle re-calculation of dates when sections are moved
-                // around. For now, just hide all the dates to avoid confusion.
-                $weekperiod = '';
-            } else {
-                $weekperiod = $weekday.' '.$endweekday;
-            }
+            echo '<td class="left side">&nbsp;'.$currenttext.'</td>';

+            $weekperiod = $weekday.' - '.$endweekday;

            echo '<td class="content">';
            if (!has_capability('moodle/course:viewhiddensections', $context) and !$thissection->visible) {   // Hidden for students
@@ -267,4 +259,4 @@

    echo '</tr></table>';

-?>
+?>
@@ -190,10 +190,12 @@

            $currentweek = (($weekdate <= $timenow) && ($timenow < $nextweekdate));

+            $currenttext = '';
            if (!$thissection->visible) {
                $sectionstyle = ' hidden';
            } else if ($currentweek) {
                $sectionstyle = ' current';
+                $currenttext = get_accesshide(get_string('currentweek','access'));
            } else {
                $sectionstyle = '';
            }
@@ -201,7 +203,7 @@
            echo '<li id="section-'.$section.'" class="section main'.$sectionstyle.'" >'; //'<div class="left side">&nbsp;</div>';

            // Note, 'right side' is BEFORE content.
-            echo '<div class="right side">';
+            echo '<div class="right side">'.$currenttext;
            
            if ($displaysection == $section) {
                echo '<a href="view.php?id='.$course->id.'&amp;week=0#section-'.$section.'" title="'.$strshowallweeks.'">'.
@@ -212,4 +212,3 @@ function my_file_get_contents($filename, $use_include_path = 0) {
 }

 ?>
-
@@ -64,7 +64,9 @@
            print_single_button("request.php", NULL, get_string("courserequest"), "get");
        }
        if (has_capability('moodle/course:create', get_context_instance(CONTEXT_SYSTEM, SITEID))) {       // Print link to create a new course
-            print_single_button("edit.php", NULL, get_string("addnewcourse"), "get");
+        /// Get the 1st available category
+            $options = array('category' => get_field('course_categories', 'id', 'parent', '0'));
+            print_single_button('edit.php', $options, get_string('addnewcourse'), 'get');
        }
        if (has_capability('moodle/site:approvecourse', get_context_instance(CONTEXT_SYSTEM, SITEID))  and !empty($CFG->enablecourserequests)) {
            print_single_button('pending.php',NULL, get_string('coursespending'),"get");
@@ -43,24 +43,28 @@
    }


-    if ($teachers = get_course_teachers($course->id)) {
-        echo "<table align=\"center\"><tr><td nowrap=\"nowrap\">";
-        echo "<p><font size=\"1\">\n";
-        foreach ($teachers as $teacher) {
-            if ($teacher->authority > 0) {
-                if (!$teacher->role) {
-                    $teacher->role = $course->teacher;
+    /// first find all roles that are supposed to be displayed
+    if (!empty($CFG->coursemanager)) {
+        $coursemanagerroles = split(',', $CFG->coursemanager);
+        $context = get_context_instance(CONTEXT_COURSE, $course->id);
+        foreach ($coursemanagerroles as $roleid) {
+            $role = get_record('role','id',$roleid);
+            if ($users = get_role_users($roleid, $context, true, '', 'u.lastname ASC', true)) {
+                foreach ($users as $teacher) {
+                    $fullname = fullname($teacher, has_capability('moodle/site:viewfullnames', $context)); 
+                    $namesarray[] = format_string($role->name).': <a href="'.$CFG->wwwroot.'/user/view.php?id='.
+                                    $teacher->id.'&amp;course='.SITEID.'">'.$fullname.'</a>';
                }
-                echo "$teacher->role: ";
-                link_to_popup_window ("/user/view.php?id=$teacher->id&amp;course=$site->id", "opener", 
-                                      fullname($teacher), 400, 500, "$teacher->role", 
-                                      "");
-                echo "<br />";
-            }
+            }          
+        }
+        
+        if (!empty($namesarray)) {
+            echo "<div align=\"center\">";
+            echo implode('<br />', $namesarray);
+            echo "</div>";
        }
-        echo "</font></p>";
-        echo "</td</tr></table>";
    }
+
    echo "<br />";

    print_simple_box_start("center", "100%");
@@ -77,4 +81,3 @@
    close_window_button();

 ?>
-
@@ -241,19 +241,50 @@ function make_log_url($module, $url) {
        case 'message':
        case 'calendar':
        case 'blog':
-            return "/$module/$url";
+            if (strpos($url, '../') === 0) {
+                $url = ltrim($url, '.');
+            } else {
+                $url = "/course/$url";
+            }
+            break;
+            $url = "/$module/$url";
            break;
        case 'upload':
-            return $url;
+            $url = $url;
            break;
        case 'library':
        case '':
-            return '/';
+            $url = '/';
            break;
        default:
-            return "/mod/$module/$url";
+            $url = "/mod/$module/$url";
            break;
    }
+
+    //now let's sanitise urls - there might be some ugly nasties:-(
+    $parts = explode('?', $url);
+    $script = array_shift($parts);
+    if (strpos($script, 'http') === 0) {
+        $script = clean_param($script, PARAM_URL);
+    } else {
+        $script = clean_param($script, PARAM_PATH);
+    }
+
+    $query = '';
+    if ($parts) {
+        $query = implode('', $parts);
+        $query = str_replace('&amp;', '&', $query); // both & and &amp; are stored in db :-|
+        $parts = explode('&', $query);
+        $eq = urlencode('=');
+        foreach ($parts as $key=>$part) {
+            $part = urlencode(urldecode($part));
+            $part = str_replace($eq, '=', $part);
+            $parts[$key] = $part;
+        }
+        $query = '?'.implode('&amp;', $parts);
+    }
+
+    return $script.$query;
 }


@@ -415,10 +446,6 @@ function print_log($course, $user=0, $date=0, $order="l.time ASC", $page=0, $per
        //Filter log->info 
        $log->info = format_string($log->info);

-        $log->url  = strip_tags(urldecode($log->url));   // Some XSS protection
-        $log->info = strip_tags(urldecode($log->info));  // Some XSS protection
-        $log->url  = str_replace('&', '&amp;', $log->url); /// XHTML compatibility
-
        echo '<tr class="r'.$row.'">';
        if ($course->id == SITEID) {
            echo "<td class=\"r$row c0\" nowrap=\"nowrap\">\n";
@@ -506,10 +533,7 @@ function print_log_csv($course, $user, $date, $order='l.time DESC', $modname,

        //Filter log->info 
        $log->info = format_string($log->info);
-
-        $log->url  = strip_tags(urldecode($log->url));     // Some XSS protection
        $log->info = strip_tags(urldecode($log->info));    // Some XSS protection
-        $log->url  = str_replace('&', '&amp;', $log->url); // XHTML compatibility

        $firstField = $courses[$log->course];
        $fullname = fullname($log, has_capability('moodle/site:viewfullnames', get_context_instance(CONTEXT_COURSE, $course->id)));
@@ -710,10 +734,7 @@ function print_log_ooo($course, $user, $date, $order='l.time DESC', $modname,

        // Filter log->info 
        $log->info = format_string($log->info);
-
-        $log->url  = strip_tags(urldecode($log->url));     // Some XSS protection
        $log->info = strip_tags(urldecode($log->info));    // Some XSS protection
-        $log->url  = str_replace('&', '&amp;', $log->url); // XHTML compatibility

        $firstField = $courses[$log->course];
        $fullname = fullname($log, has_capability('moodle/site:viewfullnames', get_context_instance(CONTEXT_COURSE, $course->id)));
@@ -1551,8 +1572,8 @@ function print_course($course, $width="100%") {
         $course->fullname.'</a></b><br />';

    /// first find all roles that are supposed to be displayed
-    if ($managerroles = get_config('', 'coursemanager')) {
-        $coursemanagerroles = split(',', $managerroles->value);
+    if (!empty($CFG->coursemanager)) {
+        $coursemanagerroles = split(',', $CFG->coursemanager);
        foreach ($coursemanagerroles as $roleid) {
            $role = get_record('role','id',$roleid);
            if ($users = get_role_users($roleid, $context, true, '', 'u.lastname ASC', true)) {
@@ -1764,7 +1785,7 @@ function delete_course_module($id) {
    $modulename = get_field('modules', 'name', 'id', $cm->module);
    if ($events = get_records_select('event', "instance = '$cm->instance' AND modulename = '$modulename'")) {
        foreach($events as $event) {
-            delete_event($event);
+            delete_event($event->id);
        }
    }
    return delete_records('course_modules', 'id', $cm->id);
@@ -2163,7 +2184,7 @@ function move_courses ($courseids, $categoryid) {
                    // figure out a sortorder that we can use in the destination category
                    $sortorder = get_field_sql('SELECT MIN(sortorder)-1 AS min
                                                    FROM ' . $CFG->prefix . 'course WHERE category=' . $categoryid);
-                    if ($sortorder === false) {
+                    if (is_null($sortorder) || $sortorder === false) {
                        // the category is empty
                        // rather than let the db default to 0
                        // set it to > 100 and avoid extra work in fix_coursesortorder()                        
@@ -2225,4 +2246,4 @@ function can_delete_course($courseid) {



-?>
+?>
@@ -126,4 +126,3 @@ function print_outline_row($mod, $instance, $result) {
 }

 ?>
-
@@ -103,6 +103,16 @@
                $times[$stat->timeend] = userdate($stat->timeend,get_string('strftimedate'),$CFG->timezone);
            }
        }
+        foreach (array_keys($times) as $t) {
+            foreach ($data as $roleid => $stuff) {
+                if (!array_key_exists($t, $stuff)) {
+                    $data[$roleid][$t] = 0;
+                }
+            }
+        }
+        foreach ($data as $role => $stuff) {
+            ksort($data[$role]);
+        }
        $nonzeroroleid = 0;
        foreach (array_keys($data) as $roleid) {
            if ($roleid == 0) {
@@ -167,6 +167,13 @@
                            $rolesdata[$roleid] = 0;
                        }
                    }
+                    else {
+                        foreach (array_keys($roles) as $r) {
+                            if (!array_key_exists($r, $rolesdata)) {
+                                $rolesdata[$r] = 0;
+                            }
+                        }
+                    }
                    krsort($rolesdata); 
                    $row = array_merge(array($times[$time]),$rolesdata);
                    if (empty($CFG->loglifetime) || ($stat->timeend-(60*60*24)) >= (time()-60*60*24*$CFG->loglifetime)) {
@@ -263,4 +263,3 @@


 ?>
-
@@ -285,4 +285,3 @@ function print_outline_row($mod, $instance, $result) {
 }

 ?>
-
@@ -1,20 +0,0 @@
-Moodle - Modular Object-Oriented Dynamic Learning Environment
-http://moodle.org
-
-Copyright (C) 1999-2004  Martin Dougiamas  martin@dougiamas.com
-http://dougiamas.com
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-                
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
@@ -1,38 +0,0 @@
-<?PHP  // $Id$
-
-    require("../config.php");
-
-    if (! $info = document_file("files.php", false)) {
-        error("404 - File Not Found");
-    }
-
-    $string = array();
-    if ($CFG->forcelogin) {
-        require_login();
-    }
-
-    include($info->filepath);
-
-    print_header();
-
-    $ulopen = false;
-
-    foreach ($string as $file => $filename) {
-        if (substr($file,0,1) == "-") {
-            if($ulopen) {
-                echo '</ul>';
-            }
-            echo '<h1>'.$filename.'</h1><ul>';
-            $ulopen = true;
-        } else {
-            echo '<li><a target="main" href="'.$CFG->wwwroot.'/doc/?file='.$file.'">'.$filename.'</a></li>';
-        }
-    }
-    if($ulopen) {
-        echo '</ul>';
-    }
-
-    // Sloppy way to produce valid markup... there should be a print_footer_minimal().
-    echo '</div></div></body></html>';
-    
-?>
@@ -1,131 +0,0 @@
-body, td, th, li {
-    font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
-}
-
-th {
-    font-weight: bold; 
-}
-
-a:link {
-    text-decoration: none; 
-    color: blue;
-}
-
-a:visited {
-    text-decoration: none; 
-    color: blue;
-}
-
-a:hover {
-    text-decoration: underline; 
-    color: red;
-}
-
-form { 
-    margin-bottom: 0;
-}
-
-
-li {
-    margin-bottom: 10px;
-
-}
-
-.question {
-    font-size: medium;
-    font-weight: bold;
-    font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
-    border: 1px dotted;
-    padding: 10px;
-    background-color: #EEEEEE;
-}
-
-.answer {
-    font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
-    font-size: medium;
-    border: none;
-    padding-left: 40px;
-}
-
-.normaltext {
-    font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
-    font-size: medium;
-    border: none;
-    margin-left: 30px;
-
-}
-
-.answercode {
-    font-family: "Courier New", Courier, mono;
-    font-size: small;
-    border: none;
-    padding-left: 60px;
-}
-
-.questionlink {
-    font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
-    font-size: medium;
-    border: none;
-    padding-left: 40px;
-}
-
-.examplecode {
-    font-family: "Courier New", Courier, mono;
-    font-size: small;
-    border: thin dashed #999999;
-    background-color: #FBFBFB;
-    margin: auto;
-    padding: 30px;
-    height: auto;
-    width: auto;
-}
-h1 {
-    font-weight: bold;
-    color: #000000;
-    background-color: #CCCCCC;
-    padding: 5px;
-    font-size: large;
-    border-width: 1px;
-    border-color: #CCCCCC;
-    -moz-border-radius: 10px;
-}
-h2 {
-    font-weight: bold;
-    color: #FFFFFF;
-    background-color: #666666;
-    padding: 5px;
-    font-size: medium;
-    border-width: 1px;
-    border-color: #666666;
-    -moz-border-radius: 10px;
-}
-h3 {
-    font-weight: normal;
-    color: #FFFFFF;
-    background-color: #666666;
-    padding: 5px;
-    font-size: medium;
-    -moz-border-radius: 10px;
-}
-.spaced {
-
-    margin-bottom: 30px;
-}
-
-ul {
-    margin-top: 10px;
-
-}
-.commandline {
-    font-family: "Courier New", Courier, mono;
-    font-size: x-small;
-    background-color: #FBFBFB;
-    margin: auto auto 20px 30px;
-    padding: 5px;
-    width: compact;
-    font-weight: bold;
-    border: 1px solid #999999;
-    white-space: nowrap;
-    clear: both;
-    float: none;
-}
@@ -1,54 +0,0 @@
-<?PHP  // $Id$
-
-    require("../config.php");
-
-    $file  = optional_param('file', "", PARAM_FILE);  // docs file to view straight
-    $frame = optional_param('frame', "", PARAM_FILE); // docs file to view in frame
-    $sub   = optional_param('sub', "", PARAM_CLEAN);  // sub-section (named anchor)
-
-    if ($CFG->forcelogin) {
-        require_login();
-    }
-
-    if (!empty($sub)) {
-        $sub = '#'.s($sub);
-    } else {
-        $sub = "";
-    }
-
-    if (empty($file)) {
-        $include = false;
-        if (empty($frame)) {
-            $file = "intro.html";
-        } else {
-            $file = $frame;
-        }
-    } else {
-        $include = true;
-    }
-
-    if (! document_file($file, $include)) {
-        error("Error 404 - File Not Found");
-    }
-
-    if ($include) {
-        exit;
-    }
-
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" 
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <title><?php print_string("documentation")?></title>
-    <meta http-equiv="Content-Type" content="text/html; charset=<?php echo current_charset(); ?>" />
-</head>
-
-<frameset rows="70,*">
-    <frame name="top" src="top.php" />
-    <frameset cols="200,*">
-        <frame name="contents" src="contents.php" />
-        <frame name="main" src="index.php?file=<?php echo "$file$sub"; ?>" />
-    </frameset>
-</frameset>
-</html>
@@ -1,421 +0,0 @@
-<head>
-    
-<title>Moodle Docs: Installation</title>
-  
-<link rel="stylesheet" href="docstyles.css" type="TEXT/CSS">
-    
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<body bgcolor="#FFFFFF">
-<h1>Installing Moodle</h1>
-<blockquote>
-  <p>This guide explains how to install Moodle for the first time.  It goes into some detail
-   about some of the steps, in order to cover the wide variety of small differences between
-   web server setups, so this document may look long and complicated.  Don't be put off by this 
-   - I usually set Moodle up in a few minutes!</p>
-  <p>Take your time and work through this document carefully - it will save you time later on.</p>
-  <p>Sections in this document:</p>
-  <ol>
-    <li><a href="#requirements">Requirements</a></li>
-    <li><a href="#downloading">Download</a></li>
-    <li><a href="#site">Site structure</a></li>
-    <li><a href="#data">Create a data directory</a></li>
-    <li><a href="#database">Create a database</a></li>
-    <li><a href="#webserver">Check web server settings</a></li>
-    <li><a href="#config">Edit config.php</a></li>
-    <li><a href="#admin">Go to the admin page</a></li>
-    <li><a href="#cron">Set up cron</a></li>
-    <li><a href="#course">Create a new course</a></li>
-  </ol>
-  <p>&nbsp;</p>
-</blockquote>
-<h3 class="sectionheading"><a name="requirements"></a>1. Requirements</h3>
-<blockquote> 
-  <p>Moodle is primarily developed in Linux using Apache, MySQL and PHP (also 
-    sometimes known as the LAMP platform), but is also regularly tested with PostgreSQL 
-    and on Windows XP, Mac OS X and Netware 6 operating systems</p>
-  <p>The requirements for Moodle are as follows:</p>
-  <ol>
-    <li>Web server software. Most people use <a href="http://www.apache.org/" target="_blank">Apache</a>, 
-      but Moodle should work fine under any web server that supports PHP, such 
-      as IIS on Windows platforms.</li>
-    <li><a href="http://www.php.net/" target="_blank">PHP</a> scripting language (version 4.1.0 
-      or later), with the following settings: 
-      <ul>
-        <li><a href="http://www.boutell.com/gd/" target="_blank">GD library</a> 
-          turned ON, with support for JPG and PNG formats</li>
-        <li>zlib library turned ON (if you want to use backup/restore on Windows)</li>
-        <li>Sessions support turned ON</li>
-        <li>File uploading turned ON</li>
-        <li>Safe Mode must be turned OFF (see the forums on moodle.org for problems 
-          caused by Safe Mode)</li>
-      </ul>
-    </li>
-    <li>a working database server: <a href="http://www.mysql.com/" target="_blank">MySQL</a> 
-      or <a href="http://www.postgresql.org/" target="_blank">PostgreSQL</a> are 
-      completely supported and recommended for use with Moodle 1.1. All other 
-      databases will be supported fully in the next release.</li>
-  </ol>
-  <p>Most web hosts support all of this by default. If you are signed up with 
-    one of the few webhosts that does not support these features ask them why, 
-    and consider taking your business elsewhere.</p>
-  <p>If you want to run Moodle on your own computer and all this looks a bit daunting, 
-    then please see our guide: <a href="http://moodle.org/doc/?file=installamp.html">Installing 
-    Apache, MySQL and PHP</a>. It provides some step-by-step instructions to install 
-    all this on most popular platforms.</p>
-  <p>&nbsp;</p>
-</blockquote>
-<h3 class="sectionheading"><a name="downloading"></a>2. Download</h3>
-<blockquote>
-  <p>There are two ways to get Moodle, as a compressed package and via CVS. These 
-    are explained in detail on the download page: <a href="http://moodle.org/download/" target="_blank">http://moodle.org/download/</a></p>
-  <p>After downloading and unpacking the archive, or checking out the files via 
-    CVS, you will be left with a directory called &quot;moodle&quot;, containing 
-    a number of files and folders. </p>
-  <p>You can either place the whole folder in your web server documents directory, 
-    in which case the site will be located at <b>http://yourwebserver.com/moodle</b>, 
-    or you can copy all the contents straight into the main web server documents 
-    directory, in which case the site will be simply <b>http://yourwebserver.com</b>.</p>
-</blockquote>
-<p>&nbsp;</p>
-<h3 class="sectionheading"><a name="site"></a>3. Site structure</h3>
-<blockquote>
-  <p>Here is a quick summary of the contents of the Moodle folder, to help get 
-    you oriented:</p>
-  <blockquote>
-    <p>config.php - the ONLY file you need to edit to get started<br />
-      version.php - defines the current version of Moodle code<br />
-      index.php - the front page of the site</p>
-    <ul>
-      <li>admin/ - code to administrate the whole server </li>
-      <li>auth/ - plugin modules to authenticate users  </li>
-      <li>course/ - code to display and manage courses </li>
-      <li>doc/ - help documentation for Moodle (eg this page)</li>
-      <li>files/ - code to display and manage uploaded files</li>
-      <li>lang/ - texts in different languages, one directory per language </li>
-      <li>lib/ - libraries of core Moodle code </li>
-      <li>login/ - code to handle login and account creation </li>
-      <li>mod/ - all Moodle course modules</li>
-      <li>pix/ - generic site graphics</li>
-      <li>theme/ - theme packs/skins to change the look of the site.</li>
-      <li>user/ - code to display and manage users</li>
-    </ul>
-    <p>&nbsp;</p>
-  </blockquote>
-</blockquote>
-<h3 class="sectionheading"><a name="data"></a>4. Create a data directory</h3>
-<blockquote>
-  <p>Moodle will also need some space on your hard disk to store uploaded files, 
-    such as course documents and user pictures.</p>
-  <p>Create a directory for this purpose somewhere.  For security, it's best that 
-     this directory is NOT accessible directly via the web.  The easiest way to do this
-     is to simply locate it OUTSIDE the web directory, otherwise protect it 
-     by creating a file in the data directory called .htaccess, containing this line:
-  <blockquote>
-     
-    <pre>deny from all<br />AllowOverride None</pre>
-  </blockquote>
-  <p>To make sure that Moodle can save uploaded files in this directory, check that 
-     the web server software (eg Apache) has permission to write 
-    to this directory. On Unix machines, this means setting the owner of the directory 
-    to be something like &quot;nobody&quot; or &quot;apache&quot;.</p>
-  <p>On many shared hosting servers, you will probably need to restrict all file access 
-     to your "group" (to prevent other webhost customers from looking at or changing your files), 
-     but provide full read/write access to everyone else (which will allow the web server
-     to access your files).  Speak to your server administrator if you are having 
-     trouble setting this up securely.</p>
-</blockquote>
-<p>&nbsp;</p>
-<h3 class="sectionheading"><a name="database"></a>5. Create a database</h3>
-<blockquote>
-  <p>You need to create an empty database (eg "moodle") in your database system 
-    along with a special user (eg "moodleuser") that has access to that database 
-    (and that database only). You could use the "root" user if you wanted to, but 
-    this is not recommended for a production system: if hackers manage to discover
-    the password then your whole database system would be at risk, rather than 
-    just one database.
-</p>
-  <p>Example command lines for MySQL: </p>
-  <pre>
-   # mysql -u root -p
-   > CREATE DATABASE moodle; 
-   > GRANT SELECT,INSERT,UPDATE,DELETE,CREATE,DROP,INDEX,ALTER ON moodle.* 
-           TO moodleuser@localhost IDENTIFIED BY 'yourpassword'; 
-   > quit 
-   # mysqladmin -p reload
-</pre>
-  <p>Example command lines for PostgreSQL: </p>
-  <pre>
-   # su - postgres
-   > psql -c "create user moodleuser createdb;" template1
-   > psql -c "create database moodle;" -U moodleuser template1
-   > psql -c "alter user moodleuser nocreatedb;" template1
-</pre>
-  <p>(For MySQL I highly recommend the use of <a href="http://phpmyadmin.sourceforge.net/">phpMyAdmin</a> 
-    to manage your databases - you can do all this via a web interface).</p>
-  <p>As of version 1.0.8, Moodle now supports table prefixes, and so can safely share 
-   a database with tables from other applications.</p>
-</blockquote>
-<p>&nbsp;</p>
-<h3 class="sectionheading"><a name="webserver" id="webserver"></a>6. Check your web server settings</h3>
-<blockquote>
-  <p>Firstly, make sure that your web server is set up to use index.php as a default 
-    page (perhaps in addition to index.html, default.htm and so on).</p>
-  <p>In Apache, this is done using a DirectoryIndex parameter in your httpd.conf 
-    file. Mine usually looks like this:</p>
-  <blockquote>
-    <pre><strong>DirectoryIndex</strong> index.php index.html index.htm </pre>
-  </blockquote>
-  <p>Just make sure index.php is in the list (and preferably towards the start 
-    of the list, for efficiency).</p>
-  <p>Secondly, <b>if you are using Apache 2</b>, then you should turn on the <i>AcceptPathInfo</i>
-     variable, which allows scripts to be passed arguments like http://server/file.php/arg1/arg2.
-     This is essential to allow relative links between your resources, and also 
-     provides a performance boost for people using your Moodle web site.  You can 
-     turn this on by adding these lines to your httpd.conf file.</p>
-  <blockquote>
-    <pre><strong>AcceptPathInfo</strong> on </pre>
-  </blockquote>
-  <p>Thirdly, Moodle requires a number of PHP settings to be active for it to 
-     work.  <b>On most servers these will already be the default settings.</b>
-     However, some PHP servers (and some of the more recent PHP versions) may 
-     have things set differently.  These are defined in PHP's configuration
-     file (usually called php.ini):</p>
-  <blockquote>
-
-    <pre>magic_quotes_gpc = 1    (preferred but not necessary)
-magic_quotes_runtime = 0    (necessary)
-file_uploads = 1
-session.auto_start = 0
-session.bug_compat_warn = 0
-</pre>
-  </blockquote>
-  <p>If you don't have access to httpd.conf or php.ini on your server, or you 
-    have Moodle on a server with other applications that require different settings, 
-    then don't worry, you can still OVERRIDE all of the default settings. 
-  <p>To do this, you need to create a file called <b>.htaccess</b> in Moodle's
-     main directory that contains definitions for these settings.
-     This only works on Apache servers and only when Overrides have been allowed.
-     
-  <blockquote>
-    <pre>
-DirectoryIndex index.php index.html index.htm
-
-&lt;IfDefine APACHE2>
-     <b>AcceptPathInfo</b> on
-&lt;/IfDefine>
-
-php_flag magic_quotes_gpc 1
-php_flag magic_quotes_runtime 0
-php_flag file_uploads 1
-php_flag session.auto_start 0
-php_flag session.bug_compat_warn 0</pre>
-  </blockquote>
-  <p>You can also do things like define the maximum size for uploaded files:
-     
-  <blockquote>
-    <pre>
-LimitRequestBody 0
-php_value upload_max_filesize 2M
-php_value post_max_size 2M
-     </pre>
-  </blockquote>
-  <p>The easiest thing to do is just copy the sample file from lib/htaccess 
-     and edit it to suit your needs.  It contains further instructions.  For 
-     example, in a Unix shell:
-  <blockquote>
-    <pre>cp lib/htaccess .htaccess</pre>
-  </blockquote>
-</blockquote>
-<p>&nbsp;</p>
-<h3 class="sectionheading"><a name="config"></a>7. Edit config.php</h3>
-<blockquote>
-  <p>Now you can edit the configuration file, <strong>config.php</strong>, using a 
-     text editor. This file is used by all other files in Moodle.</p>
-  <p>To start with, make a copy of <strong>config-dist.php</strong> and name it 
-    config.php. We do this so that your config.php won't be overwritten in case 
-    you upgrade Moodle later on. </p>
-  <p>Edit <strong>config.php</strong> to specify the database details that you 
-    just defined (including a table prefix - notice that this is REQUIRED for 
-    PostgreSQL), as well as the site address, file system directory and data directory. 
-    The config file itself has detailed directions and examples.</p>
-  <p>Once you have done this the rest of the installation is via a web interface. 
-    For the rest of this installation document we will assume your site is at: 
-    <u>http://example.com/moodle</u></p>
-</blockquote>
-<p>&nbsp;</p>
-<h3 class="sectionheading"><a name="admin"></a>8. Go to the admin page</h3>
-<blockquote> 
-  <p>The admin page should now be working at: <u>http://example.com/moodle/admin</u>. 
-    If you try and access the front page of your site you'll be taken there automatically 
-    anyway. The first time you access this admin page, you will be presented with 
-    a GPL &quot;shrinkwrap&quot; agreement with which you must agree before you 
-    can continue with the setup.</p>
-  <p>(Moodle will also try to set some cookies in your browser. If you have your 
-    browser set up to let you choose to accept cookies, then you <b>must</b> accept 
-    the Moodle cookies, or Moodle won't work properly.) 
-  <p>Now Moodle will start setting up your database and creating tables to store 
-    data. Firstly, the main database tables are created. You should see a number 
-    of SQL statements followed by status messages (in green or red) that look 
-    like this:</p>
-  <blockquote> 
-    <p>CREATE TABLE course ( id int(10) unsigned NOT NULL auto_increment, category 
-      int(10) unsigned NOT NULL default '0', password varchar(50) NOT NULL default 
-      '', fullname varchar(254) NOT NULL default '', shortname varchar(15) NOT 
-      NULL default '', summary text NOT NULL, format tinyint(4) NOT NULL default 
-      '1', teacher varchar(100) NOT NULL default 'Teacher', startdate int(10) 
-      unsigned NOT NULL default '0', enddate int(10) unsigned NOT NULL default 
-      '0', timemodified int(10) unsigned NOT NULL default '0', PRIMARY KEY (id)) 
-      TYPE=MyISAM</p>
-    <p><font color="#006600">SUCCESS</font></p>
-    <p>...and so on, followed by: <font color="#006600">Main databases set up 
-      successfully.</font> </p>
-  </blockquote>
-  <p>If you don't see these, then there must have been some problem with the database 
-    or the configuration settings you defined in config.php. Check that PHP isn't 
-    in a restricted "Safe Mode" (commercial web hosts sometimes have safe mode 
-    turned on). You can check PHP variables by creating a little file containing 
-    &lt? phpinfo() ?&gt and looking at it through a browser. Check all these and 
-    try this page again.</p>
-  <p>Scroll down the very bottom of the page and press the &quot;Continue&quot; 
-    link.</p>
-  <p>Next you will see a similar page that sets up all the tables required by 
-    each Moodle module. As before, they should all be <font color="#006600">green</font>.</p>
-  <p>Scroll down the very bottom of the page and press the &quot;Continue&quot; 
-    link.</p>
-  <p>You should now see a form where you can define more configuration variables 
-    for your installation, such as the default language, SMTP hosts and so on. 
-    Don't worry too much about getting everything right just now - you can always 
-    come back and edit these later on using the admin interface. Scroll down to 
-    the bottom and click &quot;Save changes&quot;.</p>
-  <p>If (and only if) you find yourself getting stuck on this page, unable to 
-    continue, then your server probably has what I call the "buggy referrer" problem. 
-    This is easy to fix: just turn off the &quot;secureforms&quot; setting, then 
-    try to continue again.</p>
-  <p>The next page is a form where you can define parameters for your Moodle site 
-    and the front page, such as the name, format, description and so on. Fill 
-    this out (you can always come back and change these later) and then press 
-    &quot;Save changes&quot;.</p>
-  <p>Finally, you will then be asked to create a top-level administration user 
-    for future access to the admin pages. Fill out the details with your own name, 
-    email etc and then click &quot;Save changes&quot;. Not all the fields are 
-    required, but if you miss any important fields you'll be re-prompted for them. 
-  </p>
-  <blockquote> 
-    <blockquote> 
-      <blockquote> 
-        <blockquote> 
-          <blockquote> 
-            <p><strong>Make sure you remember the username and password you chose 
-              for the administration user account, as they will be necessary to 
-              access the administration page in future.</strong></p>
-          </blockquote>
-        </blockquote>
-      </blockquote>
-    </blockquote>
-  </blockquote>
-  <p>(If for any reason your install is interrupted, or there is a system error 
-    of some kind that prevents you from logging in using the admin account, you 
-    can usually log in using the default username of &quot;<strong>admin</strong>&quot;, 
-    with password &quot;<strong>admin</strong>&quot;.)</p>
-  <p>Once successful, you will be returned to home page of your site. Note the 
-    administration links that appear down the left hand side of the page (these 
-    items also appear on a separate Admin page) - these items are only visible 
-    to you because you are logged in as the admin user. All your further administration 
-    of Moodle can now be done using this menu, such as:</p>
-  <ul>
-    <li>creating and deleting courses</li>
-    <li>creating and editing user accounts</li>
-    <li>administering teacher accounts</li>
-    <li>changing site-wide settings like themes etc</li>
-  </ul>
-</blockquote>
-<p>&nbsp;</p>
-<h3 class="sectionheading"><a name="cron"></a>9. Set up cron</h3>
-<blockquote> 
-  <p>Some of Moodle's modules require continual checks to perform tasks. For example, 
-    Moodle needs to check the discussion forums so it can mail out copies of posts 
-    to people who have subscribed.</p>
-  <p>The script that does all this is located in the admin directory, and is called 
-    cron.php. However, it can not run itself, so you need to set up a mechanism 
-    where this script is run regularly (eg every five or ten minutes). This provides 
-    a &quot;heartbeat&quot; so that the script can perform functions at periods 
-    defined by each module.</p>
-  <p>Note that the machine performing the cron <b>does not need to be the same 
-    machine that is running Moodle</b>. For example, if you have a limited web 
-    hosting service that does not have cron, then you can might choose to run 
-    cron on another server or on your home computer. All that matters is that 
-    the cron.php file is called regularly. </p>
-  <p>The load of this script is not very high, so 5 minutes is usually reasonable, 
-    but if you're worried about it you can reduce the time period to something 
-    like 15 minutes or even 30 minutes. It's best not to make the time period 
-    too long, as delaying mail-outs can slow down activity within the course.</p>
-  <p>First, test that the script works by running it directly from your browser:</p>
-  <blockquote> 
-    <pre>http://example.com/moodle/admin/cron.php</pre>
-  </blockquote>
-  <p>Now, you need to set up some of way of running the script automatically and 
-    regularly. </p>
-  <h4> Running the script from a command line</h4>
-  <p>You can call the page from the command line just as you did in the example 
-    above. For example, you can use a Unix utility like 'wget':</p>
-  <blockquote>
-    <pre>wget -q -O /dev/null http://example.com/moodle/admin/cron.php</pre>
-  </blockquote>
-  <p>Note in this example that the output is thrown away (to /dev/null).</p>
-  <p>The same thing using lynx:</p>
-  <blockquote>
-    <pre>lynx -dump http://example.com/moodle/admin/cron.php &gt; /dev/null</pre>
-  </blockquote>
-  <p>Alternatively you could use a standalone version of PHP, compiled to be run 
-    on the command line. The advantage with doing this is that your web server 
-    logs aren't filled with constant requests to cron.php. The disadvantage is 
-    that you need to have access to a command-line version of php.</p>
-  <blockquote>
-    <pre>/opt/bin/php /web/moodle/admin/cron.php
-
-
-(Windows) C:\apache\php\php.exe C:\apache\htdocs\moodle\admin\cron.php
-
-</pre>
-  </blockquote>
-  <h4>Automatically running the script every 5 minutes</h4>
-  <p><b>On Unix systems</b>: Use <b>cron</b>. Edit your cron settings from the commandline 
-    using &quot;crontab -e&quot; and add a line like:</p>
-  <blockquote>
-    <pre>*/5 * * * * wget -q -O /dev/null http://example.com/moodle/admin/cron.php</pre>
-  </blockquote>
-  <p>Usually, the "crontab" command will put you into the 'vi' editor. You enter 
-     "insert mode" by pressing "i", then type in the line as above, then exit insert mode by 
-     pressing ESC.  You save and exit by typing ":wq", or quit without saving using ":q!" (without the quotes).</p>
-  <p><b>On Windows systems</b>: The simplest way is to use this little package <a href="http://moodle.org/download/moodle-cron-for-windows.zip" title="Click to download this package (150k)" target="_blank">moodle-cron-for-windows.zip</a> 
-    which makes this whole thing very easy. You can also explore using the built-in 
-    Windows feature for "Scheduled Tasks".</p>
-  <p>On web hosts: Your web-based control panel may have a web page that allows 
-    you to set up this cron process. Ask your administrator for details on how 
-    it works.</p>
-  <p></p>
-</blockquote>
-<h3 class="sectionheading"><a name="course"></a>10. Create a new course</h3>
-<blockquote>
-  <p>Now that Moodle is running properly, you can create a course. </p>
-  <p>Select &quot;Create a new course&quot; from the Admin page (or the admin 
-    links on the home page).</p>
-  <p>Fill out the form, paying special attention to the course format. You don't 
-    have to worry about the details too much at this stage, as everything can 
-    be changed later by the teacher.</p>
-  <p>Press &quot;Save changes&quot;, and you will be taken to a new form where 
-    you can assign teachers to the course. You can only add existing user accounts 
-    from this form - if you want to create a new teacher account then either ask 
-    the teacher to create one for themselves (see the login page), or create one 
-    for them using the &quot;Add a new user&quot; on the Admin page.</p>
-  <p>Once done, the course is ready to customise, and is accessible via the &quot;Courses&quot; 
-    link on the home page.</p>
-  <p>See the &quot;<a href="./?file=teacher.html">Teacher Manual</a>&quot; for more details 
-    on course-building.</p>
-</blockquote>
-<p>&nbsp;</p>
-<p align="CENTER"><font size="1"><a href="." target="_top">Moodle Documentation</a></font></p>
-<p align="CENTER"><font size="1">Version: $Id$</font></p>
-</body>
@@ -1,24 +0,0 @@
-<?PHP  // $Id$
-
-    require("../config.php");
-
-    if ($CFG->forcelogin) {
-        require_login();
-    }
-
-    if (empty($CFG->langmenu)) {
-        $langmenu = "";
-    } else {
-        $currlang = current_language();
-        $langs    = get_list_of_languages();
-        $langmenu = popup_form ("$CFG->wwwroot/doc/?lang=", $langs, "chooselang", $currlang, "", "", "", true, "parent");
-    }
-
-    if (! $site = get_site()) {
-        error("Site is misconfigured");
-    }
-    $strdocumentation = get_string("documentation");
-    print_header("$site->shortname: $strdocumentation", "$site->fullname", "$strdocumentation", "", "", true, $langmenu, navmenu($site, NULL, "parent"));
-    
-?>
-
@@ -1,40 +0,0 @@
-<?PHP  // $Id$
-
-    require("../config.php");
-
-    $id = optional_param('id',0,PARAM_INT); // course context
-    $file = required_param('file',PARAM_FILE);    // file in this directory to view
-
-    $file = clean_filename($file);
-
-    if ($CFG->forcelogin) {
-        require_login();
-    }
-
-    if ($id) {
-        if (! $course = get_record("course", "id", $id)) {
-            error("Course is misconfigured");
-        }
-        $strhelp = get_string("help");
-        print_header("$course->shortname: $strhelp", "$course->fullname", 
-                     "<a href=\"../course/view.php?id=$course->id\">$course->shortname</a> -> $strhelp");
-    } else {
-        if (! $site = get_site()) {
-            error("Site is misconfigured");
-        }
-        $strdocumentation = get_string("documentation");
-        print_header("$site->shortname: $strhelp", "$site->fullname", 
-                     "<a href=\"view.php?file=contents.html\">$strdocumentation</a>");
-        
-    }
-
-    echo "<blockquote>";
-
-    if (! document_file($file, true)) {
-        notify("404 - File Not Found");
-    }
-
-    echo "</blockquote>";
-
-?>
-
@@ -198,21 +198,17 @@ function authorize_action(&$order, &$message, &$extra, $action=AN_ACTION_NONE, $
                $message = "Order must be settled. Try VOID, check Cut-Off time if it fails!";
                return AN_RETURNZERO;
            }
+            if (empty($extra->amount)) {
+                $message = "No valid amount!";
+                return AN_RETURNZERO;
+            }
            $timenowsettle = authorize_getsettletime(time());
            $timediff = $timenowsettle - (120 * 3600 * 24);
            if ($order->settletime < $timediff) {
                $message = "Order must be credited within 120 days!";
                return AN_RETURNZERO;
            }
-            if (empty($extra)) {
-                $message = "Need extra fields to REFUND!";
-                return AN_RETURNZERO;
-            }
-            $total = floatval($extra->sum) + floatval($extra->amount);
-            if (($extra->amount == 0) || ($total > $order->amount)) {
-                $message = "Can be credited up to original amount.";
-                return AN_RETURNZERO;
-            }
+
            $poststring .= '&x_type=CREDIT&x_trans_id=' . urlencode($order->transid);
            $poststring .= '&x_currency_code=' . urlencode($order->currency);
            $poststring .= '&x_invoice_num=' . urlencode($extra->orderid);
@@ -336,7 +332,6 @@ function authorize_action(&$order, &$message, &$extra, $action=AN_ACTION_NONE, $
                $extra->status = AN_STATUS_CREDIT;
                $extra->transid = $transid;
                $extra->settletime = authorize_getsettletime(time());
-                unset($extra->sum); // this is not used in refunds table.
                if (! $extra->id = insert_record('enrol_authorize_refunds', $extra)) {
                    unset($extra->id);
                    email_to_admin("Error while trying to insert data " .
@@ -2,7 +2,7 @@

 // THIS FILE IS DEPRECATED!  PLEASE DO NOT MAKE CHANGES TO IT!
 //
-// IT IS USED ONLY FOR UPGRADES FROM BEFORE MOODLE 1.7, ALL 
+// IT IS USED ONLY FOR UPGRADES FROM BEFORE MOODLE 1.7, ALL
 // LATER CHANGES SHOULD USE upgrade.php IN THIS DIRECTORY.

 // MySQL commands for upgrading this enrolment module
@@ -56,7 +56,7 @@ function enrol_authorize_upgrade($oldversion=0) {
          PRIMARY KEY (`id`),
          KEY `orderid` (`orderid`));");
        // defaults.
-        if ($courses = get_records_select('course', '', '', 'id, cost, currency')) {
+        if (($courses = get_records_select('course', '', '', 'id, cost, currency'))) {
            foreach ($courses as $course) {
                execute_sql("UPDATE {$CFG->prefix}enrol_authorize
                             SET amount = '$course->cost', currency = '$course->currency'
@@ -70,7 +70,7 @@ function enrol_authorize_upgrade($oldversion=0) {
        table_column('enrol_authorize_refunds', '', 'settletime', 'integer', '10', 'unsigned', '0', 'not null', 'transid');
        table_column('enrol_authorize', 'timeupdated', 'settletime', 'integer', '10', 'unsigned', '0', 'not null');
        $status = AN_STATUS_AUTH | AN_STATUS_CAPTURE;
-        if ($settlements = get_records_select('enrol_authorize', "status='$status'", '', 'id, settletime')) {
+        if (($settlements = get_records_select('enrol_authorize', "status='$status'", '', 'id, settletime'))) {
            include_once("$CFG->dirroot/enrol/authorize/authorizenetlib.php");
            foreach ($settlements as $settlement) {
                execute_sql("UPDATE {$CFG->prefix}enrol_authorize SET settletime = '" .
@@ -2,7 +2,7 @@

 // THIS FILE IS DEPRECATED!  PLEASE DO NOT MAKE CHANGES TO IT!
 //
-// IT IS USED ONLY FOR UPGRADES FROM BEFORE MOODLE 1.7, ALL 
+// IT IS USED ONLY FOR UPGRADES FROM BEFORE MOODLE 1.7, ALL
 // LATER CHANGES SHOULD USE upgrade.php IN THIS DIRECTORY.

 // PostgreSQL commands for upgrading this enrolment module
@@ -67,7 +67,7 @@ function enrol_authorize_upgrade($oldversion=0) {
         );");
        modify_database("","CREATE INDEX prefix_enrol_authorize_refunds_orderid_idx ON prefix_enrol_authorize_refunds (orderid);");
        // defaults.
-        if ($courses = get_records_select('course', '', '', 'id, cost, currency')) {
+        if (($courses = get_records_select('course', '', '', 'id, cost, currency'))) {
            foreach ($courses as $course) {
                execute_sql("UPDATE {$CFG->prefix}enrol_authorize
                             SET amount = '$course->cost', currency = '$course->currency'
@@ -81,7 +81,7 @@ function enrol_authorize_upgrade($oldversion=0) {
        table_column('enrol_authorize_refunds', '', 'settletime', 'integer', '10', 'unsigned', '0', 'not null', 'transid');
        table_column('enrol_authorize', 'timeupdated', 'settletime', 'integer', '10', 'unsigned', '0', 'not null');
        $status = AN_STATUS_AUTH | AN_STATUS_CAPTURE;
-        if ($settlements = get_records_select('enrol_authorize', "status='$status'", '', 'id, settletime')) {
+        if (($settlements = get_records_select('enrol_authorize', "status='$status'", '', 'id, settletime'))) {
            include_once("$CFG->dirroot/enrol/authorize/authorizenetlib.php");
            foreach ($settlements as $settlement) {
                execute_sql("UPDATE {$CFG->prefix}enrol_authorize SET settletime = '" .
@@ -47,7 +47,7 @@ class enrolment_plugin_authorize

        httpsrequired();

-        if (empty($_SERVER['HTTPS']) || $_SERVER['HTTPS'] == 'off') {
+        if (isset($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] != 443) { // MDL-9836
            if (empty($CFG->loginhttps)) {
                error(get_string('httpsrequired', 'enrol_authorize'));
            } else {
@@ -199,7 +199,7 @@ class enrolment_plugin_authorize
                redirect($CFG->wwwroot, get_string("reviewnotify", "enrol_authorize"), '30');
            }
            else {
-                enrol_into_course($course, $USER, 'manual');
+                enrol_into_course($course, $USER, 'authorize');
                redirect("$CFG->wwwroot/course/view.php?id=$course->id");
            }
            return;
@@ -222,7 +222,7 @@ class enrolment_plugin_authorize
            $a->orderid = $order->id;
            $emailsubject = get_string('adminnewordersubject', 'enrol_authorize', $a);
            $context = get_context_instance(CONTEXT_COURSE, $course->id);
-            if ($paymentmanagers = get_users_by_capability($context, 'enrol/authorize:managepayments')) {
+            if (($paymentmanagers = get_users_by_capability($context, 'enrol/authorize:managepayments'))) {
                foreach ($paymentmanagers as $paymentmanager) {
                    email_to_user($paymentmanager, $USER, $emailsubject, $emailmessage);
                }
@@ -232,7 +232,7 @@ class enrolment_plugin_authorize
        }

        // Credit card captured, ENROL student now...
-        if (enrol_into_course($course, $USER, 'manual')) {
+        if (enrol_into_course($course, $USER, 'authorize')) {
            if (!empty($CFG->enrol_mailstudents)) {
                send_welcome_messages($order->id);
            }
@@ -405,7 +405,7 @@ class enrolment_plugin_authorize
            $a->url = "$CFG->wwwroot/$CFG->admin/settings.php?section=httpsecurity";
            notice(get_string('adminconfighttps', 'enrol_authorize', $a));
        }
-        elseif (empty($_SERVER['HTTPS']) || $_SERVER['HTTPS'] == 'off') {
+        elseif (isset($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] != 443) { // MDL-9836
            $wwwsroot = qualified_me();
            $wwwsroot = str_replace('http:', 'https:', $wwwsroot);
            $a = new stdClass;
@@ -417,13 +417,14 @@ class enrolment_plugin_authorize
            $captureday = intval($frm->an_capture_day);
            $emailexpired = intval($frm->an_emailexpired);
            if ($captureday > 0 || $emailexpired > 0) {
-                if ((time() - intval($mconfig->an_lastcron) > 3600 * 24)) {
+                $lastcron = get_field_sql('SELECT max(lastcron) FROM ' . $CFG->prefix . 'modules');
+                if ((time() - intval($lastcron) > 3600 * 24)) {
                    notify(get_string('admincronsetup', 'enrol_authorize'));
                }
            }
        }

-        if ($count = count_records('enrol_authorize', 'status', AN_STATUS_AUTH)) {
+        if (($count = count_records('enrol_authorize', 'status', AN_STATUS_AUTH))) {
            $a = new stdClass;
            $a->count = $count;
            $a->url = $CFG->wwwroot."/enrol/authorize/index.php?status=".AN_STATUS_AUTH;
@@ -491,7 +492,8 @@ class enrolment_plugin_authorize
        $emailexpired = ($emailexpired > 5) ? 5 : (($emailexpired < 0) ? 0 : $emailexpired);

        if (!empty($reviewval) && ($captureday > 0 || $emailexpired > 0)) {
-            if (time() - intval($mconfig->an_lastcron) > 3600 * 24) {
+            $lastcron = get_field_sql('SELECT max(lastcron) FROM ' . $CFG->prefix . 'modules');
+            if (time() - intval($lastcron) > 3600 * 24) {
                return false;
            }
        }
@@ -560,7 +562,6 @@ class enrolment_plugin_authorize
        $settlementtime = authorize_getsettletime($timenow);
        $timediff30 = $settlementtime - (30 * $oneday);
        $mconfig = get_config('enrol/authorize');
-        set_config('an_lastcron', $timenow, 'enrol/authorize');

        mtrace("Processing authorize cron...");

@@ -601,6 +602,7 @@ class enrolment_plugin_authorize
            mtrace("blocked");
            return;
        }
+        set_config('an_lastcron', $timenow, 'enrol/authorize');

        mtrace("    $ordercount orders are being processed now", ": ");

@@ -627,7 +629,7 @@ class enrolment_plugin_authorize
                    $timeend = $order->settletime + $course->enrolperiod;
                }
                $user = get_record('user', 'id', $order->userid);
-                if (role_assign($role->id, $user->id, 0, $context->id, $timestart, $timeend, 0, 'manual')) {
+                if (role_assign($role->id, $user->id, 0, $context->id, $timestart, $timeend, 0, 'authorize')) {
                    $this->log .= "User($user->id) has been enrolled to course($course->id).\n";
                    if (!empty($CFG->enrol_mailstudents)) {
                        $sendem[] = $order->id;
@@ -766,7 +768,7 @@ class enrolment_plugin_authorize
        foreach($courseinfos as $courseinfo) {
            $lastcourse = $courseinfo->courseid;
            $context = get_context_instance(CONTEXT_COURSE, $lastcourse);
-            if ($paymentmanagers = get_users_by_capability($context, 'enrol/authorize:managepayments')) {
+            if (($paymentmanagers = get_users_by_capability($context, 'enrol/authorize:managepayments'))) {
                $a = new stdClass;
                $a->course = $courseinfo->shortname;
                $a->pending = $courseinfo->cnt;
@@ -2,7 +2,10 @@

 /// Load libraries
    require_once('../../config.php');
+    require_once('const.php');
    require_once('locallib.php');
+    require_once('localfuncs.php');
+    require_once('authorizenetlib.php');

 /// Parameters
    $orderid  = optional_param('order', 0, PARAM_INT);
@@ -40,7 +40,7 @@ function prevent_double_paid($course)
        $sql .= 'AND status='.AN_STATUS_NONE;
    }

-    if ($recid = get_field_sql($sql)) {
+    if (($recid = get_field_sql($sql))) {
        $a = new stdClass;
        $a->orderid = $recid;
        $a->url = "$CFG->wwwroot/enrol/authorize/index.php?order=$a->orderid";
@@ -4,9 +4,6 @@ if (!defined('MOODLE_INTERNAL')) {
    die('Direct access to this script is forbidden.');
 }

-require_once('const.php');
-require_once('authorizenetlib.php');
-
 define('ORDER_CAPTURE', 'capture');
 define('ORDER_DELETE',  'delete');
 define('ORDER_REFUND',  'refund');
@@ -53,7 +50,7 @@ function authorize_print_orders($courseid, $userid)
        $sql .= "WHERE (e.userid='$userid') ";
    }
    $sql .= "ORDER BY c.sortorder, c.fullname";
-    if ($popupcrs = get_records_sql_menu($sql)) {
+    if (($popupcrs = get_records_sql_menu($sql))) {
        $popupcrs = array($SITE->id => $SITE->fullname) + $popupcrs;
        echo "<table border='0' width='100%' cellspacing=0 cellpadding=3 class='generaltable generalbox'>";
        echo "<tr>";
@@ -155,7 +152,7 @@ function authorize_print_orders($courseid, $userid)
        $where .= "AND (e.userid = '" . $userid . "') ";
    }

-    if ($sort = $table->get_sql_sort()) {
+    if (($sort = $table->get_sql_sort())) {
        $sort = ' ORDER BY ' . $sort;
    }

@@ -163,7 +160,7 @@ function authorize_print_orders($courseid, $userid)
    $table->initialbars($totalcount > $perpage);
    $table->pagesize($perpage, $totalcount);

-    if ($records = get_records_sql($select . $from . $where . $sort, $table->get_page_start(), $table->get_page_size())) {
+    if (($records = get_records_sql($select . $from . $where . $sort, $table->get_page_start(), $table->get_page_size()))) {
        foreach ($records as $record) {
            $actionstatus = authorize_get_status_action($record);
            $color = authorize_get_status_color($actionstatus->status);
@@ -278,7 +275,7 @@ function authorize_print_order_details($orderno)
            else {
                if (empty($CFG->an_test)) {
                    $user = get_record('user', 'id', $order->userid);
-                    if (enrol_into_course($course, $user, 'manual')) {
+                    if (enrol_into_course($course, $user, 'authorize')) {
                        if (!empty($CFG->enrol_mailstudents)) {
                            send_welcome_messages($order->id);
                        }
@@ -304,17 +301,14 @@ function authorize_print_order_details($orderno)
            error(get_string('youcantdo', 'enrol_authorize', $a));
        }

-        $extra = new stdClass;
-        $extra->sum = 0.0;
-        $extra->orderid = $orderno;
-
+        $refunded = 0.0;
        $sql = "SELECT SUM(amount) AS refunded FROM {$CFG->prefix}enrol_authorize_refunds " .
               "WHERE (orderid = '" . $orderno . "') AND (status = '" . AN_STATUS_CREDIT . "')";

-        if ($refund = get_record_sql($sql)) {
-            $extra->sum = floatval($refund->refunded);
+        if (($refundval = get_field_sql($sql))) {
+            $refunded = floatval($refundval);
        }
-        $upto = format_float($order->amount - $extra->sum, 2);
+        $upto = format_float($order->amount - $refunded, 2);
        if ($upto <= 0) {
            error("Refunded to original amount.");
        }
@@ -333,6 +327,8 @@ function authorize_print_order_details($orderno)
                     $strcanbecredit<br /><input type='submit' name='".ORDER_REFUND."' value='$authstrs->refund'>");
            }
            else {
+                $extra = new stdClass;
+                $extra->orderid = $orderno;
                $extra->amount = $amount;
                $message = '';
                $success = authorize_action($order, $message, $extra, AN_ACTION_CREDIT);
@@ -16,7 +16,7 @@
    print_heading_with_help($struploadcsv, 'uploadcsv', 'enrol/authorize');

 /// Handle CSV file
-    if ($form = data_submitted() && confirm_sesskey()) {
+    if (($form = data_submitted()) && confirm_sesskey()) {
        $um = new upload_manager('csvfile', false, false, null, false, 0);
        if ($um->preprocess_files()) {
            $filename = $um->files['csvfile']['tmp_name'];
@@ -115,7 +115,7 @@ function authorize_process_csv($filename)
        $settlementdate = strtotime($data[$csvfields['Settlement Date/Time']]);

        if ($transstatus == 'Approved Review' || $transstatus == 'Review Failed') {
-            if ($order = get_record('enrol_authorize', 'transid', $transid)) {
+            if (($order = get_record('enrol_authorize', 'transid', $transid))) {
                $order->status = ($transstatus == 'Approved Review') ? AN_STATUS_APPROVEDREVIEW : AN_STATUS_REVIEWFAILED;
                update_record('enrol_authorize', $order);
                $updated++; // Updated order status
@@ -124,7 +124,7 @@ function authorize_process_csv($filename)
        }

        if (!empty($reftransid) && is_numeric($reftransid) && 'Settled Successfully' == $transstatus && 'Credit' == $transtype) {
-            if ($order = get_record('enrol_authorize', 'transid', $reftransid)) {
+            if (($order = get_record('enrol_authorize', 'transid', $reftransid))) {
                if (AN_METHOD_ECHECK == $order->paymentmethod) {
                    $refund = get_record('enrol_authorize_refunds', 'transid', $transid);
                    if ($refund) {
@@ -195,14 +195,14 @@ function authorize_process_csv($filename)
        }

        // If user wasn't enrolled, enrol now. Ignore otherwise. Because admin user might submit this file again.
-        if ($role = get_default_course_role($course)) {
+        if (($role = get_default_course_role($course))) {
            if (! user_has_role_assignment($user->id, $role->id, $coursecontext->id)) {
                $timestart = $timeend = 0;
                if ($course->enrolperiod) {
                    $timestart = time();
                    $timeend = $timestart + $course->enrolperiod;
                }
-                if (role_assign($role->id, $user->id, 0, $coursecontext->id, $timestart, $timeend, 0, 'manual')) {
+                if (role_assign($role->id, $user->id, 0, $coursecontext->id, $timestart, $timeend, 0, 'authorize')) {
                    $imported++;
                    if (!empty($CFG->enrol_mailstudents)) {
                        $sendem[] = $order->id;
@@ -92,16 +92,16 @@ function setup_enrolments(&$user) {
                    $course = get_record('course', $CFG->enrol_localcoursefield, $coursefield);
                    if (!is_object($course)) {
                        if (empty($CFG->enrol_db_autocreate)) { // autocreation not allowed
-                            print "Course $extcourse does not exist, skipping\n";
+                            print "Course $coursefield does not exist, skipping\n";
                            continue; // next foreach course
                        }
                        // ok, now then let's create it!
-                        print "Creating Course $extcourse...";
+                        print "Creating Course $coursefield...";
                        // prepare any course properties we actually have
                        $course = new StdClass;
-                        $course->{$CFG->enrol_localcoursefield} = $extcourse;
-                        $course->fullname  = $extcourse;
-                        $course->shortname = $extcourse;
+                        $course->{$CFG->enrol_localcoursefield} = $coursefield;
+                        $course->fullname  = $coursefield;
+                        $course->shortname = $coursefield;
                        if ($newcourseid = $this->create_course($course, true)
                            and $course = get_record( 'course', 'id', $newcourseid)) {
                            // we are skipping fix_course_sortorder()
@@ -578,7 +578,7 @@ function create_course ($course,$skip_fix_course_sortorder=0){
    $course->shortname = substr($course->shortname, 0, 15);
    
    // store it and log
-    if ($newcourseid = insert_record("course", $course)) {  // Set up new course
+    if ($newcourseid = insert_record("course", addslashes_object($course))) {  // Set up new course
        $section = NULL;
        $section->course = $newcourseid;   // Create a default section.
        $section->section = 0;
@@ -238,7 +238,7 @@ function get_access_icons($course) {
   
                        if ($fields[1] == "student") {

-                            if ($teachers = get_users_by_capability($context, 'moodle/course:update', 'u.*,ra.hidden', 'sortorder ASC')) {
+                            if ($teachers = get_users_by_capability($context, 'moodle/course:update', 'u.*,ra.hidden', 'ra.sortorder ASC')) {
                                foreach ($teachers as $u) {
                                    if (!$u->hidden || has_capability('moodle/role:viewhiddenassigns', $context)) {
                                        $teacher = $u;
@@ -542,7 +542,7 @@ function process_group_tag($tagcontents){
                }else{
                    $course->sortorder = 1000;
                }
-                if($course->id = insert_record('course', $course)){
+                if($course->id = insert_record('course', addslashes_object($course))){
                
                    // Setup the blocks
                    $page = page_create_object(PAGE_COURSE_VIEW, $course->id);
@@ -76,7 +76,7 @@ function setup_enrolments(&$user) {
                    error_log("[ENROL_LDAP] User $user->username enrolled to a nonexistant course $course_ext_id \n");
                }
            } else { // the course object exists before we call...
-                if ($course_obj->visible==0 && $user->{$type}[$course_obj->id] == 'ldap') {
+                if ($course_obj->visible==0) {
                    // non-visible courses don't show up in the enrolled 
                    // array, so we should skip them -- 
                    continue;
@@ -1,8 +1,8 @@
 <?php // $id$
 //////////////////////////////////////////////////////////////
 //  Media plugin filtering
-// 
-//  This filter will replace any links to a media file with 
+//
+//  This filter will replace any links to a media file with
 //  a media plugin that plays that media inline
 //
 //  To activate this filter, add a line like this to your
@@ -12,7 +12,7 @@
 //
 //////////////////////////////////////////////////////////////

-/// This is the filtering function itself.  It accepts the 
+/// This is the filtering function itself.  It accepts the
 /// courseid and the text to be filtered (in HTML form).

 function mediaplugin_filter($courseid, $text) {
@@ -20,6 +20,12 @@ function mediaplugin_filter($courseid, $text) {

    include "defaultsettings.php";

+    // You should never modify parameters passed to a method or function, it's BAD practice. Create a copy instead.
+    // The reason is that you must always be able to refer to the original parameter that was passed.
+    // For this reason, I changed $text = preg_replace(..,..,$text) into $newtext = preg.... (NICOLAS CONNAULT)
+    // Thanks to Pablo Etcheverry for pointing this out! MDL-10177
+    $newtext = fullclone($text);
+
    if ($CFG->filter_mediaplugin_enable_mp3) {
        static $c;

@@ -47,8 +53,8 @@ function mediaplugin_filter($courseid, $text) {
        $replace .= ' pluginspage="http://www.macromedia.com/go/getflashplayer">';
        $replace .= '</embed>';
        $replace .= '</object>&nbsp;';
-    
-        $text = preg_replace($search, $replace, $text);
+
+        $newtext = preg_replace($search, $replace, $newtext);
    }

    if ($CFG->filter_mediaplugin_enable_swf) {
@@ -85,13 +91,13 @@ function mediaplugin_filter($courseid, $text) {
        $replace[1] .= '</embed>';
        $replace[1] .= '</object></p>';

-        $text = preg_replace($search, $replace, $text);
+        $newtext = preg_replace($search, $replace, $newtext);

    }

    if ($CFG->filter_mediaplugin_enable_flv) {
        $search = '/<a(.*?)href=\"([^<]+)\.flv\"([^>]*)>(.*?)<\/a>/is';
-            
+
        $replace  = '\\0&nbsp;<object class="mediaplugin flv" classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"';
        $replace .= ' codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,0,0" ';
        $replace .= ' width="480" height="360" id="flvplayer">';
@@ -104,8 +110,8 @@ function mediaplugin_filter($courseid, $text) {
        $replace .= ' pluginspage="http://www.macromedia.com/go/getflashplayer">';
        $replace .= '</embed>';
        $replace .= '</object>&nbsp;';
-    
-        $text = preg_replace($search, $replace, $text);
+
+        $newtext = preg_replace($search, $replace, $newtext);
    }

    if ($CFG->filter_mediaplugin_enable_mov) {
@@ -127,7 +133,7 @@ function mediaplugin_filter($courseid, $text) {
        $replace .= '</embed>';
        $replace .= '</object></p>';

-        $text = preg_replace($search, $replace, $text);
+        $newtext = preg_replace($search, $replace, $newtext);
    }

    if ($CFG->filter_mediaplugin_enable_wmv) {
@@ -154,7 +160,7 @@ function mediaplugin_filter($courseid, $text) {
        $replace .= '</embed>';
        $replace .= '</object></p>';

-        $text = preg_replace($search, $replace, $text);
+        $newtext = preg_replace($search, $replace, $newtext);
    }

    if ($CFG->filter_mediaplugin_enable_mpg) {
@@ -166,8 +172,8 @@ function mediaplugin_filter($courseid, $text) {
        $replace .= '<param name="autoplay" value="false" />';
        $replace .= '<embed src="\\2.\\3" width="240" height="180" controller="true" autoplay="false"> </embed>';
        $replace .= '</object></p>';
-        
-        $text = preg_replace($search, $replace, $text);
+
+        $newtext = preg_replace($search, $replace, $newtext);
    }

    if ($CFG->filter_mediaplugin_enable_avi) {
@@ -179,10 +185,10 @@ function mediaplugin_filter($courseid, $text) {
        $replace .= '<param name="autoplay" value="false" />';
        $replace .= '<embed src="\\2.avi" width="240" height="180" controller="true" autoplay="false"> </embed>';
        $replace .= '</object></p>';
-    
-        $text = preg_replace($search, $replace, $text);
+
+        $newtext = preg_replace($search, $replace, $newtext);
    }
-    
+
    if ($CFG->filter_mediaplugin_enable_ram) {
        $search = '/<a(.*?)href=\"([^<]+)\.ram\"([^>]*)>(.*?)<\/a>/is';

@@ -205,9 +211,9 @@ function mediaplugin_filter($courseid, $text) {
        $replace .= '</embed>';
        $replace .= '</object></p>';

-        $text = preg_replace($search, $replace, $text);
+        $newtext = preg_replace($search, $replace, $newtext);
    }
-     
+
    if ($CFG->filter_mediaplugin_enable_rpm) {
        $search = '/<a(.*?)href=\"([^<]+)\.rpm\"([^>]*)>(.*?)<\/a>/is';

@@ -230,9 +236,9 @@ function mediaplugin_filter($courseid, $text) {
        $replace .= '</embed>';
        $replace .= '</object></p>';

-        $text = preg_replace($search, $replace, $text);
+        $newtext = preg_replace($search, $replace, $newtext);
    }
-    
+
    if ($CFG->filter_mediaplugin_enable_rm) {
        $search = '/<a(.*?)href=\"([^<]+)\.rm\"([^>]*)>(.*?)<\/a>/is';

@@ -255,11 +261,13 @@ function mediaplugin_filter($courseid, $text) {
        $replace .= '</embed>';
        $replace .= '</object></p>';

-        $text = preg_replace($search, $replace, $text);
+        $newtext = preg_replace($search, $replace, $newtext);
    }

-
-    return $text;
+    if (is_null($newtext)) {
+        $newtext = $text;
+    }
+    return $newtext;
 }


@@ -17,7 +17,7 @@
 * @param        string         text to be filtered
 */
 function tidy_filter($courseid, $text) {
-       
+    global $CFG;   
 /// Configuration for tidy. Feel free to tune for your needs, e.g. to allow
 /// proprietary markup.
    $tidyoptions = array(             
@@ -39,7 +39,11 @@ function tidy_filter($courseid, $text) {
    
 /// If enabled: run tidy over the entire string
    if (function_exists('tidy_repair_string')){
-        $text = tidy_repair_string($text, $tidyoptions);
+        if (empty($CFG->unicodedb)) {
+            $text = tidy_repair_string($text, $tidyoptions);
+        } else {
+            $text = tidy_repair_string($text, $tidyoptions, 'utf8');
+        }
    }

    return $text;
@@ -12,7 +12,7 @@

    require_login($course->id);

-    require_capability('moodle/course:managegrades', get_context_instance(CONTEXT_MODULE, $id));
+    require_capability('moodle/course:managegrades', get_context_instance(CONTEXT_COURSE, $id));

    $group = get_current_group($course->id);
    
@@ -1594,6 +1594,7 @@ function grade_get_stats($category='all') {
 // returns a comma seperated list of the most common values in $items, $items is expected to be a comma sperated list of numbers
 function grade_mode($items) {
    $all_scores = explode(',',$items);
+    shuffle($all_scores); //MDL-7571 - shuffle scores
    foreach($all_scores as $value) {
        if (isset($frequency[$value])) {
            $frequency[$value]++;
@@ -2024,7 +2025,7 @@ function grade_view_all_grades($view_by_student) { // if mode=='grade' then we a
            $header = '<tr><th rowspan="2">'.$student_heading_link.'</th>';
        }
        else {
-            $header = '</tr>';
+            $header = '<tr>';
        }
        $header1 = '<tr>';
        
@@ -35,7 +35,7 @@ if (!empty($file)) {
    if (empty($forcelang)) {
        $langs = array(current_language(), get_string('parentlanguage'), 'en_utf8');  // Fallback
    } else {
-        $langs = array($forcelang);
+        $langs = array($forcelang, 'en_utf8');
    }

    // Work through the possible languages, starting with the most specific.
@@ -3,7 +3,7 @@

 /// If config.php exists already then we are not needed.

-if (file_exists('./config.php')) { 
+if (file_exists('./config.php')) {
    header('Location: index.php');
    die;
 } else {
@@ -97,18 +97,18 @@ if (isset($_POST['stage'])) {


    if ($nextstage < 0) $nextstage = WELCOME;
-    
+

    /// Store any posted data
    foreach ($_POST as $setting=>$value) {
        $INSTALL[$setting] = $value;
    }
-    
+
 } else {

    $goforward = true;
    $nextstage = WELCOME;
-    
+
 }

 //==========================================================================//
@@ -128,6 +128,7 @@ $CFG->running_installer = true;
 require_once('./lib/adminlib.php');
 require_once('./lib/setuplib.php');
 require_once('./lib/moodlelib.php');
+require_once('./lib/deprecatedlib.php');
 require_once('./lib/weblib.php');
 require_once('./lib/adodb/adodb.inc.php');
 require_once('./lib/environmentlib.php');
@@ -201,7 +202,7 @@ if (isset($_GET['help'])) {
 /// Are we in config download mode?

 if (isset($_GET['download'])) {
-    header("Content-Type: application/download\n"); 
+    header("Content-Type: application/download\n");
    header("Content-Disposition: attachment; filename=\"config.php\"");
    echo $INSTALL['config'];
    exit;
@@ -218,21 +219,21 @@ if (isset($_GET['download'])) {
 if ($INSTALL['stage'] == DIRECTORY) {

    error_reporting(0);
-    
+
    /// check wwwroot
-    if (ini_get('allow_url_fopen')) {
+    if (ini_get('allow_url_fopen') && false) {  /// This was not reliable
        if (($fh = @fopen($INSTALL['wwwrootform'].'/install.php', 'r')) === false) {
            $errormsg .= get_string('wwwrooterror', 'install').'<br />';
            $INSTALL['wwwrootform'] = $INSTALL['wwwroot'];
        }
    }
    if ($fh) fclose($fh);
-            
+
    /// check dirroot
    if (($fh = @fopen($INSTALL['dirrootform'].'/install.php', 'r')) === false ) {
        $errormsg .= get_string('dirrooterror', 'install').'<br />';
        $INSTALL['dirrootform'] = $INSTALL['dirroot'];
-    } 
+    }
    if ($fh) fclose($fh);

    /// check dataroot
@@ -240,7 +241,7 @@ if ($INSTALL['stage'] == DIRECTORY) {
    if (make_upload_directory('sessions', false) === false ) {
        $errormsg .= get_string('datarooterror', 'install').'<br />';
    }
-    if ($fh) fclose($fh); 
+    if ($fh) fclose($fh);

    if (!empty($errormsg)) $nextstage = DIRECTORY;

@@ -262,7 +263,7 @@ if ($INSTALL['stage'] == DATABASE) {
     } else {
         $INSTALL['skipdbencodingtest'] = false;
     }
-    
+
    /// different format for postgres7 by socket
    if ($INSTALL['dbtype'] == 'postgres7' and ($INSTALL['dbhost'] == 'localhost' || $INSTALL['dbhost'] == '127.0.0.1')) {
        $INSTALL['dbhost'] = "user='{$INSTALL['dbuser']}' password='{$INSTALL['dbpass']}' dbname='{$INSTALL['dbname']}'";
@@ -335,11 +336,11 @@ if ($INSTALL['stage'] == DATABASE) {

    if (empty($errormsg)) {

-        error_reporting(0);  // Hide errors 
+        error_reporting(0);  // Hide errors

        if (! $dbconnected = $db->Connect($INSTALL['dbhost'],$INSTALL['dbuser'],$INSTALL['dbpass'],$INSTALL['dbname'])) {
            /// The following doesn't seem to work but we're working on it
-            /// If you come up with a solution for creating a database in MySQL 
+            /// If you come up with a solution for creating a database in MySQL
            /// feel free to put it in and let us know
            if ($dbconnected = $db->Connect($INSTALL['dbhost'],$INSTALL['dbuser'],$INSTALL['dbpass'])) {
                switch ($INSTALL['dbtype']) {   /// Try to create a database
@@ -384,7 +385,7 @@ if ($INSTALL['stage'] == DATABASE) {
                                        $nextstage = DATABASE;
                                        $INSTALL['showskipdbencodingtest'] = true;
                                        $INSTALL['dbencodingtestresults'] = false;
-                                    } 
+                                    }
                                } else {
                                    $INSTALL['showskipdbencodingtest'] = true;
                                    $INSTALL['dbencodingtestresults'] = false;
@@ -449,7 +450,7 @@ if ($INSTALL['stage'] == DATABASE) {
 /// If we can open a file then we know that the admin name is correct.

 if ($nextstage == ADMIN or $INSTALL['stage'] == ADMIN) {
-    if (!ini_get('allow_url_fopen')) {
+    if (!ini_get('allow_url_fopen') || true) { // MDL-4218 fopen URL is not reliable
        $nextstage = ($goforward) ? ENVIRONMENT : DATABASE;
    } else if (($fh = @fopen($INSTALL['wwwrootform'].'/'.$INSTALL['admindirname'].'/environment.xml', 'r')) !== false) {
        $nextstage = ($goforward) ? ENVIRONMENT : DATABASE;
@@ -537,7 +538,7 @@ if ($INSTALL['stage'] == DOWNLOADLANG && $INSTALL['downloadlangpack']) {
        $INSTALL['showdownloadlangpack']   = false;
        $INSTALL['downloadlangpackerror']  = $downloaderror;
    }
-}    
+}



@@ -591,7 +592,7 @@ if ($nextstage == SAVE) {
        fwrite($fh, $str);
        fclose($fh);
    }
-        
+

    $INSTALL['config'] = $str;
 }
@@ -681,7 +682,7 @@ if (isset($_GET['help'])) {

    <tr>
        <td class="td_main" colspan="2">
-    
+
 <?php

 if (!empty($errormsg)) echo "<p class=\"errormsg\" align=\"center\">$errormsg</p>\n";
@@ -698,25 +699,25 @@ if ($nextstage == SAVE) {
        echo "<tr>\n";
        echo "<td width=\"33.3%\">&nbsp;</td>\n";
        echo "<td width=\"33.3%\">&nbsp;</td>\n";
-        echo "<td width=\"33.3%\" align=\"right\">\n";        
-        print_single_button("index.php", $options, get_string('continue')."  &raquo;");
+        echo "<td width=\"33.3%\" align=\"right\">\n";
+        print_single_button("index.php", $options, get_string('continue'));
        echo "</td>\n";
        echo "</tr>\n";
        echo "</table>\n";

    } else {
        echo "<p class=\"errormsg\">".get_string('configfilenotwritten', 'install')."</p>";
-        
+
        echo "<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" width=\"100%\">\n";
        echo "<tr>\n";
        echo "<td width=\"33.3%\">&nbsp;</td>\n";
-        echo "<td width=\"33.3%\" align=\"center\">\n";        
+        echo "<td width=\"33.3%\" align=\"center\">\n";
        $installoptions = array();
-        $installoptions['download'] = 1; 
+        $installoptions['download'] = 1;
        print_single_button("install.php", $installoptions, get_string('download', 'install'));
        echo "</td>\n";
-        echo "<td width=\"33.3%\" align=\"right\">\n";        
-        print_single_button("index.php", $options, get_string('continue')."  &raquo;");
+        echo "<td width=\"33.3%\" align=\"right\">\n";
+        print_single_button("index.php", $options, get_string('continue'));
        echo "</td>\n";
        echo "</tr>\n";
        echo "</table>\n";
@@ -753,7 +754,7 @@ if ($nextstage == SAVE) {



-<?php 
+<?php

 //==========================================================================//

@@ -771,6 +772,8 @@ function print_object($object) {
 function form_table($nextstage = WELCOME, $formaction = "install.php") {
    global $INSTALL, $db;

+    $enablenext = true;
+
    /// Print the standard form if we aren't in the DOWNLOADLANG page
    /// because it has its own form.
    if ($nextstage != DOWNLOADLANG) {
@@ -802,16 +805,20 @@ function form_table($nextstage = WELCOME, $formaction = "install.php") {
            break;
        case COMPATIBILITY: /// Compatibilty check
            $compatsuccess = true;
-            
+
            /// Check that PHP is of a sufficient version
            print_compatibility_row(inst_check_php_version(), get_string('phpversion', 'install'), get_string('phpversionerror', 'install'), 'phpversionhelp');
+            $enablenext = $enablenext && inst_check_php_version();
            /// Check session auto start
            print_compatibility_row(!ini_get_bool('session.auto_start'), get_string('sessionautostart', 'install'), get_string('sessionautostarterror', 'install'), 'sessionautostarthelp');
+            $enablenext = $enablenext && !ini_get_bool('session.auto_start');
            /// Check magic quotes
            print_compatibility_row(!ini_get_bool('magic_quotes_runtime'), get_string('magicquotesruntime', 'install'), get_string('magicquotesruntimeerror', 'install'), 'magicquotesruntimehelp');
+            $enablenext = $enablenext && !ini_get_bool('magic_quotes_runtime');
            /// Check unsupported PHP configuration
-            print_compatibility_row(ini_get_bool('magic_quotes_gpc') || (!ini_get_bool('register_globals')), get_string('globalsquotes', 'install'), get_string('globalsquoteserror', 'install'), 'globalsquoteshelp');
-            /// Check safe mode 
+            print_compatibility_row(!ini_get_bool('register_globals'), get_string('globalsquotes', 'install'), get_string('globalswarning', 'install'));
+            $enablenext = $enablenext && !ini_get_bool('register_globals');
+            /// Check safe mode
            print_compatibility_row(!ini_get_bool('safe_mode'), get_string('safemode', 'install'), get_string('safemodeerror', 'install'), 'safemodehelp', true);
            /// Check file uploads
            print_compatibility_row(ini_get_bool('file_uploads'), get_string('fileuploads', 'install'), get_string('fileuploadserror', 'install'), 'fileuploadshelp', true);
@@ -854,10 +861,10 @@ function form_table($nextstage = WELCOME, $formaction = "install.php") {
                <td class="td_right">
                <?php choose_from_menu (array('mysql' => get_string('mysql', 'install'),
                                              'oci8po' => get_string('oci8po', 'install'),
-                                              'postgres7' => get_string('postgres7', 'install'), 
-                                              'mssql' => get_string('mssql', 'install'), 
-                                              'mssql_n' => get_string('mssql_n', 'install'), 
-                                              'odbc_mssql' => get_string('odbc_mssql', 'install')), 
+                                              'postgres7' => get_string('postgres7', 'install'),
+                                              'mssql' => get_string('mssql', 'install'),
+                                              'mssql_n' => get_string('mssql_n', 'install'),
+                                              'odbc_mssql' => get_string('odbc_mssql', 'install')),
                                        'dbtype', $INSTALL['dbtype'], '', 'toggledbinfo();') ?>
                </td>
            </tr>
@@ -956,7 +963,7 @@ function form_table($nextstage = WELCOME, $formaction = "install.php") {
                        print_single_button('install.php', $options, get_string('downloadlanguagebutton','install', $languages[$INSTALL['language']]), 'POST');
                        print_simple_box_end();
                    } else {
-                /// Show result info 
+                /// Show result info
                    /// English lang packs aren't downloaded
                        if (substr($INSTALL['language'],0,2) == 'en') {
                            print_simple_box(get_string('downloadlanguagenotneeded', 'install', $languages[$INSTALL['language']]), 'center', '80%');
@@ -989,9 +996,11 @@ function form_table($nextstage = WELCOME, $formaction = "install.php") {
            <input type="hidden" name="stage" value="<?php echo $nextstage ?>" />
 <?php
    }
+
+    $disabled = $enablenext ? '' : 'disabled="disabled"';
 ?>

-            <?php echo ($nextstage < SAVE) ? "<input type=\"submit\" name=\"next\" value=\"".get_string('next')."  &raquo;\" style=\"float: right\"/>\n" : "&nbsp;\n" ?>
+            <?php echo ($nextstage < SAVE) ? "<input $disabled type=\"submit\" name=\"next\" value=\"".get_string('next')."  &raquo;\" style=\"float: right\"/>\n" : "&nbsp;\n" ?>
            <?php echo ($nextstage > WELCOME) ? "<input type=\"submit\" name=\"prev\" value=\"&laquo;  ".get_string('previous')."\" style=\"float: left\"/>\n" : "&nbsp;\n" ?>

 <?php
@@ -1006,7 +1015,7 @@ function form_table($nextstage = WELCOME, $formaction = "install.php") {
        </td>

    </tr>
-    
+
    </table>
 <?php
    if (!$needtoopenform) {
@@ -1035,7 +1044,9 @@ function print_compatibility_row($success, $testtext, $errormessage, $helpfield=
        echo "</p></td>\n";
        echo "<td valign=\"top\">";
        echo "<p>$errormessage ";
-        install_helpbutton("install.php?help=$helpfield");
+        if ($helpfield !== '') {
+            install_helpbutton("install.php?help=$helpfield");
+        }
        echo "</p></td>\n";
    }
    echo "</tr>\n";
@@ -1055,7 +1066,7 @@ function install_helpbutton($url, $title='') {
    echo "onClick=\"return window.open('$url', 'Help', 'menubar=0,location=0,scrollbars,resizable,width=500,height=400')\">";
    echo "</a>\n";
 }
-    
+


 //==========================================================================//
@@ -1154,7 +1165,7 @@ function css_styles() {
 <style type="text/css">

    body { background-color: #ffeece; }
-    p, li, td { 
+    p, li, td {
        font-family: helvetica, arial, sans-serif;
        font-size: 10pt;
    }
@@ -1231,6 +1242,18 @@ function css_styles() {
        font-size: 10pt;
        border-color: #ffc85f;
    }
+    table.environmenttable .error {
+        background-color : red;
+        color : inherit;
+    }
+
+    table.environmenttable .warn {
+        background-color : yellow;
+    }
+
+    table.environmenttable .ok {
+        background-color : lightgreen;
+    }
    .header {
        background-color: #fee6b9;
        font-size: 10pt;
@@ -7,12 +7,14 @@
 /// keep us informed using http://moodle.org/bugs Thanks!
 ///
 /// File generated by cvs://contrib/lang2installer/installer_builder
-/// using strings defined in installer_strings (same dir)
+/// using strings defined in stringnames.txt (same dir)

 $string['closewindow'] = 'Maak die venster toe';
 $string['continue'] = 'Gaan voort';
+$string['doyouagree'] = 'Het jy die voorwaardes gelees en verstaan jy dit?';
 $string['error'] = 'Fout';
 $string['help'] = 'Help';
+$string['invalidemail'] = 'Ongeldige email adres';
 $string['language'] = 'Taal';
 $string['name'] = 'Naam';
 $string['next'] = 'Volgende';
@@ -7,11 +7,12 @@
 /// keep us informed using http://moodle.org/bugs Thanks!
 ///
 /// File generated by cvs://contrib/lang2installer/installer_builder
-/// using strings defined in installer_strings (same dir)
+/// using strings defined in stringnames.txt (same dir)

 $string['admindirerror'] = 'مجلد الإدارة المحدد غير صحيح';
 $string['admindirname'] = 'مجلد الإدارة';
 $string['admindirsettinghead'] = 'أعداد دليل المدير';
+$string['availablelangs'] = 'حزم اللغة المتوفره';
 $string['bypassed'] = 'مرور';
 $string['cannotcreatelangdir'] = 'لم يتم أنشاء دليل اللغة';
 $string['cannotcreatetempdir'] = 'لم يتم أنشاء الدليل المؤقت';
@@ -23,10 +24,13 @@ $string['cannotsavezipfile'] = 'لم يتم حفظ الملف المضغوط';
 $string['cannotunzipfile'] = 'لم يتم فك الملف المضغوط';
 $string['caution'] = 'تحذير';
 $string['check'] = 'أختر';
+$string['chooselanguage'] = 'اختر اللغة';
 $string['chooselanguagehead'] = 'اختر اللغة';
 $string['closewindow'] = 'أغلق هذه النافذة';
+$string['compatibilitysettings'] = 'أفحص إعدادات الـ PHP';
 $string['compatibilitysettingshead'] = 'أفحص إعدادات الـ PHP';
 $string['configfilewritten'] = 'تم انشاء ملف config.php بنجاح';
+$string['configurationcomplete'] = 'تمت عملية الإعداد';
 $string['configurationcompletehead'] = 'تمت عملية الإعداد';
 $string['continue'] = 'استمر';
 $string['database'] = 'قاعدة بيانات';
@@ -35,13 +39,15 @@ $string['datarooterror'] = 'إعداد المعلومات غير صحيح';
 $string['dbconnectionerror'] = 'لم يتم التوصيل بقاعدة البيانات المحددة. تأكد من إعدادات قاعدة البيانات.';
 $string['dbcreationerror'] = 'خطاء في إنشاء قاعدة البيانات. لم يم انشاء قاعدة البيانات المسماه في الأعدادات المعطاه.';
 $string['dbhost'] = 'الخادم المضيف';
+$string['dbpass'] = 'كلمة مرور';
 $string['dbprefix'] = 'مقدمة الجداول';
 $string['dbtype'] = 'نوع';
 $string['dirroot'] = 'دليل مودل';
 $string['dirrooterror'] = 'إعدادّّّ\"المجلد\" غير صحيح. حاول إعادة الإعداد';
 $string['download'] = 'تنزيل';
 $string['downloadlanguagehead'] = 'تنزيل حزمة اللغة';
-$string['environmenterrortodo'] = 'يجب عليك تصحيح كل المشاكل (الأخطاء) الموضحه أعلاه قبل الأستمرار في ثتبيت هذا الأصدار لمودل';
+$string['doyouagree'] = 'هل قمت بقراءة هذه الشروط واستيعابها؟';
+$string['environmenterrortodo'] = 'يجب عليك تصحيح كل المشاكل (الأخطاء) الموضحه أعلاه قبل الأستمرار في ثتبيت هذا الأصدار لموّدل';
 $string['environmenthead'] = 'يتم فحص البيئة';
 $string['environmentrecommendinstall'] = 'ينصح بتثبيته/تمكينه';
 $string['environmentrecommendversion'] = 'يفضل الأصدار a$->needed ، وانت تستخدم الأصدار a$->current';
@@ -57,11 +63,13 @@ $string['help'] = 'مساعدة';
 $string['iconvrecommended'] = 'ينصح بشدة تثبيت مكتبة ICONV الاختيارية وذلك لتحسين أداء موقعك خصوصا لو كنت تستخدم لغات غير لاتينيه.';
 $string['info'] = 'معلومات';
 $string['installation'] = 'تثبيت';
+$string['invalidemail'] = 'عنوان البريد الإلكتروني غير صحيح';
 $string['language'] = 'اللغة';
 $string['magicquotesruntimeerror'] = 'هذا يجب ان يكون معطل';
 $string['mbstringrecommended'] = 'يفضل وبشدة تثبيت مكتبة (MBSTRING) الاختيارية وذلك لتسحين اداء الموقع وبذات لوكان موقعك يدعم لغات غير لاتينية.';
 $string['memorylimit'] = 'حد الذاكرة';
 $string['memorylimiterror'] = 'ذاكرة الـ PHP صغيرة جداً... من المحتل ستواجه بعض المشاكل لاحقاً';
+$string['missingrequiredfield'] = 'بعض الحقول المطلوبة مفقودة';
 $string['moodledocslink'] = 'وثائق مودل لهذه الصفحة';
 $string['mysql416bypassed'] = 'على الرغم من أن موقعك يستخدم iso-8859-1 للغات (اللأتينية)فقط، يمكنك الأستمرار في استخدام MySQL 4.1.12 أو أعلى المثبتة حاليا.';
 $string['mysql416required'] = 'MySQL 4.1.16 هي الأصدار الأقل المطلوب لاتثبيت أصدار مودل 1.6 وذلك لضمان إمكانية تحويل جميع البيانات إلى UTF-8 في المستقبل.';
@@ -72,7 +80,7 @@ $string['parentlanguage'] = 'المترجمون: أذا كانت لغتك لها
 $string['pass'] = 'اجتياز';
 $string['password'] = 'كلمة المرور';
 $string['phpversion'] = 'أصدار PHP';
-$string['phpversionerror'] = 'يجب ان يكون إصدار PHP 4.1.0 على الاقل ';
+$string['phpversionerror'] = 'يجب ان يكون إصدار PHP 4.1.0 على الاقل';
 $string['phpversionhelp'] = '<p> يتطلب مودل على الاقل الأصدار 4.1.0 لـ PHP </p>
 <p> انت تستخدم الأصدار $a </p>
 <p> يجب عليك ترقية PHP أو الانتقال إلى مستظيف أخر لديه أصدار اجد لـ PHP.</p>';
@@ -83,9 +91,12 @@ $string['safemode'] = 'وضع الامان';
 $string['safemodeerror'] = 'من الممكن ان مودل يواجه مشاكل عندما يكون وضع الامان نشط';
 $string['sessionautostart'] = 'البدء الآلي للجلسة';
 $string['sessionautostarterror'] = 'يجب أن يكون هذا معطل';
+$string['sessionautostarthelp'] = '<p> يتطلب مودل لدعم الجلسات وبدونها لا يستطع العمل.</p>
+<p>.يمكن تمكين الجلسات من خلال ملف php.in ...ابحث عن session.auto_start  </p>';
 $string['skipdbencodingtest'] = 'تخطى اختبار تشفير قاعدة البيانات';
 $string['status'] = 'الحالة';
 $string['thischarset'] = 'UTF-8';
+$string['thisdirection'] = 'rtl';
 $string['thislanguage'] = 'عربي';
 $string['user'] = 'مستخدم';
 $string['wwwroot'] = 'WWW';
@@ -7,27 +7,36 @@
 /// keep us informed using http://moodle.org/bugs Thanks!
 ///
 /// File generated by cvs://contrib/lang2installer/installer_builder
-/// using strings defined in installer_strings (same dir)
+/// using strings defined in stringnames.txt (same dir)

 $string['admindirerror'] = 'Абраны каталог адміністратара няслушны';
 $string['admindirname'] = 'Каталог адміністратара';
+$string['admindirsetting'] = 'Толькі некаторыя web-сайты выкарыстоўваюць /admin як спецыяльны адрас для доступу да панелі кіравання ці іншага. На жаль, ён канфліктуе з стандартным змяшчэннем старонак адміністравання Moodle. Вы можаце адрэдагаваць гэтую памылку, пераназваў папку admin ў вашай інсталяцыі і пазначыў яе імя тут. Напрыклад:
+<br /> <br /><b>moodleadmin</b><br /> <br />
+Будзе правільная настроўваць спасылкі на admin ў Moodle.';
 $string['caution'] = 'Папярэджанне';
+$string['chooselanguage'] = 'Выбярыце мову';
 $string['closewindow'] = 'Згарнуць вакно';
+$string['compatibilitysettings'] = 'Праверка настроек PHP...';
 $string['configfilenotwritten'] = 'Скрыпт ўстаноўкі не змог аўтаматычна стварыць файл config.php, які ўтрымлівае Вамі абраныя настроўкі, па прычыне, што нельга пісаць у папку з устаноўкай Moodle. Вы можаце ўручную скапіяваць наступны код ў файл з назвай config.php і змясць яго ў карнявую папку ўстаноўкі Moodle.';
 $string['configfilewritten'] = 'config.php быў паспяхова створаны';
+$string['configurationcomplete'] = 'Настройка завершаная';
 $string['continue'] = 'Працягнуць';
 $string['database'] = 'База Дадзеных';
 $string['dataroot'] = 'Каталог дадзеных';
 $string['dbhost'] = 'Хост сэрвера';
+$string['dbpass'] = 'Пароль';
 $string['dbprefix'] = 'Прэфікс табліцаў';
 $string['dbtype'] = 'Тып';
 $string['dirroot'] = 'Каталог Moodle';
 $string['download'] = 'Загрузіць';
+$string['doyouagree'] = 'Ці прачыталі Вы ўмовы?';
 $string['error'] = 'Памылка';
 $string['fail'] = 'Памылка';
 $string['gdversion'] = 'GD версія';
 $string['help'] = 'Дапамога';
 $string['installation'] = 'Ладаванне';
+$string['invalidemail'] = 'Няправільны фармат для e-mail';
 $string['language'] = 'Мова';
 $string['memorylimit'] = 'Мяжа памяці';
 $string['name'] = 'Назва';
@@ -37,6 +46,7 @@ $string['password'] = 'Пароль';
 $string['previous'] = 'Папярэдні';
 $string['status'] = 'Статус';
 $string['thischarset'] = 'UTF-8';
+$string['thisdirection'] = 'ltr';
 $string['thislanguage'] = 'Беларуская';
 $string['user'] = 'Карыстальнік';
 ?>
@@ -7,13 +7,15 @@
 /// keep us informed using http://moodle.org/bugs Thanks!
 ///
 /// File generated by cvs://contrib/lang2installer/installer_builder
-/// using strings defined in installer_strings (same dir)
+/// using strings defined in stringnames.txt (same dir)

 $string['closewindow'] = 'Затваряне на прозореца';
 $string['continue'] = 'Напред';
+$string['doyouagree'] = 'Прочетохте ли и разбрахте ли условията?';
 $string['error'] = 'Грешка';
 $string['help'] = 'Помощ';
 $string['info'] = "Information";
+$string['invalidemail'] = 'Невалиден електронен адрес';
 $string['language'] = 'Език';
 $string['name'] = 'Име';
 $string['next'] = 'Напред';
@@ -22,6 +24,7 @@ $string['password'] = 'Парола';
 $string['previous'] = 'Предишен';
 $string['status'] = 'Състояние';
 $string['thischarset'] = 'UTF-8';
+$string['thisdirection'] = 'ltr';
 $string['thislanguage'] = 'Български';
 $string['user'] = 'Потребител';
 ?>
@@ -0,0 +1,16 @@
+<?php
+/// Please, do not edit this file manually! It's auto generated from
+/// contents stored in your standard lang pack files:
+/// (langconfig.php, install.php, moodle.php, admin.php and error.php)
+///
+/// If you find some missing string in Moodle installation, please,
+/// keep us informed using http://moodle.org/bugs Thanks!
+///
+/// File generated by cvs://contrib/lang2installer/installer_builder
+/// using strings defined in stringnames.txt (same dir)
+
+$string['availablelangs'] = 'যে সমস্ত ভাষা ব্যাবহার করতে পারেন';
+$string['thischarset'] = 'UTF-8';
+$string['thisdirection'] = 'ltr';
+$string['thislanguage'] = 'বাংলা';
+?>
@@ -7,30 +7,60 @@
 /// keep us informed using http://moodle.org/bugs Thanks!
 ///
 /// File generated by cvs://contrib/lang2installer/installer_builder
-/// using strings defined in installer_strings (same dir)
+/// using strings defined in stringnames.txt (same dir)

 $string['admindirerror'] = 'Određeni administratorski direktorij je nepravilan';
 $string['admindirname'] = 'Administratorski direktorij';
+$string['admindirsetting'] = 'Veoma nekoliko ili priližno nekoliko webhostova koristi administrator kao specijalni URL za Vaš pristup kontrolnoj ploči. Na nesreću ovo je konflikt sa standardnom lokacijom za Moodle administratorsku stranicu. Možete ovo fiksirati preimenovanjem administratorskog direktorija u Vašoj instalaciji, postavijajući ovdje novo ime. Na primjer: <br /> <br /><b>moodleadmin</b><br /> <br />
+Ovo će fiksirati administratorski link na Moodle.';
 $string['caution'] = 'Pažnja';
+$string['chooselanguage'] = 'Izaberite jezik';
 $string['closewindow'] = 'Zatvorite prozor';
+$string['compatibilitysettings'] = 'Provjerite Vaša PHP podešavanja ...';
 $string['configfilenotwritten'] = 'Instalacijska skripta nije u mogućnosti da automatski kreira config.php datoteku koja obuhvata Vaše izabrano podešavanje, vjerovatno zbog Moodle direktorija koji nije pisan. Možete ručno kopirati prateći kod u ime fajla config.php unutar osnovnog direktorija za Moodle.';
 $string['configfilewritten'] = 'config.php je bio uspješno kreiran';
+$string['configurationcomplete'] = 'Konfiguracija je kompletirana';
 $string['continue'] = 'Nastavak';
 $string['database'] = 'Baza podataka';
+$string['databasesettings'] = 'Sada Vam je potrebno da konfigurišete bazu podataka gdje će i većina Moodle podataka biti pohranjena. Ova baza podataka već mora biti kreirana i korisničko ime i lozinku kreirajte da je dostupno.<br />
+<br /> <br />
+<b>Tip:</b> mysql or postgres7<br />
+<b>Glavni:</b> eg lokalhost ili db.isp.com<br />
+<b>Ime:</b> ime baze podataka, eg moodle<br />
+<b>Korisnik:</b> Vaše korisničko ime baze podataka<br />
+<b>Lozinka:</b> your database password<br />
+<b>Tabelarni prefiks:</b> alternativni prefiks da koristi svim imenima tabela';
 $string['dataroot'] = 'Direktorij podataka';
 $string['datarooterror'] = '\'Directorij podataka\' koji ste naveli ne može biti pronađen ili kreiran.  Svaka korekcija puta ili pravljenja ručno tog direktorija.';
 $string['dbconnectionerror'] = 'Ne možemo se spojiti na bazu podataka koju ste naveli. Molimo Vas da provjerite svoja podešavanja baze podataka.';
 $string['dbcreationerror'] = 'Greška prilikom pravljenja baze podataka. Ne možete napraviti ime date baze podataka sa predviđenim podešavanjima';
 $string['dbhost'] = 'Glavni server';
+$string['dbpass'] = 'Lozinka';
 $string['dbprefix'] = 'Lista prefiksa';
 $string['dbtype'] = 'Tip';
+$string['directorysettings'] = '<p>Molim Vas potvrdite lokaciju ove Moodle instalacije.</p>
+
+<p><b>Web Adresa:</b>
+Navedite punu web adresu gdje će Moodle biti dostupan. Ako je Vaš web sajt dostupan preko više URLa tada izaberite što prirodniji jedan od onih koje će Vaši studenti koristiti. Ne uključujte prateću crticu.</p>
+
+<p><b>Moodle Directorij:</b>
+Navedite punu putanju direktorija za ovu instalaciju. Budite sigurni da je gornji/donji slučaj tačan.</p>
+
+<p><b>Directorij podataka:</b>
+Potrebno Vam je mjesto gdje Moodle možete spasiti učitavajući datoteke. Ovaj direktorij bi trebao biti čitljiv i pisan od web server korisnika (obično \'niko\' ili \'apache\'), ali to neće biti direktno pristupačno od weba.</p>';
 $string['dirroot'] = 'Direktorij Moodla';
 $string['dirrooterror'] = 'Podešavanje \'Direktorija Moodla\' izgleda je netačno - ne možemo tamo naći Moodle instalaciju. Niža vrijednost će biti ponovo dovedena na početni položaj.';
 $string['download'] = 'Preuzeti';
+$string['doyouagree'] = 'Da li ste pročitali i razumjeli ove uslove?';
 $string['error'] = 'Greška';
 $string['fail'] = 'Izostati';
 $string['fileuploads'] = 'Katalog za učitavanja datoteka';
 $string['fileuploadserror'] = 'Ovo bi trebalo biti uključeno';
+$string['fileuploadshelp'] = '<p>Katalog za učitavanje datoteka izgleda da je nedostupan na Vašem serveru.</p>
+
+<p>Moodle još uvijek može biti instaliran, ali bez ove mogućnosti, nećete biti u mogućnosti da učitavate datoteke kursa ili duplikate novih korisničkih profila.</p>
+
+<p>Da učitavanje datoteke bude dostupno Vi (ili Vaš sistem administratora) trebat ćete promijeniti svoju php.ini datoteku na Vašem sistemu i promijeniti podešavanja za <b>katalog_ucitavanja_datoteka</b> to \'1\'.</p>';
 $string['gdversion'] = 'GD verzija';
 $string['gdversionerror'] = 'GD datoteka sa izvornim kodom trebala bi prezentirati proces i kreirati duplikate';
 $string['gdversionhelp'] = '<p>Vaš server neće izgledati isto imajući GD instalaciju.</p>
@@ -42,19 +72,27 @@ $string['gdversionhelp'] = '<p>Vaš server neće izgledati isto imajući GD inst
 <p>Na osnovu Windows obično možete podesiti php.ini i ne bilježiti liniju referencirajući php_gd2.dll.</p>';
 $string['help'] = 'Pomoć';
 $string['installation'] = 'Instalacija';
+$string['invalidemail'] = 'Pogrešna elektronska adresa';
 $string['language'] = 'Jezik';
 $string['magicquotesruntime'] = 'Čari naznake vremenskog kretanja';
 $string['magicquotesruntimeerror'] = 'Ovo bi trebalo biti isključeno';
+$string['magicquotesruntimehelp'] = '<p>Čini kvote vremena pokretanja trebalo bi isključiti da Moodle propisno funkcioniše.</p>
+
+<p>Normalno ovo je isključeno po podrazumijevanoj vrijednosti ... pogledaj podešavanje<b>cini_kvote_vremena_pokretanja </b> na Vašoj php.ini datoteci.</p>
+
+<p>Ako nemate pristu na Vaš php.ini, moći ćete biti u mogućnosti da ocjenite prateći liniju u datoteci pozivajući .htapristup unutar Vašeg Moodle direktorija:  <blocquote>php_vrijednost_cina_kvote_vremena_pokretanja isključeno</blockquote>
+</p>   
+   ';
 $string['memorylimit'] = 'Ograničenje memorije';
 $string['memorylimiterror'] = 'PHP ograničenje je podešeno na potpuno malo memorije ... kasnije se možete kretati unutar problema.';
 $string['memorylimithelp'] = '<p>PHP ograničenje memorije za Vaš server je trenutno podešeno na $a.</p>

 <p>Ovo možda prouzrokuje Moodlu da kasnije ima problema sa memorijom, posebno ako imate mnogo dozvoljenih modula i /ili mnogo korisnika.</p>

-<p>Preporučujemo Vam da konfigurišete PHP sa  visokim ograničenjem ako je moguće, kao 16M. Čineći ovo tamo je nekoliko načina pa možete pokušati: </p><ol>
+<p>Preporučujemo Vam da konfigurišete PHP sa  visokim ograničenjem ako je moguće, kao 40M. Čineći ovo tamo je nekoliko načina pa možete pokušati: </p><ol>
 <li>Ako ste, opet kompajlisati PHP sa <i>--dostupnim-memorijskim-ograničenjem</i>. Ovo će dozvoliti Moodle da postavi memorijsko ograničenje sam za sebe.</li>
-<li>Ako imate pristup na Vašu php.ini datoteku, možete promijeniti <b>memorijsko_ograničenje</b> podešavanje u nešto kao ovo 16M. Ako nemate pristup možete pitati svog administratora da to uradi za Vas.</li>
-<li>Na nekim PHP serverima možete kreirati  a.ht pristupnu datoteku u Moodle direktoriju koji se sadrži na ovoj liniji:<br /><blockquote>php_vrijednost memorijskog_ograničenja 16M</blockquote></li>
+<li>Ako imate pristup na Vašu php.ini datoteku, možete promijeniti <b>memorijsko_ograničenje</b> podešavanje u nešto kao ovo 40M. Ako nemate pristup možete pitati svog administratora da to uradi za Vas.</li>
+<li>Na nekim PHP serverima možete kreirati  a.ht pristupnu datoteku u Moodle direktoriju koji se sadrži na ovoj liniji:<br /><blockquote>php_vrijednost memorijskog_ograničenja 40M</blockquote></li>
 <br />Kakogod, na istom serveru ovo izbjegavajte <b>sve</b> PHP stranice za rad (vidjet ćete grešku prilkom pregleda stranice) ćete na njima morati izbrisati .htpristupnu datoteku. </li></ol>';
 $string['mysqlextensionisnotpresentinphp'] = 'PHP neće biti propisno konfigurisan sa MySQL ekstenzijom tako da može komunicirati sa  MySQL.  Molimo Vas da provjerite svoju php.ini datoteku ili opet kompajlišite PHP.';
 $string['name'] = 'Ime';
@@ -70,10 +108,19 @@ $string['phpversionhelp'] = '<p>Moodle zahtijeva najmanju PHP verziju 4.1.0.</p>
 $string['previous'] = 'Prijethodni';
 $string['safemode'] = 'Safe Mode';
 $string['safemodeerror'] = 'Moodle može imati problema sa uključenim safe mode-om';
+$string['safemodehelp'] = '<p>Moodle može imati različite probleme sa ukljiučenim safe modom, ni najmanji taj problem vjerovatno neće dozvoliti kreiranje novih datoteka.</p>
+   
+<p>Safe mode je obično jedino dozvoljen od paranoične javnosti web gostiju, tako da Vi možete imati jednostavnu potražnju nove web gostujuće kompanije za Vaš Moodle sajt.</p>
+   
+<p>Možete pokušati nastaviti sa instalacijom ako želite, ali očekujte nekoliko problema kasnije.</p>';
 $string['sessionautostart'] = 'Automatski početak akcije';
 $string['sessionautostarterror'] = 'Ovo bi trebalo biti isključeno';
+$string['sessionautostarthelp'] = '<p>Moodle zahtijeva podršku za postupanje i neće funcionisati bez toga.</p>
+
+<p>Etapa u radu može biti dozvoljena u php.ini datoteci ... pogledajte za postupanje.auto_start parameter.</p>';
 $string['status'] = 'Status';
 $string['thischarset'] = 'UTF-8';
+$string['thisdirection'] = 'ltr';
 $string['thislanguage'] = 'Bosanski';
 $string['user'] = 'Korisnik';
 $string['wwwroot'] = 'Web adresa';
@@ -7,15 +7,28 @@
 /// keep us informed using http://moodle.org/bugs Thanks!
 ///
 /// File generated by cvs://contrib/lang2installer/installer_builder
-/// using strings defined in installer_strings (same dir)
+/// using strings defined in stringnames.txt (same dir)

+$string['aborting'] = 'S\'està interrompent la instal·lació';
 $string['admindirerror'] = 'El directori d\'administració especificat és incorrecte';
 $string['admindirname'] = 'Directori d\'administració';
+$string['admindirsetting'] = 'Alguns servidors web utilitzen un URL especial /admin per accedir a un tauler de control o quelcom semblant. Malauradament aquesta és també la ubicació estàndard de les pàgines d\'administració de Moodle. Podeu arreglar aquest problema canviant el nom del directori d\'administració de Moodle en la vostra instal·lació i posant el nou nom aquí. Per exemple:<br /> <br /><b>moodleadmin</b><br /> <br />
+Això modificarà els enllaços d\'administració de Moodle.';
 $string['admindirsettinghead'] = 'S\'està configurant el directori d\'administració...';
 $string['admindirsettingsub'] = 'Alguns proveïdors d\'espai web utilitzen /admin com una adreça URL especial per accedir a un tauler de control o quelcom semblant. Malauradament això interfereix amb la ubicació estàndard de les pàgines d\'administració de Moodle. Podeu solucionar aquest problema canviant el nom del directori admin en la vostra instal·lació i introduint aquí el nou nom. Per exemple: <br /> <br /><b>moodleadmin</b><br /> <br />
 Això repararà tots els enllaços d\'administració de Moodle.';
+$string['adminemail'] = 'Correu electrònic:';
+$string['adminfirstname'] = 'Nom:';
+$string['admininfo'] = 'Dades de l\'administrador';
+$string['adminlastname'] = 'Cognoms:';
+$string['adminpassword'] = 'Contrasenya:';
+$string['adminusername'] = 'Nom d\'usuari/ària';
+$string['askcontinue'] = 'Continua (sí/no)';
+$string['availabledbtypes'] = 'Tipus de base de dades disponibles';
+$string['availablelangs'] = 'Llista d\'idiomes disponibles';
 $string['bypassed'] = 'S\'ha deixat de banda';
-$string['cannotcreatelangdir'] = 'No es pot crear el directori d\'idiomes.';
+$string['cannotconnecttodb'] = 'No es pot obrir la connexió amb la base de dades';
+$string['cannotcreatelangdir'] = 'No s\'ha pogut crear el directori d\'idiomes.';
 $string['cannotcreatetempdir'] = 'No s\'ha pogut crear el directori temporal';
 $string['cannotdownloadcomponents'] = 'No s\'han pogut baixar components';
 $string['cannotdownloadzipfile'] = 'No s\'ha pogut baixar el fitxer zip';
@@ -24,20 +37,39 @@ $string['cannotsavemd5file'] = 'No s\'ha pogut desar el fitxer md5';
 $string['cannotsavezipfile'] = 'No s\'ha pogut desar el fitxer zip';
 $string['cannotunzipfile'] = 'No s\'ha pogut descomprimir el fitxer';
 $string['caution'] = 'Alerta';
-$string['check'] = 'Activa';
+$string['check'] = 'Reviseu';
+$string['checkingphpsettings'] = 'S\'estan comprovant els paràmetres del PHP';
+$string['chooselanguage'] = 'Trieu un idioma';
 $string['chooselanguagehead'] = 'Trieu un idioma';
 $string['chooselanguagesub'] = 'Trieu un idioma NOMÉS per a la instal·lació. En una pantalla posterior podreu triar idiomes per al lloc i per als usuaris.';
 $string['closewindow'] = 'Tanca aquesta finestra';
+$string['compatibilitysettings'] = 'S\'estan comprovant els paràmetres del PHP...';
 $string['compatibilitysettingshead'] = 'S\'estan comprovant els paràmetres del PHP...';
 $string['compatibilitysettingssub'] = 'El vostre servidor hauria de passar totes aquestes proves per tal que Moodle funcioni correctament.';
 $string['componentisuptodate'] = 'El component està al dia';
+$string['configfilecreated'] = 'El fitxer de configuració s\'ha creat correctament';
+$string['configfiledoesnotexist'] = 'El fitxer de configuració no existeix';
 $string['configfilenotwritten'] = 'La seqüència d\'instal·lació no ha estat capaç de crear automàticament un fitxer config.php que contingui els paràmetres que heu triat, probablement perquè no pugui escriure al directori de Moodle. Podeu copiar a mà el codi següent en un fitxer anomenat config.php dins del directori arrel de Moodle.';
-$string['configfilewritten'] = 'S\'ha creat amb èxit el fitxer config.php';
+$string['configfilewritten'] = 'S\'ha creat correctament el fitxer config.php';
+$string['configurationcomplete'] = 'S\'ha completat la configuració';
 $string['configurationcompletehead'] = 'S\'ha completat la configuració';
 $string['configurationcompletesub'] = 'Moodle ha intentat desar la configuració en un fitxer en l\'arrel de la vostra instal·lació de Moodle.';
+$string['configurationfileexist'] = 'Ja existeix un fitxer de configuració';
 $string['continue'] = 'Continua';
+$string['creatingconfigfile'] = 'S\'està  creant el fitxer de configuració...';
+$string['ctyperecommended'] = 'Es recomana instal·lar l\'extensió de PHP ctype a fi de millorar el rendiment del lloc, especialment si teniu usuaris que treballen amb idiomes no occidentals.';
+$string['ctyperequired'] = 'A hores d\'ara Moodle requereix l\'extensió de PHP ctype, a fi de millorar el rendiment del lloc i oferir compatibilitat amb diferents idiomes.';
 $string['curlrecommended'] = 'Es recomana instal·lar la biblioteca opcional Curl a fi d\'habilitar la funcionalitat de Moodle en Xarxa.';
+$string['curlrequired'] = 'L\'extensió de PHP cURL és ara necessària per a comunicar-se amb repositoris Moodle.';
+$string['customcheck'] = 'Altres comprovacions';
 $string['database'] = 'Base de dades';
+$string['databasecreationsettings'] = 'Ara cal configurar els paràmetres de la base de dades on s\'emmagatzemara la majoria de dades de Moodle. L\'instal·lador Moodle4Windows crearà automàticament aquesta base de dades amb els paràmetres que especifiqueu aquí.<br /><br /><br />
+<b>Tipus:</b> mysql (determinat per l\'instal·lador).<br />
+<b>Servidor:</b> localhost (determinat per l\'instal·lador.<br />
+<b>Nom:</b> nom de la base de dades, p. ex. moodle.<br />
+<b>Usuari:</b> root (determinat per l\'instal·lador).<br />
+<b>Contrasenya</b>: la vostra contrasenya per a la base de dades.<br />
+<b>Prefix de les taules:</b>: prefix opcional per als noms de les taules.';
 $string['databasecreationsettingshead'] = 'Ara cal configurar els paràmetres de la base de dades on s\'emmagatzemaran la majoria de dades de Moodle. L\'instal·lador crearà automàticament aquesta base de dades amb els paràmetres que especifiqueu aquí.';
 $string['databasecreationsettingssub'] = '<b>Tipus:</b> fixat a \"mysql\" per l\'instal·lador<br />
 <b>Servidor:</b> fixat a \"localhost\" per l\'instal·lador<br />
@@ -45,7 +77,19 @@ $string['databasecreationsettingssub'] = '<b>Tipus:</b> fixat a \"mysql\" per l\
 <b>Usuari:</b> fixat a \"root\" per l\'instal·lador<br />
 <b>Contrasenya:</b> la contrasenya de l\'usuari \"root\" de la base de dades<br />
 <b>Prefix de les taules:</b> prefix opcional per utilitzar en els noms de totes les taules';
-$string['databasesettingshead'] = 'Ara cal configurar la base de dades on s\'emmagatzemaran la majoria de dades de Moodle. Aquesta base de dades s\'ha d\'haver crear abans i cal tenir un nom d\'usuari i una contrasenya per accedir-hi.';
+$string['databasehost'] = 'Servidor de base de dades:';
+$string['databasename'] = 'Nom de la base de dades:';
+$string['databasepass'] = 'Contrasenya de la base de dades:';
+$string['databasesettings'] = 'Ara cal configurar la base de dades on s\'emmagatzemaran la majoria de dades de Moodle. Aquesta base de dades s\'ha d\'haver creat abans i cal tenir un nom d\'usuari i una contrasenya per accedir-hi.<br />
+<br /> <br />
+<b>Tipus:</b> mysql o postgres7<br />
+<b>Servidor:</b> p. ex. localhost o db.isp.com<br />
+<b>Nom:</b> nom de la base de dades, p. ex. moodle<br />
+<b>Usuari:</b> nom de l\'usuari de la base de dades<br />
+<b>Contrasenya:</b> contrasenya de l\'usuari de la base de dades<br />
+<b>Prefix de les taules:</b> prefix opcional per utilitzar en els noms de totes les taules';
+$string['databasesettingsformoodle'] = 'Paràmetres de la base de dades de Moodle';
+$string['databasesettingshead'] = 'Ara cal configurar la base de dades on s\'emmagatzemaran la majoria de dades de Moodle. Aquesta base de dades s\'ha d\'haver creat abans i cal tenir un nom d\'usuari i una contrasenya per accedir-hi.';
 $string['databasesettingssub'] = '<b>Tipus:</b> mysql o postgres7<br />
 <b>Servidor:</b> p. ex. localhost o db.isp.com<br />
 <b>Nom:</b> nom de la base de dades, p. ex. moodle<br />
@@ -70,6 +114,12 @@ $string['databasesettingssub_mysql'] = '<b>Tipus:</b> MySQL<br />
 <b>Usuari:</b> el vostre nom d\'usuari de la base de dades<br />
 <b>Contrasenya:</b> la vostra contrasenya de la base de dades<br />
 <b>Prefix de les taules:</b> prefix que cal anteposar als noms de totes les taules (opcional)';
+$string['databasesettingssub_mysqli'] = '<b>Tipus:</b> MySQL Improved<br />
+<b>Servidor:</b> p. ex. localhost o db.isp.com<br />
+<b>Nom:</b> nom de la base de dades, p. ex. moodle<br />
+<b>Usuari:</b> el vostre nom d\'usuari de la base de dades<br />
+<b>Contrasenya:</b> la vostra contrasenya de la base de dades<br />
+<b>Prefix de les taules:</b> prefix que cal anteposar als noms de totes les taules (opcional)';
 $string['databasesettingssub_oci8po'] = '<b>Tipus:</b> Oracle<br />
 <b>Servidor:</b> no utilitzat, s\'ha de deixar en blanc<br />
 <b>Nom:</b> nom de la connexió tnsnames.ora<br />
@@ -88,17 +138,38 @@ $string['databasesettingssub_postgres7'] = '<b>Tipus:</b> PostgreSQL<br />
 <b>Usuari:</b> el vostre nom d\'usuari de la base de dades<br />
 <b>Contrasenya:</b> la vostra contrasenya de la base de dades<br />
 <b>Prefix de les taules:</b> prefix que cal anteposar als noms de totes les taules (obligatori)';
+$string['databasesettingssub_sqlite3_pdo'] = '<b>Tipus:</b> SQLite 3 (PDO) <b><strong class=\"errormsg\">Experimental! (no l\'utilitzeu en producció)</strong></b><br />
+<b>Servidor:</b> camí (complet) del directori on es desarà el fitxer de la base de dades; en blanc o localhost per utilitzar el directori de dades de Moodle<br />
+<b>Nom:</b> nom de la base de dades, p. ex. moodle (opcional)<br />
+<b>Usuari:</b> el vostre nom d\'usuari de la base de dades (opcional)<br />
+<b>Contrasenya:</b> la vostra contrasenya de la base de dades (opcional)<br />
+<b>Prefix de les taules:</b> prefix que cal anteposar als noms de totes les taules (obligatori)<br />
+El nom del fitxer de la base de dades es determinarà mitjançant el nom d\'usuari, el nom de la base de dades i la contrasenya que definiu més amunt.';
+$string['databasesettingswillbecreated'] = '<strong>Nota</strong >: l\'instal·lador intentarà crear automàticament la base de dades si no existeix.';
+$string['databasetype'] = 'Tipus de base de dades:';
+$string['databaseuser'] = 'Usuari de la base de dades:';
 $string['dataroot'] = 'Directori de dades';
 $string['datarooterror'] = 'No s\'ha pogut trobar o crear el directori de dades que heu especificat. Corregiu el camí o creeu el directori a mà.';
 $string['dbconnectionerror'] = 'No es pot obrir la connexió amb la base de dades que heu especificat. Comproveu els paràmetres de la base de dades.';
 $string['dbcreationerror'] = 'Error en la creació de la base de dades. No s\'ha pogut crear la base de dades amb els paràmetres proporcionats.';
 $string['dbhost'] = 'Ordinador servidor';
+$string['dbpass'] = 'Contrasenya';
 $string['dbprefix'] = 'Prefix de taules';
 $string['dbtype'] = 'Tipus';
 $string['dbwrongencoding'] = 'La base de dades que heu seleccionat està funcionant amb una codificació ($a) no recomanada. Seria millor utilitzar una base de dades amb codificació Unicode (UTF-8). De totes maneres, podeu deixar de banda aquesta prova si seleccioneu més avall \"Omet la prova de codificació de la base de dades\", però podríeu experimentar problemes en el futur.';
 $string['dbwronghostserver'] = 'Heu de seguir les regles referents al servidor, exposades més amunt.';
 $string['dbwrongnlslang'] = 'La variable d\'entorn NLS_LANG del vostre servidor web ha d\'utilitzar el joc de caràcters AL32UTF8. Consulteu la documentació de PHP sobre la configuració correcta d\'OCI8.';
 $string['dbwrongprefix'] = 'Heu de seguir les regles referents al prefix de les taules, exposades més amunt.';
+$string['directorysettings'] = '<p>Confirmeu les ubicacions d\'aquesta instal·lació de Moodle.</p>
+
+<p><b>Adreça web:</b>
+Especifiqueu l\'adreça web completa per a accedir a Moodle. Si el vostre lloc és accessible per mitjà de diversos URL, trieu el més natural per als estudiants. No inclogueu la barra final.</p>
+
+<p><b>Directori de Moodle:</b>
+Especifiqueu el camí complet del directori d\'aquesta instal·lació. Assegureu-vos que les majúscules/minúscules són correctes.</p>
+
+<p><b>Directori de dades:</b>
+Necessiteu un lloc on Moodle pugui desar els fitxers que es pengin. L\'usuari del servidor web (generalment \'nobody\' o \'apache\') ha de tenir permisos de lectura i d\'ESCRIPTURA en aquest directori, però no hauria de ser accessible directament per web.</p>';
 $string['directorysettingshead'] = 'Confirmeu les ubicacions d\'aquesta instal·lació de Moodle.';
 $string['directorysettingssub'] = '<b>Adreça web:</b>
 Especifiqueu l\'adreça web completa per a accedir a Moodle. Si el vostre lloc és accessible per mitjà de diversos URL, trieu el més natural per als estudiants. No inclogueu la barra final.</p>
@@ -110,24 +181,36 @@ Especifiqueu el camí complet del directori d\'aquesta instal·lació. Assegureu
 Necessiteu un lloc on Moodle pugui desar els fitxers que es pengin. L\'usuari del servidor web (generalment \'nobody\' o \'apache\') ha de tenir permisos de lectura i d\'ESCRIPTURA en aquest directori, però no hauria de ser accessible directament via web.</p>';
 $string['dirroot'] = 'Directori de Moodle';
 $string['dirrooterror'] = 'El paràmetre \'Directori de Moodle\' sembla incorrecte: no s\'hi ha pogut trobat cap instal·lació de Moodle. S\'ha reiniciat el valor del paràmetre.';
+$string['disagreelicense'] = 'No es pot continuar l\'actualització sense acceptar la GPL.';
 $string['download'] = 'Baixa';
-$string['downloadedfilecheckfailed'] = 'Ha fallat la comprovació del fitxer baixat';
+$string['downloadedfilecheckfailed'] = 'Ha fallat la comprovació del fitxer baixat.';
 $string['downloadlanguagebutton'] = 'Baixa el paquet d\'idioma \"$a\"';
 $string['downloadlanguagehead'] = 'Baixa paquet d\'idioma';
 $string['downloadlanguagenotneeded'] = 'Podeu continuar el procés d\'instal·lació amb el paquet d\'idioma per defecte \"$a\".';
+$string['downloadlanguagepack'] = 'Voleu baixar ara el paquet d\'idioma (sí/no)?';
 $string['downloadlanguagesub'] = 'Ara teniu l\'opció de baixar un paquet d\'idioma i continuar el procés d\'instal·lació en aquest idioma.<br /><br />Si no podeu baixar el paquet, el procés d\'instal·lació prosseguirà en anglès. (Després que s\'hagi completat la instal·lació, tindreu l\'oportunitat de baixar i instal·lar paquets d\'idioma addicionals.)';
+$string['downloadsuccess'] = 'El paquet d\'idioma s\'ha baixat correctament';
+$string['doyouagree'] = 'Esteu d\'acord (sí/no)?';
 $string['environmenterrortodo'] = 'Abans d\'instal·lar aquesta versió de Moodle heu de resoldre tots els problemes d\'entorn (errors) que s\'han trobat.';
 $string['environmenthead'] = 'S\'està comprovant el vostre entorn';
+$string['environmentrecommendcustomcheck'] = 'si aquesta prova falla, això indica un problema en potència';
 $string['environmentrecommendinstall'] = 'es recomana instal·lar/habilitar';
 $string['environmentrecommendversion'] = 'esteu executant la versió $a->current i es recomana la $a->needed';
+$string['environmentrequirecustomcheck'] = 'cal passar aquesta prova';
 $string['environmentrequireinstall'] = 'es requereix instal·lar/habilitar';
 $string['environmentrequireversion'] = 'esteu executant la versió $a->current i es requereix la $a->needed';
 $string['environmentsub'] = 'S\'està comprovant si els diferents components del vostre sistema satisfan els requeriments';
 $string['environmentxmlerror'] = 'S\'ha produït un error en llegir les dades de l\'entorn ($a->error_code)';
 $string['error'] = 'Error';
+$string['errorsinenvironment'] = 'Hi ha errors en l\'entorn.';
 $string['fail'] = 'Error';
 $string['fileuploads'] = 'Càrrega de fitxers';
 $string['fileuploadserror'] = 'Hauria d\'estar habilitada';
+$string['fileuploadshelp'] = '<p>Sembla que la càrrega de fitxers està inhabilitada al vostre servidor.</p>
+
+<p>Moodle es pot instal·lar igualment, però sense aquesta capacitat no podreu penjar fitxers als cursos o imatges dels usuaris.</p>
+
+<p>Per habilitar la càrrega de fitxers cal editar el fitxer php.ini principal del sistema i posar el paràmetre <b>file_uploads</b> a \'1\'.</p>';
 $string['gdversion'] = 'Versió GD';
 $string['gdversionerror'] = 'La biblioteca GD hauria d\'estar present per processar i crear imatges';
 $string['gdversionhelp'] = '<p>Sembla que el vostre servidor no té instal·lat el GD.</p>
@@ -139,16 +222,50 @@ $string['gdversionhelp'] = '<p>Sembla que el vostre servidor no té instal·lat
 <p>En Windows generalment es pot editar el fitxer php.ini i treure el comentari de la línia que porti la referència a php_gd2.dll.</p>';
 $string['globalsquotes'] = 'Gestió insegura dels globals';
 $string['globalsquoteserror'] = 'Arregleu els paràmetres del vostre PHP: inhabiliteu register_globals i/o habiliteu magic_quotes_gpc';
+$string['globalsquoteshelp'] = '<p>No s\'aconsella tenir inhabilitat Magic Quotes GPC i tenir alhora habilitat Register Globals.</p>
+
+<p>La configuració recomanada és <b>magic_quotes_gpc = On</b> i <b>register_globals = Off</b> en el fitxer php.ini</p>
+
+<p>Si no teniu accés al php.ini, potser podreu afegir les línies següents en un fitxer anomenat .htaccess dins del directori Moodle:
+<blockquote>php_value magic_quotes_gpc On</blockquote>
+<blockquote>php_value register_globals Off</blockquote>
+</p>';
+$string['globalswarning'] = '<p><strong>Avís de seguretat</strong>: per a operar adequadament, Moodle necessita <br />que feu certs canvis en els paràmetres actuals del PHP.<p/><p><em>Cal</em> que definiu <code>register_globals=off</code>.<p>Aquest paràmetre es defineix en el fitxer <code>php.ini</code>, en la configuració d\'Apache/IIS <br />o en el fitxer <code>.htaccess</code>.</p>';
 $string['help'] = 'Ajuda';
 $string['iconvrecommended'] = 'És sumament recomanable instal·lar la biblioteca opcional ICONV a fi de millorar el rendiment del lloc, especialment si el vostre lloc utilitza llengües no romàniques.';
 $string['info'] = 'Informació';
+$string['inputdatadirectory'] = 'Directori de dades:';
+$string['inputwebadress'] = 'Adreça web:';
+$string['inputwebdirectory'] = 'Directori de Moodle';
 $string['installation'] = 'Instal·lació';
+$string['installationiscomplete'] = 'S\'ha completat la instal·lació';
+$string['invalidargumenthelp'] = 'Error: els arguments no són vàlids.
+Ús: $php cliupgrade.php OPCIONS
+Utilitzeu l\'opció --help per a més informació';
+$string['invalidemail'] = 'L\'adreça de correu no és vàlida';
+$string['invalidhost'] = 'El servidor no és vàlid';
+$string['invalidint'] = 'Error: el valor no és un enter';
+$string['invalidintrange'] = 'Error: el valor és fora dels límits';
 $string['invalidmd5'] = 'El md5 no és vàlid';
+$string['invalidpath'] = 'El camí no és vàlid';
+$string['invalidsetelement'] = 'Error: el valor que heu proporcionat no coincideix amb cap de les opcions permeses';
+$string['invalidtextvalue'] = 'El text no és vàlid';
+$string['invalidurl'] = 'L\'URL no és vàlid';
+$string['invalidvalueforlanguage'] = 'El valor no és vàlid per a l\'opció --lang. Utilitzeu --help per a més informació';
+$string['invalidyesno'] = 'Error: el valor no és un argument vàlid sí/no.';
 $string['langdownloaderror'] = 'Dissortadament l\'idioma \"$a\" no està instal·lat. La instal·lació prosseguirà en anglès.';
 $string['langdownloadok'] = 'L\'dioma \"$a\" s\'ha instal·lat amb èxit. La instal·lació prosseguirà en aquest idioma.';
 $string['language'] = 'Idioma';
+$string['locationanddirectories'] = 'Ubicació i directoris';
 $string['magicquotesruntime'] = 'Magic Quotes Run Time';
 $string['magicquotesruntimeerror'] = 'Hauria d\'estar desactivat';
+$string['magicquotesruntimehelp'] = '<p>Aquest paràmetre hauria d\'estar desactivat per tal que Moodle funcioni correctament.</p>
+
+<p>Normalment està desactivat per defecte. Comproveu el valor de <b>magic_quotes_runtime</b> al vostre fitxer php.ini.</p>
+
+<p>Si no teniu accés al php.ini, hauríeu de col·locar la línia següent en un fitxer anomenat .htaccess dins del directori de Moodle:
+<blockquote>php_value magic_quotes_runtime Off</blockquote>
+</p>';
 $string['mbstringrecommended'] = 'És sumament recomanable instal·lar la biblioteca opcional MBSTRING a fi de millorar el rendiment del lloc, especialment si el vostre lloc utilitza llengües no romàniques.';
 $string['memorylimit'] = 'Límit de memòria';
 $string['memorylimiterror'] = 'El límit de memòria del PHP està definit una mica baix. Podeu tenir problemes més endavant.';
@@ -156,56 +273,130 @@ $string['memorylimithelp'] = '<p>El límit de memòria del PHP del vostre servid

 <p>Això pot causar que Moodle tingui problemes de memòria més endavant, especialment si teniu molts mòduls habilitats i/o molts usuaris.</p>

-<p>És recomanable que configureu el PHP amb un límit superior, com ara 16 MB, sempre que sigui possible. Hi ha diverses maneres de fer això:</p>
+<p>És recomanable que configureu el PHP amb un límit superior, com ara 40 MB, sempre que sigui possible. Hi ha diverses maneres de fer això:</p>
 <ol>
 <li>Si podeu, recompileu el PHP amb <i>--enable-memory-limit</i>. Això permetrà que Moodle defineixi el límit de memòria per si mateix.</li>
-<li>Si teniu accés al fitxer php.ini, podeu canviar el paràmetre <b>memory_limit</b> a 16M. Si no hi teniu accés podeu demanar al vostre administrador que ho faci ell.</li>
+<li>Si teniu accés al fitxer php.ini, podeu canviar el paràmetre <b>memory_limit</b> a 40 MB. Si no hi teniu accés podeu demanar al vostre administrador que ho faci ell.</li>
 <li>En alguns servidors PHP podeu crear un fitxer .htaccess dins del directori de Moodle amb aquesta línia:
-<p><blockquote>php_value memory_limit 16M</blockquote></p>
+<p><blockquote>php_value memory_limit 40M</blockquote></p>
 <p>Tanmateix, en alguns servidors això farà que no funcioni <b>cap</b> pàgina PHP (es visualitzaran errors) en el qual cas hauríeu de suprimir el fitxer .htaccess.</p></li>
 </ol>';
 $string['missingrequiredfield'] = 'Falta algun camp necessari';
 $string['moodledocslink'] = 'Documentació de Moodle per a aquesta pàgina';
 $string['mssql'] = 'SQL*Server (mssql)';
-$string['mssql_n'] = 'SQL*Server amb UTF-8 (mssql_n)';
 $string['mssqlextensionisnotpresentinphp'] = 'El PHP no s\'ha configurat correctament amb l\'extensió MSSQL de manera que pugui comunicar-se amb SQL*Server. Reviseu el fitxer php.ini o recompileu PHP.';
+$string['mssql_n'] = 'SQL*Server amb UTF-8 (mssql_n)';
 $string['mysql'] = 'MySQL (mysql)';
 $string['mysql416bypassed'] = 'Tanmateix, si el vostre lloc fa servir NOMÉS llengües romàniques (iso-8859-1), podeu seguir utilitzant el MySQL 4.1.12 (o superior) instal·lat.';
 $string['mysql416required'] = 'MySQL 4.1.16 és la versió mínima requerida per Moodle 1.6 a fi de garantir la conversió de totes les dades a UTF-8 en el futur.';
 $string['mysqlextensionisnotpresentinphp'] = 'El PHP no s\'ha configurat correctament amb l\'extensió MySQL de manera que pugui comunicar-se amb MySQL. Reviseu el fitxer php.ini o recompileu el PHP.';
+$string['mysqli'] = 'MySQL Improved (mysqli)';
+$string['mysqliextensionisnotpresentinphp'] = 'El PHP no ha estat configurat adequadament amb l\'extensió MySQLi de manera que pugui comunicar-se amb MySQL. Reviseu el fitxer php.ini o recompileu el PHP. L\'extensió MySQLi no està disponible per a PHP 4.';
 $string['name'] = 'Nom';
 $string['next'] = 'Següent';
 $string['oci8po'] = 'Oracle (oci8po)';
 $string['ociextensionisnotpresentinphp'] = 'El PHP no s\'ha configurat correctament amb l\'extensió OCI8 de manera que pugui comunicar-se amb Oracle. Reviseu el fitxer php.ini o recompileu el PHP.';
-$string['odbc_mssql'] = 'SQL*Server over ODBC (odbc_mssql)';
 $string['odbcextensionisnotpresentinphp'] = 'El PHP no s\'ha configurat correctament amb l\'extensió ODBC de manera que pugui comunicar-se amb Oracle. Reviseu el fitxer php.ini o recompileu el PHP.';
+$string['odbc_mssql'] = 'SQL*Server over ODBC (odbc_mssql)';
 $string['ok'] = 'OK';
 $string['opensslrecommended'] = 'Es recomana instal·lar la biblioteca OpenSSL per habilitar la funcionalitat de Moodle en Xarxa.';
 $string['pass'] = 'Correcte';
 $string['password'] = 'Contrasenya';
 $string['pgsqlextensionisnotpresentinphp'] = 'El PHP no s\'ha configurat correctament amb l\'extensió PGSQL de manera que pugui comunicar-se amb PostgreSQL. Reviseu el fitxer php.ini o recompileu el PHP.';
 $string['php50restricted'] = 'PHP 5.0 té alguns problemes coneguts. Actualitzeu-vos si us plau a 5.1.x o torneu a 4.3.x o 4.4.x';
+$string['php52versionerror'] = 'La versió de PHP ha de ser 5.2.0 o superior';
+$string['php52versionhelp'] = '<p>Moodle requereix una versió de PHP 5.2.0 o superior.</p>
+<p>A hores d\'ara esteu utilitzant la versió $a.</p>
+<p>Heu d\'actualitzar el PHP o canviar de servidor.</p>';
 $string['phpversion'] = 'Versió PHP';
-$string['phpversionerror'] = 'La versió del PHP ha de ser com a mínim la 4.1.0';
+$string['phpversionerror'] = 'La versió del PHP ha de ser com a mínim la 4.1.0'; // ORPHANED
 $string['phpversionhelp'] = '<p>Moodle necessita la versió de PHP 4.1.0 o posterior.</p>
 <p>A hores d\'ara esteu utilitzant la versió $a.</p>
 <p>Us caldrà actualitzar el PHP o traslladar Moodle a un ordinador amb una versió de PHP més recent.</p>';
 $string['postgres7'] = 'PostgreSQL (postgres7)';
 $string['previous'] = 'Anterior';
+$string['qtyperqpwillberemoved'] = 'Durant l\'actualització, el tipus de pregunta RPQ se suprimirà. No estàveu utilitzant aquest tipus de pregunta, de manera que no hauríeu d\'experimentar cap problema.';
+$string['qtyperqpwillberemovedanyway'] = 'Durant l\'actualització, el tipus de pregunta RPQ se suprimirà. Teniu algunes preguntes RQP en la base de dades que deixaran de funcionar si no reinstal·leu el codi de http://moodle.org/mod/data/view.php?d=13&amp;rid=797 abans de prosseguir l\'actualització.';
+$string['releasenoteslink'] = 'Per a més informació sobre aquesta versió de Moodle, consulteu les Notes de llançament en $a';
+$string['remotedownloaderror'] = 'No s\'ha pogut baixar el component al vostre servidor. Verifiqueu els paràmetres de servidor intermediari. Es recomana l\'extensió cURL.<br /><br />Haureu de baixar manualment el fitxer <a href=\"$a->url\">$a->url</a>, copiar-lo a la ubicació \"$a->dest\" del vostre servidor i descomprimir-lo allí.';
 $string['remotedownloadnotallowed'] = 'El vostre servidor no permet baixar components ((allow_url_fopen inhabilitat).<br /><br />Baixeu manualment el fitxer <a href=\"$a->url\">$a->url</a>, copieu en la ubicació \"$a->dest\" del vostre servidor i descomprimiu-lo allí.';
 $string['report'] = 'Informe';
 $string['restricted'] = 'Restringit';
 $string['safemode'] = 'Mode segur';
 $string['safemodeerror'] = 'Moodle pot tenir problemes amb el mode segur activat';
+$string['safemodehelp'] = '<p>Moodle pot tenir diversos problemes amb el mode segur activat. Probablement no podrà crear fitxers nous.</p>
+
+<p>Normalment el mode segur només està habilitat en servidors webs públics una mica paranoics, de manera que és probable que hàgiu de buscar un altre servei d\'allotjament per al vostre Moodle.</p>
+
+<p>Podeu continuar la instal·lació si voleu, però trobareu problemes de funcionament més endavant.</p>';
+$string['selectlanguage'] = 'Selecció d\'idioma per a la instal·lació';
+$string['serverchecks'] = 'Proves del servidor';
 $string['sessionautostart'] = 'Autoinici de sessió';
 $string['sessionautostarterror'] = 'Hauria d\'estar desactivat';
+$string['sessionautostarthelp'] = '<p>Moodle necessita suport per a sessions i no funcionarà sense.</p>
+
+<p>Les sessions es poden habilitar en el fitxer php.ini. Comproveu el paràmetre session.auto_start.</p>';
+$string['sitefullname'] = 'Nom complet del lloc';
+$string['siteinfo'] = 'Detalls del lloc';
+$string['sitenewsitems'] = 'Titulars de notícies:';
+$string['siteshortname'] = 'Nom curt del lloc:';
+$string['sitesummary'] = 'Resum del lloc:';
 $string['skipdbencodingtest'] = 'Omet la prova de codificació de la base de dades';
+$string['sqlite3_pdo'] = 'SQLite 3 (PDO) <b><strong class=\"errormsg\">Experimental! (no l\'utilitzeu en producció)</strong></b>';
+$string['sqliteextensionisnotpresentinphp'] = 'El PHP no ha estat configurat correctament amb l\'extensió SQLite. Reviseu el fitxer php.ini o torneu a compilar el PHP.';
 $string['status'] = 'Estat';
+$string['tableprefix'] = 'Prefix de taules:';
 $string['thischarset'] = 'UTF-8';
+$string['thisdirection'] = 'ltr';
 $string['thislanguage'] = 'Català';
 $string['unicoderecommended'] = 'Es recomana emmagatzemar totes les dades en Unicode (UTF-8). Les noves instal·lacions s\'haurien de realitzar en bases de dades que tinguin definit com a Unicode el conjunt de caràcters per defecte. Si esteu fent una actualització, hauríeu de passar el procés de migració a UTF-8 (vg. la pàgina d\'Administració).';
 $string['unicoderequired'] = 'Es requereix emmagatzemar totes les dades en format Unicode (UTF-8). Les noves instal·lacions s\'han de realitzar en bases de dades que tinguin definit com a Unicode el conjunt de caràcters per defecte. Si esteu fent una actualització, hauríeu de passar el procés de migració a UTF-8 (vg. la pàgina d\'Administració).';
+$string['upgradingactivitymodule'] = 'S\'està actualitzant el mòdul d\'activitat';
+$string['upgradingbackupdb'] = 'S\'està actualitzant la base de dades de còpies de seguretat';
+$string['upgradingblocksdb'] = 'S\'està actualitzant la base de dades de blocs';
+$string['upgradingblocksplugin'] = 'S\'està actualitzant el connector de blocs';
+$string['upgradingcompleted'] = 'S\'ha completat l\'actualització...';
+$string['upgradingcourseformatplugin'] = 'S\'està actualitzant el connector de format de curs';
+$string['upgradingenrolplugin'] = 'S\'està actualitzant el connector d\'inscripcions';
+$string['upgradinggradeexportplugin'] = 'S\'està actualitzant el connector d\'exportació de qualificacions';
+$string['upgradinggradeimportplugin'] = 'S\'està actualitzant el connector d\'importació de qualificacions';
+$string['upgradinggradereportplugin'] = 'S\'està actualitzant el connector d\'informes de qualificacions';
+$string['upgradinglocaldb'] = 'S\'està actualitzant la base de dades local';
+$string['upgradingmessageoutputpluggin'] = 'S\'està actualitzant el connector de sortida de missatges';
+$string['upgradingqtypeplugin'] = 'S\'està actualitzant el connector de tipus de preguntes';
+$string['upgradingrpcfunctions'] = 'S\'estan actualitzant les funcions RPC';
+$string['usagehelp'] = 'Sinopsi:
+$php cliupgrade.php OPCIONS
+
+OPCIONS
+--lang Idioma vàlid instal·lat per a la instal·lació. Per defecte anglès (en)
+--webaddr Adreça web per al lloc Moodle
+--moodledir Ubicació del directori web de moodle
+--datadir Ubicació del directori de dades de moodle (no hauria de ser visible per web)
+--dbtype Tipus de base de dades. Per defecte mysql
+--dbhost Servidor de la base de dade. Per defecte localhost
+--dbname Nom de la base de dades. Per defecte moodle
+--dbuser Usuari d\'accés a la base de dades. Per defecte en blanc
+--dbpass Contrasenya d\'accés a la base de dades. Per defecte en blanc
+--prefix Prefix de les taules de la base de dades. Per defecte mdl
+--verbose 0 sense sortida, 1 sortida resumida (per defecte), 2 sortida detallada
+--interactivelevel 0 no interactiu, 1 semiinteractiu (per defecte), 2 interactiu
+--agreelicense Yes (per defecte) o No
+--confirmrelease Yes (per defecte) o No
+--sitefullname Nom complet del lloc. Per defecte: Moodle Site (canvieu-lo!)
+--siteshortname Nom curt del lloc. Per defecte: moodle
+--sitesummary Resum del lloc. Per defecte en blanc
+--adminfirstname Nom de l\'administrador/a. Per defecte Admin
+--adminlastname Cognom de l\'administrador/a. Per defecte User
+--adminusername Nom d\'usuari/ària de l\'administrador/a. Per defecte admin
+--adminpassword Contrasenya de l\'administrador/a. Per defecte admin
+--adminemail Correu electrònic de l\'administrador/a. Per defecte root@localhost
+--help mostra aquesta ajuda
+
+Ús:
+$php cliupgrade.php --lang=en --webaddr=http://www.example.com --moodledir=/var/www/html/moodle --datadir=/var/moodledata --dbtype=mysql --dbhost=localhost --dbname=moodle --dbuser=root --prefix=mdl --agreelicense=yes --confirmrelease=yes --sitefullname=\"Lloc Moodle de mostra\" --siteshortname=moodle --sitesummary=siteforme --adminfirstname=Admin --adminlastname=User --adminusername=admin --adminpassword=admin --adminemail=admin@example.com --verbose=1 --interactivelevel=2';
 $string['user'] = 'Usuari';
+$string['versionerror'] = 'L\'usuari ha interromput per un error de versió';
 $string['welcomep10'] = '$a->installername ($a->installerversion)';
 $string['welcomep20'] = 'Esteu veient aquesta pàgina perquè heu instal·lat amb èxit i heu executat el paquet <strong>$a->packname $a->packversion</strong>. Felicitacions!';
 $string['welcomep30'] = 'Aquesta versió de <strong>$a->installername</strong> inclou les aplicacions necessàries per crear un entorn en el qual funcioni <strong>Moodle</strong>:';
@@ -215,9 +406,13 @@ $string['welcomep50'] = 'L\'ús de totes les aplicacions d\'aquest paquet és go
 sota llicència <a href=\"http://www.gnu.org/copyleft/gpl.html\">GPL</a>.';
 $string['welcomep60'] = 'Les pàgines següents us guiaran per una sèrie de passos fàcils de seguir per configurar <strong>Moodle</strong> en el vostre ordinador. Podeu acceptar els paràmetres per defecte o, opcionalment, modificar-los perquè s\'ajustin a les vostres necessitats.';
 $string['welcomep70'] = 'Feu clic en el botó \"Següent\" per continuar la configuració de <strong>Moodle</strong>.';
+$string['welcometext'] = '--- Benvinguts a l\'instal·lador de línia d\'ordres de Moodle ---';
+$string['writetoconfigfilefaild'] = 'Error: no s\'ha pogut escriure el fitxer de configuració';
 $string['wrongdestpath'] = 'El camí de destinació és erroni';
 $string['wrongsourcebase'] = 'L\'adreça (URL) base de la font és errònia';
 $string['wrongzipfilename'] = 'El nom del fitxer ZIP és erroni';
 $string['wwwroot'] = 'Adreça web';
 $string['wwwrooterror'] = 'L\'adreça web no sembla vàlida. La instal·lació de Moodle no sembla que sigui en aquesta ubicació,';
+$string['xmlrpcrecommended'] = 'Instal·lar l\'extensió opcional xmlrpc és útil per a la funcionalitat de Moodle en Xarxa.';
+$string['yourchoice'] = 'La vostra elecció:';
 ?>
@@ -7,37 +7,54 @@
 /// keep us informed using http://moodle.org/bugs Thanks!
 ///
 /// File generated by cvs://contrib/lang2installer/installer_builder
-/// using strings defined in installer_strings (same dir)
+/// using strings defined in stringnames.txt (same dir)

 $string['admindirerror'] = 'Adresář pro správu (admin) není zadán správně.';
 $string['admindirname'] = 'Adresář pro správu (admin)';
+$string['admindirsetting'] = 'Na některých serverech je URL adresa /admin vyhrazena pro speciální účely (např. pro ovládací panel). Na takových serverech může dojít ke kolizi se standardním umístěním stránek pro správu Moodlu. Máte-li tento problém, přejmenujte adresář \'admin\' ve vaší instalaci Moodlu a do tohoto pole zadejte jeho nový název. Příklad: <br /> <br /><b>moodleadmin</b><br /> <br />
+Všechny generované odkazy na stránky správy Moodlu budou používat tento nový název.';
 $string['admindirsettinghead'] = 'Nastavování adresáře \'admin\'...';
 $string['admindirsettingsub'] = 'Na některých serverech je URL adresa /admin vyhrazena pro speciální účely (např. pro ovládací panel). Na takových serverech může dojít ke kolizi se standardním umístěním stránek pro správu Moodlu. Máte-li tento problém, přejmenujte adresář \'admin\' ve vaší instalaci Moodlu a do tohoto pole zadejte jeho nový název. Příklad: <br /> <br /><b>moodleadmin</b><br /> <br />
 Všechny generované odkazy na stránky správy Moodlu budou používat tento nový název.';
+$string['availablelangs'] = 'Dostupné jazykové balíčky';
 $string['bypassed'] = 'Přeskočeno';
-$string['cannotcreatelangdir'] = 'Nelze vytvořit adresář pro jazykové soubory.';
+$string['cannotcreatelangdir'] = 'Nelze vytvořit adresář pro jazykové soubory';
 $string['cannotcreatetempdir'] = 'Nelze vytvořit dočasný adresář.';
-$string['cannotdownloadcomponents'] = 'Nelze stáhnout komponenty.';
-$string['cannotdownloadzipfile'] = 'Nelze stáhnout soubor ZIP.';
-$string['cannotfindcomponent'] = 'Komponenta nenalezena.';
+$string['cannotdownloadcomponents'] = 'Nelze stáhnout komponenty';
+$string['cannotdownloadzipfile'] = 'Nelze stáhnout soubor ZIP';
+$string['cannotfindcomponent'] = 'Komponenta nenalezena';
 $string['cannotsavemd5file'] = 'Nelze uložit soubor MD5.';
 $string['cannotsavezipfile'] = 'Nelze uložit soubor ZIP.';
 $string['cannotunzipfile'] = 'Nelze dekomprimovat soubor.';
 $string['caution'] = 'Varování';
 $string['check'] = 'Prověřit';
+$string['chooselanguage'] = 'Vyberte jazyk';
 $string['chooselanguagehead'] = 'Vyberte jazyk';
 $string['chooselanguagesub'] = 'Zvolte si jazyk PRO INSTALOVÁNÍ. Jazyk pro stránky Moodlu a pro uživatele budete moci vybrat později.';
 $string['closewindow'] = 'Zavřít toto okno';
+$string['compatibilitysettings'] = 'Kontrola nastavení PHP...';
 $string['compatibilitysettingshead'] = 'Kontrola nastavení PHP...';
 $string['compatibilitysettingssub'] = 'Pro správný běh Moodlu by váš server měl vyhovět ve všech následujících testech.';
 $string['componentisuptodate'] = 'Komponenta je aktuální.';
 $string['configfilenotwritten'] = 'Instalačnímu skriptu se nepodařilo automaticky vytvořit soubor config.php s vaší konfigurací -- proces webového serveru zřejmě nemá právo zapisovat do adresáře s instalací Moodlu. Můžete ručně zkopírovat následující kód do souboru s názvem config.php a uložit jej do kořenového adresáře vaší instalace Moodlu.';
 $string['configfilewritten'] = 'Soubor config.php byl úspěšně vytvořen.';
+$string['configurationcomplete'] = 'Konfigurace dokončena';
 $string['configurationcompletehead'] = 'Konfigurace dokončena';
 $string['configurationcompletesub'] = 'Moodle se pokusil uložit soubor s konfigurací do kořenového adresáře instalace Moodlu.';
 $string['continue'] = 'Pokračovat';
+$string['ctyperecommended'] = 'Rozšíření PHP ctype je velmi doporučováno z důvodů výkonu vašich stránek, obzvláště když pracujete s jazyky, které nepoužívají latinku.';
+$string['ctyperequired'] = 'Rozšíření PHP ctype je Moodlem vyžadováno z důvodů výkonu a vícejazyčné podpory.';
 $string['curlrecommended'] = 'Pro běh síťových funkcionalit (\"Moodle Networking\") je potřeba nainstalovat volitelnou knihovnu Curl.';
+$string['customcheck'] = 'Další kontroly';
 $string['database'] = 'Databáze';
+$string['databasecreationsettings'] = 'Nyní musíte nastavit připojení k databázi, kam si bude Moodle ukládat většinu svých dat. Tato databáze může být vytvořena instalátorem automaticky podle následujícího nastavení.<br/>
+<br /> <br />
+<b>Typ:</b> instalátor nastaví na \"mysql\"<br />
+<b>Hostitel:</b> instalátor nastaví na \"localhost\"<br />
+<b>Název:</b> název databáze, např. moodle<br />
+<b>Uživatel:</b> instalátor nastaví na \"root\"<br />
+<b>Heslo:</b> heslo k tomuto účtu<br />
+<b>Předpona tabulek:</b> volitelná předpona, která se vloží před názvy všech tabulek (umožňuje používat jednu databázi pro více instalací Moodlu)';
 $string['databasecreationsettingshead'] = 'Nyní musíte nastavit připojení k databázi, kam si bude Moodle ukládat většinu svých dat. Tato databáze může být vytvořena instalátorem automaticky podle následujícího nastavení.';
 $string['databasecreationsettingssub'] = '<b>Typ:</b> instalátor nastaví na \"mysql\"<br />
 <b>Hostitel:</b> instalátor nastaví na \"localhost\"<br />
@@ -45,6 +62,14 @@ $string['databasecreationsettingssub'] = '<b>Typ:</b> instalátor nastaví na \"
 <b>Uživatel:</b> instalátor nastaví na \"root\"<br />
 <b>Heslo:</b> heslo k tomuto účtu<br />
 <b>Předpona tabulek:</b> volitelná předpona, která se vloží před názvy všech tabulek (umožňuje používat jednu databázi pro více instalací Moodlu)';
+$string['databasesettings'] = 'Nyní musíte nastavit připojení k databázi, kam si bude Moodle ukládat většinu svých dat. Tato databáze již musí být vytvořena, stejně jako musí být nastaveno uživatelské jméno a heslo pro přístup k ní.<br/>
+<br /> <br />
+<b>Typ:</b> mysql nebo postgres7<br />
+<b>Hostitel:</b> např. localhost nebo db.naseskola.cz<br />
+<b>Název:</b> název databáze, např. moodle<br />
+<b>Uživatel:</b> uživatelské jméno účtu pro přístup k databázi<br />
+<b>Heslo:</b> heslo k tomuto účtu<br />
+<b>Předpona tabulek:</b> volitelná předpona, která se vloží před názvy všech tabulek (umožňuje používat jednu databázi pro více instalací Moodlu)';
 $string['databasesettingshead'] = 'Nyní musíte nastavit připojení k databázi, kam si bude Moodle ukládat většinu svých dat. Tato databáze již musí být vytvořena, stejně jako musí být nastaveno uživatelské jméno a heslo pro přístup k ní.';
 $string['databasesettingssub'] = '<b>Typ:</b> mysql nebo postgres7<br />
 <b>Hostitel:</b> např. localhost nebo db.naseskola.cz<br />
@@ -57,15 +82,67 @@ $string['databasesettingssub_mssql'] = '<b>Typ:</b> SQL*Server (bez UTF-8) <b><f
 <b>Název (Name):</b> název databáze, např. moodle<br />
 <b>Uživatel (User):</b> uživatel oprávněný pro práci s databází<br />
 <b>Heslo (Password):</b> heslo pro uživatele<br />
-<b>Předpona (Tables Prefix):</b> jednotná předpona názvů všech tabulek, např. mdl_ (mandatory)';
+<b>Předpona (Tables Prefix):</b> jednotná předpona názvů všech tabulek, např. mdl_ (povinné)';
+$string['databasesettingssub_mssql_n'] = '<b>Typ:</b> SQL*Server (s UTF-8) <br />
+<b>Hostitel (Host):</b> např. localhost nebo db.naseskola.cz<br />
+<b>Název (Name):</b> název databáze, např. moodle<br />
+<b>Uživatel (User):</b> uživatel oprávněný pro práci s databází<br />
+<b>Heslo (Password):</b> heslo pro uživatele<br />
+<b>Předpona (Tables Prefix):</b> jednotná předpona názvů všech tabulek, např. mdl_ (povinné)';
+$string['databasesettingssub_mysql'] = '<b>Typ:</b> MySQL<br />
+<b>Hostitel (Host):</b> např. localhost nebo db.naseskola.cz<br />
+<b>Název (Name):</b> název databáze, např. moodle<br />
+<b>Uživatel (User):</b> uživatel oprávněný pro práci s databází<br />
+<b>Heslo (Password):</b> heslo pro uživatele<br />
+<b>Předpona (Tables Prefix):</b> jednotná předpona názvů všech tabulek, např. mdl_ (volitelné)';
+$string['databasesettingssub_mysqli'] = '<b>Typ:</b> vylepšené MySQL<br />
+<b>Hostitel:</b> např. localhost nebo db.naseskola.cz<br />
+<b>Název:</b> název databáze, např. moodle<br />
+<b>Uživatel:</b> uživatel dané databáze<br />
+<b>Heslo:</b> heslo uživatele k databázi<br />
+<b>Předpona:</b> jednotná předpona názvů všech tabulek (volitelné)';
+$string['databasesettingssub_oci8po'] = '<b>Typ:</b> Oracle<br />
+<b>Hostitel (Host):</b> nepoužito, musí být prázdné<br />
+<b>Název (Name):</b> daný název připojení tnsnames.ora<br />
+<b>Uživatel (User):</b> uživatel oprávněný pro práci s databází<br />
+<b>Heslo (Password):</b> heslo pro uživatele<br />
+<b>Předpona (Tables Prefix):</b> jednotná předpona názvů všech tabulek (povinné, max 2 znaky)';
+$string['databasesettingssub_odbc_mssql'] = '<b>Typ:</b> SQL*Server (přes ODBC) <b><font color=\"red\">Jen pro experimentování! (není určeno pro produkční servery)</font></b><br />
+<b>Hostitel (Host):</b> název DSN podle řídicího panelu ODBC<br />
+<b>Název (Name):</b>název databáze, např. moodle <br />
+<b>Uživatel (User):</b> uživatel oprávněný pro práci s databází<br />
+<b>Heslo (Password):</b> heslo pro uživatele<br />
+<b>Předpona (Tables Prefix):</b> jednotná předpona názvů všech tabulek (povinné)';
+$string['databasesettingssub_postgres7'] = '<b>Typ:</b> PostgreSQL<br />
+<b>Hostitel (Host):</b> např. localhost nebo db.naseskola.cz<br />
+<b>Název (Name):</b> název databáze, např. moodle<br />
+<b>Uživatel (User):</b> uživatel oprávněný pro práci s databází<br />
+<b>Heslo (Password):</b> heslo pro uživatele<br />
+<b>Předpona (Tables Prefix):</b> jednotná předpona názvů všech tabulek, např. mdl_ (povinné)';
+$string['databasesettingswillbecreated'] = '<b>Poznámka:</b> instalátor se pokusí vytvořit databázi automaticky, pokud ještě neexistuje';
 $string['dataroot'] = 'Datový adresář';
 $string['datarooterror'] = 'Zadaný datový adresář se nepodařilo nalézt nebo vytvořit. Buď opravte zadanou cestu, nebo vytvořte adresář ručně.';
+$string['datarootpublicerror'] = 'Zadaný datový adresář (dataroot) je přímo dostupný přes WWW. Zvolte jiné umístění.';
 $string['dbconnectionerror'] = 'Nepodařilo se připojit k databázi, kterou jste zadali. Zkontrolujte prosím nastavení databáze.';
 $string['dbcreationerror'] = 'Chyba při vytváření databáze. Nelze vytvořit databázi zadaného jména a nastavení.';
 $string['dbhost'] = 'Hostitelský server';
+$string['dbpass'] = 'Heslo';
 $string['dbprefix'] = 'Předpona tabulek';
 $string['dbtype'] = 'Typ';
 $string['dbwrongencoding'] = 'Vybraná databáze používá nedoporučené kódování $a. Vhodnější by bylo používat databázi s kódováním Unicode (UTF-8). Tuto kontrolu můžete přeskočit zaškrtnutím pole \"Přeskočit test kódování DB\", můžete však v budoucnu narazit na problémy.';
+$string['dbwronghostserver'] = 'Chyba v názvu hostitele.';
+$string['dbwrongnlslang'] = 'Proměnná prostředí Vašeho serveru NLS_LANG musí používat znakovou sadu AL32UTF8. Viz dokumentaci PHP o konfiguraci vlastnosti OCI8.';
+$string['dbwrongprefix'] = 'Chyba v předponě názvů tabulek.';
+$string['directorysettings'] = '<p>Potvrďte prosím základní adresy této instalace Moodlu.</p>
+
+<p><b>Webová adresa</b>
+Zadejte úplnou webovou adresu, na níž bude Moodle dostupný. Jsou-li vaše stránky dostupné na více URL, vyberte z nich tu, kterou budou vaši studenti používat nejčastěji. Na konci adresy neuvádějte lomítko.</p>
+
+<p><b>Adresář Moodlu</b>
+Zadejte úplnou cestu k adresáři s touto instalací. Ujistěte se, že jsou v ní správně uvedena malá/VELKÁ písmena.</p>
+
+<p><b>Datový adresář</b>
+Potřebujete diskový prostor, kam bude Moodle ukládat nahrané (uploadované) soubory. K tomuto adresáři musí mít proces webového serveru právo ke čtení I ZÁPISU (webový server bývá spouštěn pod uživatelem \'nobody\' nebo \'apache\' nebo podobně). Tento adresář by ale zároveň neměl být dostupný přímo přes webové rozhraní (může obsahovat neveřejná data).</p>';
 $string['directorysettingshead'] = 'Potvrďte prosím adresy této instalace Moodlu.';
 $string['directorysettingssub'] = '<b>Webová adresa</b>:
 zadejte úplnou webovou adresu, na níž bude Moodle dostupný. Jsou-li vaše stránky dostupné na více URL, vyberte z nich tu, kterou budou vaši studenti používat nejčastěji. Na konci adresy neuvádějte lomítko.
@@ -85,10 +162,13 @@ $string['downloadlanguagebutton'] = 'Stáhnout jazykový balíček \"$a\"';
 $string['downloadlanguagehead'] = 'Stáhnout jazykový balíček';
 $string['downloadlanguagenotneeded'] = 'V instalaci lze nyní pokračovat v jazyce \"$a\".';
 $string['downloadlanguagesub'] = 'Nyní máte možnost stáhnout si některý z jazykových balíčků Moodlu a pokračovat v tomto jazyce.<br /><br />Pokud si momentálně nemůžete nebo nechcete stáhnout jazykový balíček, bude instalační proces pokračovat v angličtině. Jazykové balíčky si budete moci stáhnout i později po ukončení instalace.';
+$string['doyouagree'] = 'Přečetli jste si tyto podmínky a rozumíte jim?';
 $string['environmenterrortodo'] = 'Pro pokračování v instalaci této verze Moodlu je nutné nejdříve vyřešit problémy v programovém prostředí (chyby) serveru uvedené výše!';
 $string['environmenthead'] = 'Kontrola programového prostředí...';
+$string['environmentrecommendcustomcheck'] = 'Pokud tento test selhal, znamená to možné problémy';
 $string['environmentrecommendinstall'] = 'doporučená komponenta';
 $string['environmentrecommendversion'] = 'doporučena je verze $a->needed, nyní používáte verzi $a->current';
+$string['environmentrequirecustomcheck'] = 'Tebto test musí projít';
 $string['environmentrequireinstall'] = 'vyžadovaná komponenta';
 $string['environmentrequireversion'] = 'vyžadována je verze $a->needed, nyní používáte verzi $a->current';
 $string['environmentsub'] = 'Nyní se prověřuje, zda vybrané komponenty vašeho systému splňují požadavky instalace.';
@@ -97,6 +177,12 @@ $string['error'] = 'Chyba';
 $string['fail'] = 'Selhalo';
 $string['fileuploads'] = 'Nahrávání souborů (FIle Uploads)';
 $string['fileuploadserror'] = 'Mělo by být zapnuto';
+$string['fileuploadshelp'] = '<p>Na vašem serveru zřejmě není možné nahrávat soubory.</p>
+
+<p>Moodle může být i přesto nainstalován, bez této funkce ale nebudete moci nahrávat žádné soubory (např. studijní materiály, fotografie uživatelů atd.).</p>
+
+<p>Chcete-li povolit nahrávání souborů, budete muset vy (nebo správce serveru) upravit hlavní soubor php.ini na serveru a změnit nastavení
+<b>file_uploads</b> na \'1\'.</p>';
 $string['gdversion'] = 'Verze GD';
 $string['gdversionerror'] = 'Knihovna GD se používá pro zpracovávání a tvorbu obrázků (např. fotografií, grafů apod.).';
 $string['gdversionhelp'] = '<p>Na vašem serveru zřejmě není nainstalována knihovna GD.</p>
@@ -108,16 +194,34 @@ $string['gdversionhelp'] = '<p>Na vašem serveru zřejmě není nainstalována k
 <p>Ve Windows stačí většinou upravit php.ini a odkomentovat řádek odkazující na php_gd2.dll.</p>';
 $string['globalsquotes'] = 'Nezabezpečené zacházení s globálními proměnnými';
 $string['globalsquoteserror'] = 'Upravte nastavení PHP: zakažte register_globals a/nebo povolte magic_quotes_gpc';
+$string['globalsquoteshelp'] = '<p>Vaše nastavení PHP nepovoluje Magic Quotes GPC a zároveň povoluje Register Globals. Tato kombinace není doporučována.</p>
+
+<p>Doporučujeme nastavit ve vašem souboru php.ini <b>magic_quotes_gpc = On</b> a <b>register_globals = Off</b></p>
+
+Nemáte-li přístup k souboru php.ini, nebo pokud nemůžete/nechcete měnit toto nastavení pro celý server, umístěte do kořenového adresáře instalace Moodlu soubor nazvaný .htaccess s následujícím obsahem:
+<blockquote>php_value magic_quotes_gpc On</blockquote>
+<blockquote>php_value register_globals Off</blockquote>
+</p>';
+$string['globalswarning'] = '<p><strong>Bezpečnostní varování</strong>: Aby Moodle pracoval správně, potřebuje udělat změny v nastavení PHP.<p/><p><em>Musíte</em> nastavit <code>register_globals=off</code>. Tohoto nastavení dosáhnete buď úpravou soubor <code>php.ini</code> (Apache nebo IIS), nebo nastavením pomocí <code>.htaccess</code>.';
 $string['help'] = 'Nápověda';
 $string['iconvrecommended'] = 'Instalace volitelné knihovny ICONV je silně doporučena, neboť zvyšuje výkon stránek, zejména pokud používáte jazyky nezaložené na latince.';
 $string['info'] = 'Informace';
 $string['installation'] = 'Instalace';
+$string['invalidemail'] = 'Neplatná e-mailová adresa';
 $string['invalidmd5'] = 'Neplatný MD5 hash';
+$string['invalidurl'] = 'Neplatná URL';
 $string['langdownloaderror'] = 'Bohužel, jazyk \"$a\" se nepodařilo nainstalovat. Instalace bude pokračovat v angličtine.';
 $string['langdownloadok'] = 'Podařilo se úspěšně nainstalovat jazykový balíček \"$a\". Instalace bude pokračovat v tomto jazyce.';
 $string['language'] = 'Jazyk';
 $string['magicquotesruntime'] = 'Magic Quotes Run Time';
 $string['magicquotesruntimeerror'] = 'Mělo by být vypnuto';
+$string['magicquotesruntimehelp'] = '<p>Pro správné fungování Moodlu by nastavení \'Magic quotes runtime\' mělo být vypnuto.</p>
+
+<p>Obvykle bývá tato funkce ve výchozím nastavení vypnutá ... zkontrolujte nastavení <b>magic_quotes_runtime</b> ve vašem php.ini.</p>
+
+<p>Pokud nemáte přístup k souboru php.ini, zkuste umístit následující řádek do souboru .htaccess v kořenovém adresáři vaší instalace Moodlu:
+<blockquote>php_value magic_quotes_runtime Off</blockquote>
+</p>';
 $string['mbstringrecommended'] = 'Instalace volitelné knihovny MBSTRING je silně doporučena, neboť zvyšuje výkon stránek, zejména pokud používáte jazyky nezaložené na latince.';
 $string['memorylimit'] = 'Limit paměti';
 $string['memorylimiterror'] = 'Limit paměti pro PHP skripty je nastaven relativně nízko ... v budoucnu byste mohli narazit na problémy.';
@@ -125,28 +229,39 @@ $string['memorylimithelp'] = '<p>Limit paměti pro PHP skripty je na vašem serv

 <p>To může později způsobovat Moodlu problémy, zvláště při větším množství modulů a/nebo uživatelů.</p>

-<p>Je-li to možné, doporučujeme vám nastavit v PHP vyšší limit, např. 16M. Můžete to provést několika způsoby:
+<p>Je-li to možné, doporučujeme vám nastavit v PHP vyšší limit, např. 40M. Můžete to provést několika způsoby:
 <ol>
 <li>Můžete-li, překompilujte PHP s volbou <i>--enable-memory-limit</i>.
 Moodle si tak bude sám moci nastavit potřebný limit.</li>
 <li>Máte-li přístup k souboru php.ini, změňte nastavení <b>memory_limit</b>
-na hodnotu blízkou 16M. Nemáte-li taková práva, požádejte správce vašeho webového serveru, aby toto nastavení provedl on.</li>
+na hodnotu blízkou 40M. Nemáte-li taková práva, požádejte správce vašeho webového serveru, aby toto nastavení provedl on.</li>
 <li>Na některých serverech můžete v kořenovém adresáři Moodlu vytvořit soubor .htaccess s následujícím řádkem:
-<p><blockquote>php_value memory_limit 16M</blockquote></p>
+<p><blockquote>php_value memory_limit 40M</blockquote></p>
 <p>Bohužel, v některých případech tím vyřadíte z provozu <b>všechny</b> PHP stránky (při jejich prohlížení uvidíte chybová hlášení), takže budete muset soubor .htaccess zase odstranit.</li>
 </ol>';
 $string['missingrequiredfield'] = 'Chybí některé z povinných polí';
 $string['moodledocslink'] = 'Dokumentace k této stránce';
+$string['mssql'] = 'SQL*Server (mssql)';
+$string['mssqlextensionisnotpresentinphp'] = 'PHP nebylo korektně nakonfigurováno pro komunikaci s SQL*Server přes rozšíření MSSQL. Zkontrolujte váš php.ini nebo překompilujte PHP.';
+$string['mssql_n'] = 'SQL*Server s podporou UTF-8 (mssql_n)';
+$string['mysql'] = 'MySQL (mysql)';
 $string['mysql416bypassed'] = 'Pokud ovšem ve vaší instalaci Moodlu používáte POUZE jazyky založené na latince (iso-8859-1), můžete nadále používat momentálně nainstalovanou verzi MySQL 4.1.12 (nebo vyšší).';
 $string['mysql416required'] = 'Minimální verzí požadovanou pro Moodle 1.6 -- a pro pozdější bezpečný převod všech dat do UTF-8 -- je MySQL 4.1.16.';
-$string['mysqlextensionisnotpresentinphp'] = 'PHP nebylo korektně nakonfigurováno pro komunikaci v MySQL. Zkontrolujte váš php.ini nebo překompilujte PHP.';
+$string['mysqlextensionisnotpresentinphp'] = 'PHP nebylo korektně nakonfigurováno pro komunikaci s MySQL. Zkontrolujte váš php.ini nebo překompilujte PHP.';
+$string['mysqli'] = 'Vylepšené MySQL (mysqli)';
+$string['mysqliextensionisnotpresentinphp'] = 'PHP není korektně nakonfigurováno, aby mohlo s MySQL serverem komunikovat s podporou rozšíření MySQLi. Zkontrolujte nastavení v souboru php.ini nebo překompilujte PHP. Rozšíření MySQLi není k dispozici ve verzi PHP 4.';
 $string['name'] = 'Název';
 $string['next'] = 'Další';
+$string['oci8po'] = 'Oracle (oci8po)';
+$string['ociextensionisnotpresentinphp'] = 'PHP nebylo korektně nakonfigurováno pro komunikaci s Oracle přes rozšíření OCI8. Zkontrolujte váš php.ini nebo překompilujte PHP.';
+$string['odbcextensionisnotpresentinphp'] = 'PHP nebylo korektně nakonfigurováno pro komunikaci s SQL*Server přes rozšíření ODBC. Zkontrolujte váš php.ini nebo překompilujte PHP.';
+$string['odbc_mssql'] = 'SQL*Server přes ODBC (odbc_mssql)';
 $string['ok'] = 'OK';
 $string['opensslrecommended'] = 'Pro běh síťových funkcionalit (\"Moodle Networking\") je potřeba nainstalovat volitelnou knihovnu OpenSSL.';
-$string['parentlanguage'] = '<< Překladatelé: Pokud Váš jazyk má \"nadřazený\" jazyk\", který má Moodle používat v případech, kdy řetězce ve vašem jazykovém balíčku chybí, specifikujte jeho kód zde. Příklad: nl >>';
+$string['parentlanguage'] = '<< Pokud chcete definovat sekundární jazyk, který má Moodle používat v případech, kdy řetězce ve vašem jazykovém balíčku chybí, specifikujte jeho kód zde. Příklad: sk_utf8>>';
 $string['pass'] = 'V pořádku';
 $string['password'] = 'Heslo';
+$string['pgsqlextensionisnotpresentinphp'] = 'PHP nebylo korektně nakonfigurováno pro komunikaci s PostgreSQL přes rozšíření PGSQL. Zkontrolujte váš php.ini nebo překompilujte PHP.';
 $string['php50restricted'] = 'V PHP 5.0.x bylo nalezeno množství chyb; přejděte buď na vyšší verzi 5.1.x, nebo na nižší verzi 4.3.x či 4.4.x.';
 $string['phpversion'] = 'Verze PHP';
 $string['phpversionerror'] = 'Verze PHP musí být alespoň 4.3.0 nebo 5.1.0 (PHP 5.0.x obsahuje množství chyb).';
@@ -154,17 +269,32 @@ $string['phpversionhelp'] = '<p>Moodle vyžaduje PHP alespoň verze 4.3.0 nebo 5
 <p>Nyní používáte PHP verze $a.</p>
 <p>Musíte PHP upgradovat, nebo přejít k hostiteli s vyšší verzí!<br />
 (U PHP 5.0.x můžete také přejít na nižší verzi 4.4.x či 4.3.x.)</p>';
+$string['postgres7'] = 'PostgreSQL (postgres7)';
 $string['previous'] = 'Předchozí';
+$string['qtyperqpwillberemoved'] = 'Během upgrade bude odstraněn typ testové úlohy RQP. Tento typ jste nepoužívali, takže byste neměli zaznamenta žádné problémy.';
+$string['qtyperqpwillberemovedanyway'] = 'Během upgrade bude odstraněn typ testové úlohy RQP. Ve vaší databázi existuje několik takových úloh a ty nebudou fungovat, dokud nepřeinstalujete kód z http://moodle.org/mod/data/view.php?d=13&amp;rid=797 před pokračováním upgrade.';
+$string['releasenoteslink'] = 'Informace o této verzi Moodlu najdete v <a target=\"_new\" href=\"$a\">Poznámkách k verzi</a>';
+$string['remotedownloaderror'] = 'Stahování komponenty na váš server selhalo. Prověřte nastavení proxy. Vřele doporučujeme PHP rozšíření cURL.<br /><br />Nyní musíte stáhnout soubor <a href=\"$a->url\">$a->url</a> ručně, překopírovat jej do \"$a->dest\" na vašem serveru a tam jej rozbalit.';
 $string['remotedownloadnotallowed'] = 'Stahování komponent na server není povoleno (direktiva allow_url_fopen je ve stavu \'vypnuto\').<br /><br />Musíte soubor stáhnout <a href=\"$a->url\">$a->url</a> ručně, zkopírovat jej na serveru do umístění \"$a->dest\" a tam jej dekomprimovat.';
-$string['report'] = 'Protokol';
+$string['report'] = 'Sestava';
 $string['restricted'] = 'Nedostupné';
 $string['safemode'] = 'Bezpečný režim (Safe Mode)';
 $string['safemodeerror'] = 'Se zapnutým bezpečným režimem (Safe Mode) může mít Moodle problémy.';
+$string['safemodehelp'] = '<p>Při zapnutém bezpečném režimu PHP (tzv. Safe Mode) může Moodle narazit na řadu problémů. Jedním z nich je, že pravděpodobně nebude moci vytvářet nové soubory.</p>
+
+<p>Bezpečný režim používají obvykle pouze paranoidní veřejní poskytovatelé webového prostoru, takže možná bude stačit najít si pro váš Moodle jiného poskytovatele.</p>
+
+<p>Můžete zkusit pokračovat v instalaci, ale připravte se na problémy.</p>';
+$string['serverchecks'] = 'Kontroly serveru';
 $string['sessionautostart'] = 'Session Auto Start';
 $string['sessionautostarterror'] = 'Mělo by být vypnuto';
+$string['sessionautostarthelp'] = '<p>Moodle vyžaduje podporu session a nebude bez ní fungovat.</p>
+
+<p>Podporu session můžete povolit v souboru php.ini  ... hledejte parametr session.auto_start.</p>';
 $string['skipdbencodingtest'] = 'Přeskočit test kódování DB';
 $string['status'] = 'Stav';
 $string['thischarset'] = 'UTF-8';
+$string['thisdirection'] = 'ltr';
 $string['thislanguage'] = 'Čeština';
 $string['unicoderecommended'] = 'Doporučujeme ukládání dat v kódování Unicode (UTF-8). Nové instalace by měly být založeny nad databází s výchozím kódováním Unicode. Pokud přecházíte z nižších verzí, měli byste podstoupit proces migrace na UTF-8 (viz stránku Správa).';
 $string['unicoderequired'] = 'Je nezbytné ukládání dat v kódování Unicode (UTF-8). Nové instalace musí být založeny nad databází s výchozím kódováním Unicode. Pokud přecházíte z nižších verzí, měli byste podstoupit proces migrace na UTF-8 (viz stránku Správa).';
@@ -181,4 +311,6 @@ $string['wrongsourcebase'] = 'Chybné URL zdrojového serveru';
 $string['wrongzipfilename'] = 'Chybné jméno souboru ZIP';
 $string['wwwroot'] = 'Webová adresa';
 $string['wwwrooterror'] = 'Parametr \'Webová adresa\' je zřejmě nastaven nesprávně -- v zadaném umístění se nepodařilo najít instalaci Moodlu. Ve formuláři níže byla automaticky nastavena výchozí hodnota.';
+$string['xmlrpcrecommended'] = 'Instalace rozšíření pro podporu XML-RPC je velmi užitečná pro síťové funkce Moodlu.';
+$string['ziprequired'] = 'PHP rozšíření ZIP je povinné. Nelze již používat binárky info-ZIP nebo knihovnu PclZip.';
 ?>
@@ -0,0 +1,335 @@
+<?php
+/// Please, do not edit this file manually! It's auto generated from
+/// contents stored in your standard lang pack files:
+/// (langconfig.php, install.php, moodle.php, admin.php and error.php)
+///
+/// If you find some missing string in Moodle installation, please,
+/// keep us informed using http://moodle.org/bugs Thanks!
+///
+/// File generated by cvs://contrib/lang2installer/installer_builder
+/// using strings defined in stringnames.txt (same dir)
+
+$string['admindirerror'] = 'Mae cyfeiriadur y gweinyddwr a roddwyd yn anghywir';
+$string['admindirname'] = 'Cyfeiriadur y Gweinyddwr';
+$string['admindirsetting'] = 'Nifer fach iawn o westeiwyr gwe sy\'n defnyddio /admin fel URL arbennig i chi gael mynd i mewn i\'r  
+    panel rheoli neu beth bynnag. Yn anffodus, mae hyn yn gwrthdaro â 
+    lleoliad safonol tudalennau gweinyddol Moodle. Gallwch drwsio hyn drwy 
+    ailenwi cyfeiriadur y gweinyddwr wrth osod y rhaglen, a rhoi\'r  
+    enw newydd yma.  Er enghraifft: <br /> <br /><b>gweinyddmoodle</b><br /> <br />
+    Bydd hyn yn trwsio\'r dolenni gweinyddol yn Moodle.';
+$string['admindirsettinghead'] = 'Gosod cyfeiriadur y gweinyddwr...';
+$string['admindirsettingsub'] = 'Nifer fach iawn o westeiwyr gwe sy\'n defnyddio /admin fel URL arbennig i chi gael mynd i mewn i\'r 
+panel rheoli neu beth bynnag. Yn anffodus, mae hyn yn gwrthdaro â  
+lleoliad safonol tudalennau gweinyddol Moodle. Gallwch drwsio hyn drwy 
+ailenwi cyfeiriadur y gweinyddwr wrth osod y rhaglen, a rhoi\'r  
+enw newydd yma. Er enghraifft: <br /> <br /><b>gweinyddmoodle</b><br /> <br />
+Bydd hyn yn trwsio dolenni gweinyddol yn Moodle.';
+$string['availablelangs'] = 'Y pecynnau iaith sydd ar gael';
+$string['bypassed'] = 'Pasio Heibio';
+$string['cannotcreatelangdir'] = 'Does dim modd creu cyfeiriadur iaith.';
+$string['cannotcreatetempdir'] = 'Does dim modd creu cyfeiriadur dros dro.';
+$string['cannotdownloadcomponents'] = 'Does dim modd llwytho cydrannau i lawr.';
+$string['cannotdownloadzipfile'] = 'Does dim modd llwytho ffeil ZIP i lawr.';
+$string['cannotfindcomponent'] = 'Does dim modd canfod cydran.';
+$string['cannotsavemd5file'] = 'Does dim modd cadw ffeil md5.';
+$string['cannotsavezipfile'] = 'Does dim modd cadw ffeil ZIP.';
+$string['cannotunzipfile'] = 'Does dim modd dadzipio\'r ffeil.';
+$string['caution'] = 'Gofal';
+$string['check'] = 'Gwirio';
+$string['chooselanguage'] = 'Dewiswch iaith';
+$string['chooselanguagehead'] = 'Dewis iaith';
+$string['chooselanguagesub'] = 'Dewiswch iaith ar gyfer y broses osod YN UNIG. Gallwch ddewis yr iaith ar gyfer y safle ac ar gyfer defnyddwyr yn nes ymlaen ar sgrin arall.';
+$string['closewindow'] = 'Cau\'r ffenstr hon';
+$string['compatibilitysettings'] = 'Wrthi\'n profi eich gosodiadau PHP ...';
+$string['compatibilitysettingshead'] = 'Wrthi\'n profi eich gosodiadau PHP ...';
+$string['compatibilitysettingssub'] = 'Dylai\'ch gweinydd basio\'r holl brofion hyn fel bod Moodle yn rhedeg yn llwyddiannus';
+$string['componentisuptodate'] = 'Mae\'r gydran wedi\'i diweddaru.';
+$string['configfilenotwritten'] = 'Nid oedd y sgript gosod wedi llwyddo i greu ffeil config.php yn awtomatig a oedd yn cynnwys eich gosodiadau personol, fwy na thebyg oherwydd na ellir ysgrifennu dros y cyfeiriadur Moodle. Gallwch gopïo\'r cod canlynol eich hun i ffeil o\'r enw config.php yng nghyfeiriadur gwraidd Moodle.';
+$string['configfilewritten'] = 'Wedi llwyddo i greu\'r ffeil config.php yn llwyddiannus';
+$string['configurationcomplete'] = 'Wedi gorffen ffurfweddu';
+$string['configurationcompletehead'] = 'Wedi gorffen ffurfweddu';
+$string['configurationcompletesub'] = 'Ceisiodd Moodle gadw eich ffurfwedd mewn ffeil yng ngwraidd eich rhaglen Moodle.';
+$string['continue'] = 'Bwrw ymlaen';
+$string['curlrecommended'] = 'Argymhellir yn gryf eich bod yn gosod y llyfrgell Curl ddewisol fel bo Rhwydweithio Moodle yn gallu gweithio.';
+$string['customcheck'] = 'Archwiliadau Eraill';
+$string['database'] = 'Cronfa ddata';
+$string['databasecreationsettings'] = 'Nawr, bydd angen i chi ffurfweddu gosodiadau\'r gronfa ddata lle y caiff y rhan fwyaf o ddata Moodle ei storio. Caiff y gronfa ddata hon ei chreu\'n awtomatig gan y rhaglen osod
+â\'r gosodiadau a roddir isod.<br />
+<br /> <br />
+<b>Math:</b> wedi\'i osod i \"mysql\" gan y rhaglen osod<br />
+<b>Gwesteiwr:</b> wedi\'i osod i \"localhost\" gan y rhaglen osod<br />
+<b>Enw:</b> enw\'r gronfa ddata, ee moodle<br />
+<b>Defnyddiwr:</b> wedi\'i osod i\'r \"gwraidd\" gan y rhaglen osod<br />
+<b>Cyfrinair:</b> cyfrinair eich cronfa ddata<br />
+<b>Llythrennau Blaen Tablau:</b> dewis i roi llythrennau o flaen pob enw tabl';
+$string['databasecreationsettingshead'] = 'Nawr mae angen i chi ffurfweddu gosodiadau\'r gronfa ddata lle caiff y rhan fwyaf o ddata Moodle
+ei storio. Caiff y gronfa ddata hon ei chreu\'n awtomatig gan y rhaglen osod â\'r gosodiadau a bennir isod.';
+$string['databasecreationsettingssub'] = '<b>Math:</b> wedi\'i osod i \"mysql\" gan y rhaglen osod<br />
+       <b>Gwesteiwr:</b> wedi\'i osod i \"localhost\" gan y rhaglen osod<br />
+       <b>Enw:</b> enw\'r gronfa ddata, ee moodle<br />
+       <b>Defnyddiwr:</b> wedi\'i osod i\'r \"gwraidd\" gan y rhaglen osod<br />
+       <b>Cyfrinair:</b> cyfrinair eich cronfa ddata<br />
+       <b>Llythrennau Blaen Tablau:</b> dewis i roi llythrennau o flaen pob enw tabl';
+$string['databasesettings'] = 'Nawr mae angen i chi ffurfweddu\'r gronfa ddata lle caiff y rhan fwyaf o ddata Moodle 
+ei storio. Mae\'n rhaid bod y gronfa ddata hon wedi cael ei chreu a bod enw defnyddiwr a chyfrinair wedi\'u gosod i fynd i mewn iddi.<br />
+<br /> <br />
+<b>Math:</b> mysql neu postgres7<br />
+<b>Gwesteiwr:</b> ee localhost neu db.isp.com<br />
+<b>Enw:</b> enw\'r gronfa ddata, ee moodle<br />
+<b>Defnyddiwr:</b> enw defnyddiwr ar gyfer eich cronfa ddata<br />
+<b>Cyfrinair:</b> cyfrinair ar gyfer eich cronfa ddata<br />
+<b>Llythrennau Blaen Tablau:</b> dewis i roi llythrennau o flaen pob enw tabl';
+$string['databasesettingshead'] = 'Nawr mae angen i chi ffurfweddu\'r gronfa ddata lle caiff y rhan fwyaf o ddata Moodle 
+ei storio. Mae\'n rhaid bod y gronfa ddata hon wedi cael ei chreu a bod enw defnyddiwr a chyfrinair wedi\'u gosod i fynd i mewn iddi.';
+$string['databasesettingssub'] = '<b>Math:</b> mysql neu postgres7<br />
+<b>Gwesteiwr:</b> ee localhost neu db.isp.com<br />
+<b>Enw:</b> enw\'r gronfa ddata, ee moodle<br />
+<b>Defnyddiwr:</b> enw defnyddiwr ar gyfer eich cronfa ddata<br />
+<b>Cyfrinair:</b> cyfrinair ar gyfer eich cronfa ddata<br />
+<b>Llythrennau Blaen Tablau:</b> dewis i roi llythrennau o flaen pob enw tabl';
+$string['databasesettingssub_mssql'] = '<b>Math:</b> SQL*Server (dim UTF-8) <b><font color=\"red\">Arbrawf! (nid ar gyfer ei ddefnyddio)</font></b><br />
+<b>Gwesteiwr:</b> ee localhost neu db.isp.com<br />
+<b>Enw:</b> enw\'r gronfa ddata, ee moodle<br />
+<b>Defnyddiwr:</b> enw defnyddiwr ar gyfer eich cronfa ddata<br />
+<b>Cyfrinair:</b> cyfrinair ar gyfer eich cronfa ddata<br />
+<b>Llythrennau Blaen Tablau:</b> llythrennau blaen i\'w defnyddio ar gyfer pob enw tabl (gorfodol)';
+$string['databasesettingssub_mssql_n'] = '<b>Math:</b> SQL*Server (wedi galluogi UTF-8)<br />
+<b>Gwesteiwr:</b> ee localhost neu db.isp.com<br />
+<b>Enw:</b> enw\'r gronfa ddata, ee moodle<br />
+<b>Defnyddiwr:</b> enw defnyddiwr ar gyfer eich cronfa ddata<br />
+<b>Cyfrinair:</b> cyfrinair ar gyfer eich cronfa ddata<br />
+<b>Llythrennau Blaen Tablau:</b> llythrennau blaen i\'w defnyddio ar gyfer pob enw tabl (gorfodol)';
+$string['databasesettingssub_mysql'] = '<b>Math:</b> MySQL<br />
+<b>Gwesteiwr:</b> ee localhost neu db.isp.com<br />
+<b>Enw:</b> enw\'r gronfa ddata, ee moodle<br />
+<b>Defnyddiwr:</b> enw defnyddiwr ar gyfer eich cronfa ddat<br />
+<b>Cyfrinair:</b> cyfrinair ar gyfer eich cronfa ddata<br />
+<b>Llythrennau Blaen Tablau:</b> llythrennau blaen i\'w defnyddio ar gyfer pob enw tabl (dewisol)';
+$string['databasesettingssub_oci8po'] = '<b>Math:</b> Oracle<br />
+<b>Gwesteiwr:</b> heb ei ddefnyddio, rhaid ei adael yn wag<br />
+<b>Enw:</b> yr enw a roddwyd i\'r cysylltiad tnsnames.ora<br />
+<b>Defnyddiwr:</b> enw defnyddiwr ar gyfer eich cronfa ddata<br />
+<b>Cyfrinair:</b> cyfrinair ar gyfer eich cronfa ddata<br />
+<b>Llythrennau Blaen Tablau:</b> llythrennau blaen i\'w defnyddio ar gyfer pob enw tabl (gorfodol, dim mwy na 2cc.)';
+$string['databasesettingssub_odbc_mssql'] = '<b>Math:</b> SQL*Server (dros ODBC) <b><font color=\"red\">Arbrawf! (nid ar gyfer ei ddefnyddio)</font></b><br />
+<b>Gwesteiwr:</b> yr enw a roddwyd i\'r DSN yn y panel rheoli ODBC<br />
+<b>Enw:</b> enw\'r gronfa ddata, ee moodle<br />
+<b>Defnyddiwr:</b> enw defnyddiwr ar gyfer eich cronfa ddata<br />
+<b>Cyfrinair:</b> cyfrinair ar gyfer eich cronfa ddata<br />
+<b>Llythrennau Blaen Tablau:</b> llythrennau blaen i\'w defnyddio ar gyfer pob enw tabl (gorfodol)';
+$string['databasesettingssub_postgres7'] = '<b>Math:</b> PostgreSQL<br />
+<b>Gwesteiwr:</b> ee localhost neu db.isp.com<br />
+<b>Enw:</b> enw\'r gronfa ddata, ee moodle<br />
+<b>Defnyddiwr:</b> enw defnyddiwr eich cronfa ddata<br />
+<b>Cyfrinair:</b> cyfrinair ar gyfer eich cronfa ddata<br />
+<b>Llythrennau Blaen Tablau:</b> llythrennau blaen i\'w defnyddio ar gyfer pob enw tabl (gorfodol)';
+$string['dataroot'] = 'Cyfeiriadur Data';
+$string['datarooterror'] = 'Heb lwyddo i ddod o hyd i\'r \'Cyfeiriadur Data\' a nodoch neu ni lwyddwyd i\'w greu. Gallwch naill ai gywiro\'r llwybr neu greu\'r cyfeiriadur hwn eich hun.';
+$string['dbconnectionerror'] = 'Heb lwyddo i gysylltu â\'r gronfa ddata a nodoch. Tarwch olwg dros osodiadau eich cronfa ddata.';
+$string['dbcreationerror'] = 'Gwall wrth greu cronfa ddata. Heb lwyddo i greu\'r gronfa ddata a enwyd â\'r gosodiadau a roddwyd.';
+$string['dbhost'] = 'Gweinydd y Gwesteiwr';
+$string['dbpass'] = 'Cyfrinair';
+$string['dbprefix'] = 'Llythrennau Blaen Tablau';
+$string['dbtype'] = 'Math';
+$string['dbwrongencoding'] = 'Mae\'r gronfa ddata a ddewiswyd yn rhedeg dan un cod nad yw\'n cael ei argymell ($a).Byddai\'n well defnyddio un cronfa ddata wedi\'i hamgodio gydag Unicode (UTF-8) yn lle hynny. Gallwch hepgor y prawf hwn drwy ddewis \"Hepgor y Prawf Amgodio DB\" isod, ond mae\'n bosib y byddwch yn dod ar draws problemau yn y dyfodol.';
+$string['dbwronghostserver'] = 'Rhaid i chi ddilyn rheolau\'r \"Gwesteiwr\" fel a eglurwyd uchod.';
+$string['dbwrongnlslang'] = 'Rhaid i\'r newidyn amgylchedd NLS_LANG yn eich gweinydd gwe ddefnyddio\'r set nodau AL32UTF8. Darllenwch y dogfennau am PHP am sut i ffurfweddu OCI8 yn gywir.';
+$string['dbwrongprefix'] = 'Rhaid i chi ddilyn rheolau \"Llythrennau Blaen Tablau\" fel a eglurwyd uchod';
+$string['directorysettings'] = '<p>A wnewch chi gadarnhau lleoliadau\'r rhaglen Moodle hon.</p>
+
+<p><b>Cyfeiriad ar y We:</b>
+Rhowch y cyfeiriad ar y we llawn lle byddwch yn mynd i mewn i Moodle.  
+Os gellir defnyddio sawl URL i fynd i mewn i\'ch gwefan yna dewiswch 
+yr un fyddai\'ch myfyrwyr yn fwyaf tebygol o\'i ddefnyddio. Peidiwch â chynnwys 
+slaes ar y diwedd.</p>
+
+<p><b>Cyfeiriadur Moodle:</b>
+Rhowch y llwybr cyfeiriadur llawn i\'r rhaglen a osodwyd.
+Gwnewch yn siŵr eich bod yn defnyddio\'r llythrennau bach/mawr cywir.</p>
+
+<p><b>Cyfeiriadur Data:</b>
+Mae Moodle angen lle ar gyfer cadw ffeiliau sy\'n cael eu llwytho i fyny.  Dylai   
+defnyddiwr gweinydd y we (fel arfer \'neb\' neu \'apache\') allu darllen ac YSGRIFENNU ar y cyfeiriadur hwn,  ond ni ddylid gallu mynd i mewn iddo\'n 
+uniongyrchol drwy\'r we.</p>';
+$string['directorysettingshead'] = 'Cadarnhewch leoliadau\'r rhaglen Moodle hon';
+$string['directorysettingssub'] = '<b>Cyfeiriad ar y We:</b>
+Rhowch y cyfeiriad ar y we llawn lle byddwch yn mynd i mewn i Moodle.  
+Os gellir defnyddio sawl URL i fynd i mewn i\'ch gwefan yna dewiswch 
+yr un fyddai\'ch myfyrwyr yn fwyaf tebygol o\'i ddefnyddio. Peidiwch â chynnwys slaes ar y diwedd.
+<br />
+<br />
+<b>Cyfeiriadur Moodle:</b>
+Rhowch y llwybr cyfeiriadur llawn i\'r rhaglen a osodwyd
+Gwnewch yn siŵr eich bod yn defnyddio\'r llythrennau bach/mawr cywir.
+<br />
+<br />
+<b>Cyfeiriadur Data:</b>
+Mae Moodle angen lle ar gyfer cadw ffeiliau sy\'n cael eu llwytho i fyny. Dylai
+defnyddiwr gweinydd y we (fel arfer \'neb\' neu \'apache\') allu darllen ac YSGRIFENNU ar y cyfeiriadur hwn,  ond ni ddylid gallu mynd i mewn iddo\'n 
+uniongyrchol drwy\'r we.';
+$string['dirroot'] = 'Cyfeiriadur Moodle';
+$string['dirrooterror'] = 'Yn ôl pob tebyg, mae gosodiadau \'Cyfeiriadur Moodle\' yn anghywir - nid ydym wedi gallu dod o hyd i raglen Moodle yn y fan honno. Mae\'r gwerth isod wedi cael ei ailosod.';
+$string['download'] = 'Llwytho i lawr';
+$string['downloadedfilecheckfailed'] = 'Heb lwyddo i wirio\'r ffeil a lwythwyd i lawr.';
+$string['downloadlanguagebutton'] = 'Llwytho\'r pecyn iaith &quot;$a&quot;';
+$string['downloadlanguagehead'] = 'Llwytho\'r pecyn iaith i lawr';
+$string['downloadlanguagenotneeded'] = 'Gallwch barhau â\'r broses osod gan ddefnyddio\'r pecyn iaith diofyn, \"$a\".';
+$string['downloadlanguagesub'] = 'Nawr, gallwch ddewis llwytho pecyn iaith i lawr a bwrw ymlaen â\'r broses osod yn yr iaith honno.<br /><br />Os nad ydych chi\'n gallu llwytho\'r pecyn iaith i lawr, bydd y broses osod yn cario ymlaen yn Saesneg. (Ar ôl i\'r broses osod ddod i ben, bydd gennych gyfle i lwytho a gosod pecynnau iaith ychwanegol.)';
+$string['doyouagree'] = 'Ydych chi wedi darllen a deall yr amodau hyn?';
+$string['environmenterrortodo'] = 'Rhaid datrys yr holl broblemau amgylcheddol (gwallau) uchod cyn parhau i osod y fersiwn hwn o Moodle!';
+$string['environmenthead'] = 'Wrthi\'n profi eich amgylchedd ...';
+$string['environmentrecommendcustomcheck'] = 'os yw\'r prawf hwn yn methu, mae\'n dangos problem bosibl';
+$string['environmentrecommendinstall'] = 'wedi\'i argymell i\'w osod/ei alluogi';
+$string['environmentrecommendversion'] = 'argymhellir fersiwn $a->needed ac rydych yn defnyddio $a->current';
+$string['environmentrequirecustomcheck'] = 'rhaid i\'r prawf hwn basio';
+$string['environmentrequireinstall'] = 'angen ei osod/ei alluogi.';
+$string['environmentrequireversion'] = 'Mae angen fersiwn $a->needed ac rydych yn defnyddio $a->current';
+$string['environmentsub'] = 'Rydym yn gwneud yn siŵr fod gwahanol gydrannu eich system yn bodloni gofynion y system';
+$string['environmentxmlerror'] = 'Gwall wrth ddarllen data amgylchedd ($a->error_code)';
+$string['error'] = 'Gwall';
+$string['fail'] = 'Methu';
+$string['fileuploads'] = 'Llwytho ffeiliau i fyny';
+$string['fileuploadserror'] = 'Dylai hwn fod ymlaen';
+$string['fileuploadshelp'] = '<p>Yn ôl pob golwg, nid yw eich gweinydd wedi galluogi llwytho ffeiliau i fyny.</p>
+
+<p>Byddwch dal yn gallu gosod Moodle, ond os nad ydych yn gallu gwneud hyn, ni fyddwch yn gallu 
+   llwytho ffeiliau cyrsiau na delweddau proffil defnyddwyr i fyny.</p>
+
+<p>I alluogi llwytho ffeiliau i fyny, bydd angen i chi (neu weinyddwr eich system) 
+   olygu\'r brif ffeil php.ini ar eich system a newid y gosodiad ar gyfer 
+   <b>file_uploads</b> to \'1\'.</p>';
+$string['gdversion'] = 'Fersiwn GD';
+$string['gdversionerror'] = 'Dylai\'r llyfrgell GD fod ar gael i brosesu a chreu delweddau';
+$string['gdversionhelp'] = '<p>Yn ôl pob golwg, nid oes GD wedi\'i osod ar eich gweinydd.</p>
+
+<p>Llyfrgell yw GD sydd ei hangen ar PHP i adael Moodle i brosesu delweddau 
+   (megis yr eiconau proffil defnyddwyr) ac i greu delweddau newydd (megis 
+   y graffiau log).  Bydd Moodle dal yn gweithio heb GD - ond ni fydd y nodweddion hyn ar gael i chi.</p>
+
+<p>I ychwanegu GD at PHP dan Unix, crynhowch PHP gan ddefnyddio\'r paramedr --with-gd.</p>
+
+<p>fel arfer, gallwch olygu php.ini yn Windows drwy dynnu\'r ddwy slaes o flaen y llinell php_gd2.dll.</p>';
+$string['globalsquotes'] = 'Gafael Anniogel o Ddyfynodau\'r Safle Cyfan';
+$string['globalsquoteserror'] = 'Trwsio eich gosodiadau PHP: analluogi register_globals a/neu galluogi magic_quotes_gpc';
+$string['globalsquoteshelp'] = '<p>Nid ydym yn argymell analluogi Dyfynodau Hud GPC a galluogi Cofrestru Dyfynodau Safle Cyfan ar yr un pryd.</p>
+
+<p>Dyma\'r gosodiad sy\'n cael ei argymell <b>magic_quotes_gpc = Ymlaen</b> a <b>register_globals = Diffodd</b> yn eich ffeil php.ini</p>
+
+<p>Os nad ydych yn gallu mynd i mewn i\'ch php.ini, efallai gallwch roi\'r llinell ganlynol mewn ffeil .htaccess yn eich cyfeiriadur Moodle:
+   <blockquote>php_value magic_quotes_gpc On</blockquote>
+   <blockquote>php_value register_globals Off</blockquote>
+</p>';
+$string['help'] = 'Help';
+$string['iconvrecommended'] = 'Argymhellir yn gryf eich bod yn gosod y llyfrgell ICONV ddewisol er mwyn gwella perfformiad y safle, yn enwedig os gall eich safle ddelio ag ieithoedd heblaw rhai Lladin.';
+$string['info'] = 'Gwybodaeth';
+$string['installation'] = 'Gosod';
+$string['invalidemail'] = 'Cyfeiriad e-bost annilys';
+$string['invalidmd5'] = 'md5 annilys';
+$string['langdownloaderror'] = 'Yn anffodus, ni osodwyd yr iaith ganlynol: \"$a\". Bydd y broses osod yn cario ymlaen yn Saesneg.';
+$string['langdownloadok'] = 'Wedi gosod \"$a\" yn llwyddiannus. Bydd y broses osod yn cario ymlaen yn yr iaith hon.';
+$string['language'] = 'Iaith';
+$string['magicquotesruntime'] = 'Amser Rhedeg Dyfynodau Hud';
+$string['magicquotesruntimeerror'] = 'Dylai hwn fod wedi\'i ddiffodd';
+$string['magicquotesruntimehelp'] = '<p>Dylid diffodd Amser Rhedeg Dyfynodau Hud fel bo Moodle yn gweithio\'n iawn.</p>
+
+<p>Fel arfer, mae wedi\'i ddiffodd yn ddiofyn ... tarwch olwg ar y gosodiad <b>magic_quotes_runtime</b> yn eich ffeil php.ini.</p>
+
+<p><p>Os nad ydych yn gallu mynd i mewn i\'ch php.ini, efallai gallwch roi\'r llinell ganlynol mewn ffeil .htaccess yn eich cyfeiriadur Moodle:
+   <blockquote>php_value magic_quotes_runtime Off</blockquote>
+</p>';
+$string['mbstringrecommended'] = 'Argymhellir yn gryf eich bod yn gosod y llyfrgell MBSTRING ddewisol er mwyn gwella perfformiad y safle, yn enwedig os gall eich safle ddelio ag ieithoedd heblaw rhai Lladin.';
+$string['memorylimit'] = 'Maint y Cof';
+$string['memorylimiterror'] = 'Mae maint y cof PHP wedi\'i osod yn eitaf isel ...efallai y cewch broblemau yn nes ymlaen.';
+$string['memorylimithelp'] = '<p>Mae maint y cof PHP yn eich gweinydd ar hyn o bryd yn $a.</p>
+
+<p>Gall hyn arwain at broblemau â\'r cof yn nes ymlaen, yn enwedig 
+   os ydych wedi galluogi llawer o fodiwlau a/neu lawer o ddefnyddwyr.</p>
+
+<p>Rydym yn argymell eich bod yn ffurfweddu PHP gyda mwy o gof os yn bosib, megis 40M.  
+   Mae sawl ffordd o wneud hyn:</p>
+<ol>
+<li>Os ydych yn gallu, ceisiwch ail-grynhoi PHP gyda <i>--enable-memory-limit</i>.  
+    Bydd hyn yn gadael i Moodle osod maint y cof ei hun.</li>
+<li>Os ydych yn gallu mynd i mewn i\'ch ffeil php.ini, gallwch newid y gosodiad <b>memory_limit</b> 
+    yn y fan honno i tua 40M. Os nad ydych chi\'n gallu gwneud hyn eich hun, efallai  
+    y gallech ofyn i\'ch gweinyddwr wneud hyn i chi.</li>
+<li>Ar rai gweinyddion PHP, gallwch greu ffeil .htaccess yng nghyfeiriadur Moodle  
+    sy\'n cynnwys y llinell hon:
+    <p><blockquote>php_value memory_limit 40M</blockquote></p>
+    <p>Fodd bynnag, ar rai gweinyddion bydd hyn yn atal <b>pob</b> tudalen PHP rhag gweithio 
+    (bydd gwallau\'n ymddangos pan fyddwch yn edrych ar dudalennau) felly bydd rhaid i chi dynnu\'r ffeil .htaccess file.</p></li>
+</ol>';
+$string['missingrequiredfield'] = 'Mae maes gofynnol ar goll';
+$string['moodledocslink'] = 'Dogfennau Moodle ar gyfer y dudalen hon';
+$string['mssql'] = 'SQL*Server (mssql)';
+$string['mssqlextensionisnotpresentinphp'] = 'Nid yw\'r PHP wedi cael ei ffurfweddu\'n iawn gyda\'r estyniad MSSQL er mwyn iddo allu cyfathrebu â SQL*Server.  Tarwch olwg dros eich ffeil php.ini neu ail-grynhoi PHP.';
+$string['mssql_n'] = 'SQL*Server gyda chefnogaeth UTF-8t (mssql_n)';
+$string['mysql'] = 'MySQL (mysql)';
+$string['mysql416bypassed'] = 'Fodd bynnag, os yw eich safle\'n defnyddio ieithoedd iso-8859-1 (Lladin) YN UNIG, gallwch barhau i ddefnyddio\'r MySQL 4.1.12 (neu uwch) sydd wedi\'i osod gennych ar hyn o bryd.';
+$string['mysql416required'] = 'MySQL 4.1.16 yw\'r fersiwn sylfaenol sy\'n ofynnol ar gyfer Moodle 1.6 er mwyn sicrhau y gellir trosi\'r holl ddata i UTF-8 yn y dyfodol.';
+$string['mysqlextensionisnotpresentinphp'] = 'Nid yw\'r PHP wedi cael ei ffurfweddu\'n iawn gyda\'r estyniad MSSQL er mwyn iddo allu cyfathrebu â MySQL.  Tarwch olwg dros eich ffeil php.ini neu ail-grynhoi PHP.';
+$string['name'] = 'Enw';
+$string['next'] = 'Nesaf';
+$string['oci8po'] = 'Oracle (oci8po)';
+$string['ociextensionisnotpresentinphp'] = 'Nid yw\'r PHP wedi cael ei ffurfweddu\'n iawn gyda\'r estyniad OCI8 er mwyn iddo allu cyfathrebu ag Oracle. Tarwch olwg dros eich ffeil php.ini neu ail-grynhoi PHP.';
+$string['odbcextensionisnotpresentinphp'] = 'Nid yw\'r PHP wedi cael ei ffurfweddu\'n iawn gyda\'r estyniad ODBC er mwyn iddo allu cyfathrebu â SQL*Server. Tarwch olwg dros eich ffeil php.ini neu ail-grynhoi PHP.';
+$string['odbc_mssql'] = 'SQL*Server over ODBC (odbc_mssql)';
+$string['ok'] = 'IAWN';
+$string['opensslrecommended'] = 'Argymhellir yn gryf eich bod yn gosod y llyfrgell OpenSSL ddewisol -- mae\'n galluogi Rhwydweithio Moodle.';
+$string['pass'] = 'Pasio';
+$string['password'] = 'Cyfrinair';
+$string['pgsqlextensionisnotpresentinphp'] = 'Nid yw\'r PHP wedi cael ei ffurfweddu\'n iawn gyda\'r estyniad PGSQL er mwyn iddo allu cyfathrebu â PostgreSQL. Tarwch olwg dros eich ffeil php.ini neu ail-grynhoi PHP.';
+$string['php50restricted'] = 'Mae PHP 5.0.x yn frith o broblemau hysbys; uwchraddiwch i 5.1.x neu israddiwch i 4.3.x neu 4.4.x';
+$string['phpversion'] = 'Fersiwn PHP';
+$string['phpversionerror'] = 'Mae\'n rhaid i\'r fersiwn PHP fod yn o leiaf 4.3.0 neu 5.1.0 (mae llawer o broblemau gyda 5.0.x).';
+$string['phpversionhelp'] = '<p>Mae angen o leiaf fersiwn PHP 4.3.0 neu 5.1.0 ar Moodle (mae llawer o broblemau gyda 5.0.x).</p>
+<p>Ar hyn o bryd, rydych yn rhedeg fersiwn $a</p>
+<p>Rhaid i chi uwchraddio PHP neu newid i westeiwr â fersiwn diweddarach o PHP!<br/>
+(Os oes gennych 5.0.x gallwch hefyd is-raddio i fersiwn 4.4.x)</p>';
+$string['postgres7'] = 'PostgreSQL (postgres7)';
+$string['previous'] = 'Blaenorol';
+$string['releasenoteslink'] = 'I gael gwybodaeth am y fersiwn hwn o Moodle, gweler y <a target=\"_new\" href=\"$a\">Nodiadau Rhyddhau</a> ar-lein';
+$string['remotedownloadnotallowed'] = 'Ni chaniateir llwytho cydrannau i lawr i\'ch gweinydd (mae allow_url_fopen wedi\'i analluogi).<br /><br />Rhaid i chi lwytho\'r ffeil <a href=\"$a->url\">$a->url</a> i lawr eich hun, ei chopïo i \"$a->dest\" yn eich gweinydd, a\'i dadzipio yno.';
+$string['report'] = 'Adroddiad';
+$string['restricted'] = 'Wedi\'i wahardd';
+$string['safemode'] = 'Modd Diogel';
+$string['safemodeerror'] = 'Mae\'n bosibl y bydd Moodle yn profi problemau os yw\'r modd diogel ymlaen';
+$string['safemodehelp'] = '<p>Mae\'n bosibl y bydd Moodle yn profi llawer o broblemau os yw\'r modd diogel ymlaen. Un broblem y gallech ddod ar ei thraws yw 
+   na fyddwch o bosib yn gallu creu ffeiliau newydd.</p>
+   
+<p>Fel arfer, dim ond gwesteiwyr gwe cyhoeddus paranoid sy\'n troi\'r modd diogel ymlaen, felly efallai y  
+   bydd rhaid i chi gael cwmni gwesteiwr gwe newydd ar gyfer eich safle Moodle.</p>
+   
+<p>Gallwch roi cynnig ar fwrw ymlaen i osod, ond mae\'n siŵr y byddwch yn dod ar draws rhai problemau yn nes ymlaen.</p>';
+$string['serverchecks'] = 'Archwiliadau Gweinydd';
+$string['sessionautostart'] = 'Awto Gychwyn y Sesiwn';
+$string['sessionautostarterror'] = 'Dylai hwn fod wedi\'i ddiffodd';
+$string['sessionautostarthelp'] = '<p>Mae angen cefnogaeth sesiwn ar Moodle ac ni fydd yn gweithio hebddo.</p>
+
+<p>Gallwch alluogi sesiynau yn y ffeil php.ini file ... chwiliwch am y paramedr session.auto_start.</p>';
+$string['skipdbencodingtest'] = 'Hepgor Prawf Amgodio DB';
+$string['status'] = 'Statws';
+$string['thischarset'] = 'UTF-8';
+$string['thisdirection'] = 'ltr';
+$string['thislanguage'] = 'Cymraeg';
+$string['unicoderecommended'] = 'Argymhellir storio eich holl ddata yn Unicode (UTF-8). Dylid gosod fersiynau newydd mewn cronfeydd data sydd ag Unicode fel set nodau ddiofyn. Os ydych chi\'n uwchraddio, dylech gyflawni\'r broses mudo UTF-8 (gweler y dudalen Gweinyddwyr).';
+$string['unicoderequired'] = 'Mae\'n ofynnol eich bod yn storio eich holl ddata ar fformat Unicode (UTF-8). Rhaid gosod fersiynau newydd mewn cronfeydd data sydd ag Unicode fel set nodau ddiofyn. Os ydych chi\'n uwchraddio, dylech gyflawni\'r broses mudo UTF-8 (gweler y dudalen Gweinyddwyr).';
+$string['user'] = 'Defnyddiwr';
+$string['welcomep10'] = '$a->installername ($a->installerversion)';
+$string['welcomep20'] = 'Rydych chi\'n gweld y dudalen hon gan eich bod wedi gosod a  
+    lansio\'r pecyn <strong>$a->packname $a->packversion</strong> yn llwyddiannus ar eich cyfrifiadur. Llongyfarchiadau!';
+$string['welcomep30'] = 'Mae\'r fersiwn <strong>$a->installername</strong> yn cynnwys rhaglenni 
+    i greu amgylchedd y gall  <strong>Moodle</strong> weithio ynddo, sef:';
+$string['welcomep40'] = 'Mae\'r pecyn hefyd yn cynnwys <strong>Moodle $a->moodlerelease ($a->moodleversion)</strong>.';
+$string['welcomep50'] = 'Y trwyddedau perthnasol sy\'n llywodraethu dros yr holl raglenni yn y pecyn hwn. Y pecyn cyflawn yw <strong>$a->installername</strong> 
+    <a href=\"http://www.opensource.org/docs/definition_plain.html\">open source</a> a chaiff ei ddosbarthu dan y drwydded <a href=\"http://www.gnu.org/copyleft/gpl.html\">GPL</a>.';
+$string['welcomep60'] = 'Bydd y tudalennau canlynol yn eich arwain drwy\'r camau syml i  
+    ffurfweddu a gosod <strong>Moodle</strong> ar eich cyfrifiadur. Gallwch ddewis derbyn y gosodiadau 
+    diofyn, neu gallwch eu newid eich hun ar gyfer eich dibenion chi.';
+$string['welcomep70'] = 'Cliciwch y botwm \"Nesaf\" i fwrw ymlaen i osod <strong>Moodle</strong>.';
+$string['wrongdestpath'] = 'Llwybr cyrchfan anghywir.';
+$string['wrongsourcebase'] = 'Bôn URL ffynhonnell anghywir.';
+$string['wrongzipfilename'] = 'Enw ffeil ZIP anghywir.';
+$string['wwwroot'] = 'Cyfeiriad ar y we';
+$string['wwwrooterror'] = 'Nid yw\'r \'Cyfeiriad ar y We\' yn ddilys - yn ôl pob tebyg, nid yw\'r rhaglen Moodle yn y cyfeiriad hwn. Mae\'r gwerth isod wedi cael ei ailosod.';
+?>
@@ -7,13 +7,16 @@
 /// keep us informed using http://moodle.org/bugs Thanks!
 ///
 /// File generated by cvs://contrib/lang2installer/installer_builder
-/// using strings defined in installer_strings (same dir)
+/// using strings defined in stringnames.txt (same dir)

 $string['admindirerror'] = 'Det angivne adminbibliotek er forkert';
 $string['admindirname'] = 'Adminbibliotek';
+$string['admindirsetting'] = 'Nogle få web-hoteller bruger /admin som en speciel URL til at administrere web-hotellet. Det er et problem da Moodle også bruger /admin som standard til administrationssiderne. Hvis det er så kan du omdøbe adminbiblioteket og så angive den nye sti til admin biblioteket her. For eksempel: <br /> <br /><b>moodleadmin</b><br /> <br />
+Dette vil rette admin linkene i Moodle.';
 $string['admindirsettinghead'] = 'Sætter admin-biblioteket...';
 $string['admindirsettingsub'] = 'Nogle får webhoteller bruger /admin adresse til kontrolpanelet el.lign. Desværre konflikter dette med standardplaceringen af Moodles administrationssider. Du kan i så tilfælde omdøbe admin-biblioteket i din installation og skrive navnet her. Eksempel:<br /> <br /><b>moodleadmin</b><br /> <br />
 Dette vil sikre admin-links i Moodle.';
+$string['availablelangs'] = 'Tilgængelige sprogpakker';
 $string['bypassed'] = 'Forbigået';
 $string['cannotcreatelangdir'] = 'Kan ikke oprette sprogmappe';
 $string['cannotcreatetempdir'] = 'Kan ikke oprette temp-mappe';
@@ -25,18 +28,29 @@ $string['cannotsavezipfile'] = 'Kan ikke gemme zip-fil';
 $string['cannotunzipfile'] = 'Kan ikke unzippe filen';
 $string['caution'] = 'Pas på';
 $string['check'] = 'Kontroller';
+$string['chooselanguage'] = 'Vælg et sprog';
 $string['chooselanguagehead'] = 'Vælg et sprog';
 $string['chooselanguagesub'] = 'Vælg et sprog til brug under installationen. Senere vil du kunne vælge hvilke sprog Moodle skal kunne bruge.';
 $string['closewindow'] = 'Luk dette vindue';
+$string['compatibilitysettings'] = 'Kontrollerer dine PHP-indstillinger...';
 $string['compatibilitysettingshead'] = 'Kontrollerer dine PHP-indstillinger...';
 $string['compatibilitysettingssub'] = 'For at Moodle kan køre uden problemer skal din server \"bestå\" alle disse test.';
-$string['componentisuptodate'] = 'Komponenten er up to date';
+$string['componentisuptodate'] = 'Komponenten er ajour';
 $string['configfilenotwritten'] = 'Installationsscriptet var ikke i stand til at oprette config.php-filen, der indeholder de valgte indstillinger, sandsynligvis fordi  Moodlebiblioteket er skrivebeskyttet. Du kan manuelt kopiere den følgende kode ind i en fil med navnet \"config.php\" i roden af Moodle-biblioteket.';
 $string['configfilewritten'] = 'config.php er blevet oprettet';
+$string['configurationcomplete'] = 'Konfigurationen er færdig.';
 $string['configurationcompletehead'] = 'Konfigurationen er færdig.';
 $string['configurationcompletesub'] = 'Moodle har forsøgt at gemme din konfiguration i en fil i roden af Moodle-installationen';
 $string['continue'] = 'Fortsæt';
 $string['database'] = 'Database';
+$string['databasecreationsettings'] = 'Nu skal du konfigurere indstillingerne i databasen for hvor de fleste Moodle-data skal gemmes. Databasen vil blive oprettet automatisk af installationsprogrammet med indstillingerne herunder.<br />
+<br /> <br />
+<b>Type:</b> fikseret til \"mysql\" af installationsprogrammet<br />
+<b>Host:</b> fikseret til \"localhost\" af installationsprogrammet<br />
+<b>Name:</b> database-navn, f.eks. Moodle<br />
+<b>User:</b> fikseret til \"root\" af installationsprogrammet<br />
+<b>Password:</b> adgangskoden til din database<br />
+<b>Tables Prefix:</b> valgfrit fornavn (prefix) til alle tabelnavne';
 $string['databasecreationsettingshead'] = 'Nu skal du konfigurere databaseindstillingerne for hvor de fleste Moodle-data skal gemmes. Denne database vil automatisk blive oprettet af installationsprogrammet med indstillingerne herunder.';
 $string['databasecreationsettingssub'] = '<b>Type:</b> fikseret til \"mysql\" af installationsprogrammet<br />
 <b>Host:</b> fikseret til \"localhost\" af installationsprogrammet<br />
@@ -44,6 +58,14 @@ $string['databasecreationsettingssub'] = '<b>Type:</b> fikseret til \"mysql\" af
 <b>User:</b> fikseret til \"root\" af installationsprogrammet<br />
 <b>Password:</b> adgangskoden til din database<br />
 <b>Tables Prefix:</b> valgfrit fornavn (prefix) til alle tabelnavne';
+$string['databasesettings'] = 'Du skal nu konfigurere databasen hvor det meste af Moodle\'s data vil blive gemt. Databaseserveren skal allerede være oprettet og du skal bruge brugernavn og password til en brugerkonto der har rettigheder til at oprette og hente data.<br />
+<br /> <br />
+<b>Type:</b> mysql eller postgres7<br />
+<b>Vært:</b> f.eks. localhost eller db.isp.com<br />
+<b>Database:</b> database-navn, f.eks. Moodle<br />
+<b>Bruger:</b> Brugernavnet til databasen<br />
+<b>Password:</b> Password til databasebrugeren<br />
+<b>Tabel Præfix:</b> Valgfrit fornavn (prefix) der bliver sat foran alle tabelnavne (kan anbefales hvis der er flere systemer der skal bruge samme database).';
 $string['databasesettingshead'] = 'Du skal nu konfigurere databasen hvor det meste af Moodle\'s data vil blive gemt. Databaseserveren skal allerede være oprettet og du skal bruge brugernavn og adgangskode til en brugerkonto der har adgang til den.';
 $string['databasesettingssub'] = '<b>Type:</b> mysql eller postgres7<br />
 <b>Vært:</b> f.eks. localhost eller db.isp.com<br />
@@ -69,6 +91,12 @@ $string['databasesettingssub_mysql'] = '<b>Type:</b> MySQL<br />
 <b>Bruger:</b> brugernavnet til din database<br />
 <b>Password:</b> din databases adgangskode<br />
 <b>Tabelprefix:</b> prefix for alle tabelnavne (mandatory)';
+$string['databasesettingssub_mysqli'] = '<b>Type:</b> Forbedret MySQL<br />
+<b>Vært:</b> ex localhost eller db.isp.com<br />
+<b>Navn:</b> databasenavn, ex moodle<br />
+<b>Bruger:</b> dit brugernavn til databasen<br />
+<b>Adgangskode:</b> din adgangskode til databasen<br />
+<b>Tabelprefix:</b> prefix til alle navne i tabellen (valgfri)';
 $string['databasesettingssub_oci8po'] = '<b>Type:</b> Oracle<br />
 <b>Vært:</b> ikke brugt, skal være blank<br />
 <b>Navn:</b> navnet på forbindelsen fra tnsnames.ora <br />
@@ -87,11 +115,14 @@ $string['databasesettingssub_postgres7'] = '<b>Type:</b> PostgreSQL<br />
 <b>Bruger:</b> dit databasebrugernavn<br />
 <b>Password:</b> dit database password<br />
 <b>Tables Præfix:</b> præfix der bruges foran alle tabelnavnene (nødvendigt)';
+$string['databasesettingswillbecreated'] = '<b>Note:</b> Installationsprocessen vil søge at oprette en database hvis ikke den findes allerede.';
 $string['dataroot'] = 'Databibliotek';
 $string['datarooterror'] = 'Data-biblioteket du specificerede kan ikke findes eller oprettes. Ret stien til biblioteket eller opret det manuelt.';
+$string['datarootpublicerror'] = 'Den datamappe du har angivet har direkte adgang fra internettet, du skal bruge en anden mappe.';
 $string['dbconnectionerror'] = 'Den angive database kunne ikke kontaktes. Kontroller eller ret venligst databaseinformationerne.';
 $string['dbcreationerror'] = 'Fejl ved oprettelse af databasen. Kan ikke oprette den givne database med de angivne indstillinger.';
 $string['dbhost'] = 'Værtsserver';
+$string['dbpass'] = 'Password';
 $string['dbprefix'] = 'Præfix for tabeller';
 $string['dbtype'] = 'Type';
 $string['dbwrongencoding'] = 'Den valgte database kører under en ikke anbefalet encoding ($a). Det vil være bedre at benytte en Unicode (UTF-8) encoded database i stedet. 
@@ -99,6 +130,16 @@ Du kan alligevel springe denne test over ved at vælge \"Skip DB Encoding Test\"
 $string['dbwronghostserver'] = 'Du skal følge \"Værtsreglerne\" som forklaret ovenfor.';
 $string['dbwrongnlslang'] = 'Environment variablen NLS_LANG  på din webserver skal bruge AL32UTF8 tegnsættet. Se PHP documentationen for hvordan man konfigurere OCI8 korrekt.';
 $string['dbwrongprefix'] = 'Du skal følge Tabel-prefix-reglerne som forklaret ovenfor.';
+$string['directorysettings'] = '<p>Kontroller venligst placeringen af af Moodle-installationen.</p>
+
+<p><b>Web-adresse:<b>
+Angiv den fulde web-adresse (URL) til Moodle. Hvis sitet kan tilgås fra flere URL\'er så vælg den mest naturlige, den som de studerende oftest vil bruge. Der må ikke være en skråstreg til sidst.</p>
+
+<p><b>Moodle-bibliotek:</b>
+Angiv den fulde sti til Moodle-installationen. Stien er casesensitiv.</p>
+
+<p><b>Moodles Databibliotek</b>
+Det bibliotek hvor Moodle kan gemme uploadede filer. Dette bibliotek skal være læsbart OG SKRIVBART af den bruger apache kører under, (typisk \'nobody\' eller \'apache\') men der må ikke være direkte adgang til det fra internettet.</p>';
 $string['directorysettingshead'] = 'Bekræft hvor Moodle skal installeres';
 $string['directorysettingssub'] = '<b>Web-adresse:</b>
 Angiv den fulde adresse til Moodle. Hvis der skal være adgang til siden fra flere URL\'er så vælg den naturligste, den deltagerne vil bruge. Adressen må ikke slutte med en skråstreg (slash).
@@ -113,13 +154,14 @@ Det sted, hvor Moodle placerer uploadede filer. Dette bibliotek skal være læse
 $string['dirroot'] = 'Moodle-bibliotek';
 $string['dirrooterror'] = 'Det angivne Moodle-bibliotek lader ikke til at være rigtigt - der kan ikke findes en Moodle-installation. Den nedenstående værdi er blevet fjernet.';
 $string['download'] = 'Download';
-$string['downloadedfilecheckfailed'] = '\"Downloadet fil-tjek fejlede';
+$string['downloadedfilecheckfailed'] = 'Downloadet fil-tjek fejlede';
 $string['downloadlanguagebutton'] = 'Download \"$a\"-sprogpakken';
 $string['downloadlanguagehead'] = 'Download sprogpakke';
 $string['downloadlanguagenotneeded'] = 'Du kan fortsætte installationen med standard-sprogpakken,\"$a\".';
 $string['downloadlanguagesub'] = 'Du har nu mulighed for at downloade en sprogpakke og fortsætte installationsprocessen i dette sprog.<br /><br />
 Kan du ikke downloade sprogpakken vil installationen fortsætte på engelsk.
 (Når installationsprocessen er færdig kan du downloade og installere flere sprogpakker.)';
+$string['doyouagree'] = 'Har du læst og forstået disse betingelser?';
 $string['environmenterrortodo'] = 'Du bliver nødt til at løse de ovenstående problemer (fejl) der er ved serveropsætningen før du kan installere denne version af Moodle';
 $string['environmenthead'] = 'Kontrollere din serveropsætning...';
 $string['environmentrecommendinstall'] = 'det anbefales installeret/aktiveret';
@@ -132,6 +174,11 @@ $string['error'] = 'Fejl';
 $string['fail'] = 'Mislykkedes';
 $string['fileuploads'] = 'Fil uploads';
 $string['fileuploadserror'] = 'Denne skulle være aktiveret';
+$string['fileuploadshelp'] = '<p>Fil-upload lader til at være slået fra på din server.</p>
+
+<p>Moodle kan stadig installeres, men uden senere mulighed for at uploade kursusfiler og profilbilleder.</p>
+
+<p>For at tillade upload skal du (eller systemadministratoren) rette i php.ini og ændre indstillingen for <b>fil_uploads</b> til \'1\'.</p>';
 $string['gdversion'] = 'GD version';
 $string['gdversionerror'] = 'GD library skal være tilgængelig for PHP for at der billeder kan manipuleres og oprettes.';
 $string['gdversionhelp'] = '<p>Det lader til at din server ikke har GD installeret.</p>
@@ -143,16 +190,35 @@ $string['gdversionhelp'] = '<p>Det lader til at din server ikke har GD installer
 <p>Under windows er det normalt nok at udkommentere den linje i php.ini der refererer til libgd.dll </p>';
 $string['globalsquotes'] = 'Usikker håndtering af Globale variabler';
 $string['globalsquoteserror'] = 'Fix dine PHP-indstillinger: aktiver register_globals and/or slå magic_quotes_gpc til';
+$string['globalsquoteshelp'] = '<p>
+Kombinationen af deaktiveret \"Magic Quotes GPC\" og aktiveret \"Register Globals\" samtidig anbefales ikke.</p>
+
+<p>Den anbefalede indstilling er
+<b>magic_quotes_gpc = On</b> og <b>register_globals = Off</b> i php.ini</p>
+
+<p>Har du ikke adgang til php.ini, kan du sikkert ikke indsætte denne linje i filen .htaccess i dit Moodle-bibliotek:
+
+<blockquote>php_value magic_quotes_gpc On</blockquote>
+<blockquote>php_value register_globals Off</blockquote>
+</p>';
 $string['help'] = 'Hjælp';
 $string['iconvrecommended'] = 'Det anbefales at installere/aktivere ICONV udvidelsen for at forbedre sitets hastighed, især hvis dit site understøtter sprog med ikke-latinske tegn.';
 $string['info'] = 'Information';
 $string['installation'] = 'Installation';
+$string['invalidemail'] = 'Ugyldig e-mail-adresse';
 $string['invalidmd5'] = 'Ugyldig md5';
+$string['invalidurl'] = 'Ugyldig URL';
 $string['langdownloaderror'] = 'Sproget \"$a\" blev desværre ikke installeret. Installationen vil fortsætte på engelsk.';
 $string['langdownloadok'] = 'Sproget \"$a\" blev installeret. Installationen vil fortsætte på dette sprog.';
 $string['language'] = 'Sprog';
 $string['magicquotesruntime'] = 'Magic Quotes Run Time';
 $string['magicquotesruntimeerror'] = 'Denne skulle være deaktiveret';
+$string['magicquotesruntimehelp'] = '<p>\'Magic quotes runtime\' bør slås fra for at Moodle kan fungere ordentligt.</p>
+
+<p>Normalt er denne indstilling slået fra som standard. Den slås til og fra vha. indstillingen <b>\'magic_quotes_runtime\'</b> i php.ini fil.</p>
+
+<p>Hvis du ikke har adgang til webserverens php.ini fil kan du evt. lave en tekstfil, kalde den .htaccess og gemme den i Moodle-biblioteket. Den skal indholde linjen. <blockquote>php_value magic_quotes_runtime Off</blockquote>
+</p>';
 $string['mbstringrecommended'] = 'Det anbefales at installere/aktivere MBSTRING udvidelsen for at forbedre sitets ydeevne, især hvis sitet understøtter ikke-latinske sprog og tegn.';
 $string['memorylimit'] = 'Hukommelsesbegrænsning';
 $string['memorylimiterror'] = 'Den tilgængelige hukommelse til PHP er ret lav... Det kan være at der opstår problemer senere.';
@@ -171,20 +237,22 @@ indstillingen så der er minimum 16Mb til rådighed. Hvis du ikke har direkte ad
 <p>Det kan dog på nogle servere forårsage en fejl på <b>alle</b> PHP-siderne. I så fald kan du blive nødt til at fjerne \'.htaccess\' filen igen.</p></li>
 </ol>';
 $string['missingrequiredfield'] = 'Der mangler nogle obligatoriske felter';
-$string['moodledocslink'] = 'Moodle Doks for denne side';
+$string['moodledocslink'] = 'Moodle Docs for denne side';
 $string['mssql'] = 'SQL*Server (mssql)';
-$string['mssql_n'] = 'SQL*Server med UTF-8 support (mssql_n)';
 $string['mssqlextensionisnotpresentinphp'] = 'PHP er ikke konfigureret ordentligt med MSSQL-extensionen så den kan kommunikere med SQL*Serveren. Vær venlig at tjekke din php.ini-fil eller genkompiler PHP.';
+$string['mssql_n'] = 'SQL*Server med UTF-8 support (mssql_n)';
 $string['mysql'] = 'MySQL (mysql)';
 $string['mysql416bypassed'] = 'Hvis sitet kun benytter iso-8859-1 (latin-1) sprog/tegnsæt, kan du fortsætte med at benytte den nuværende version 4.1.12 af MySQL (eller nyere)';
 $string['mysql416required'] = 'Moodle 1.6 skal som minimum bruge MySql version 4.1.16 for at garantere at data kan konverteres til UTF-8 fremover.';
 $string['mysqlextensionisnotpresentinphp'] = 'PHP er ikke blevet ordentligt konfigureret med MySQL  udvidelsen så den kan kommunikere med MySQL. Det kan skyldes at MySQL extension/dll ikke er loadet. Kontroller venlist phpinfo() og php.ini filen eller rekompiler PHP.';
+$string['mysqli'] = 'Forbedret MySql (mysqli)';
+$string['mysqliextensionisnotpresentinphp'] = 'PHP er ikke konfigureret korrekt med MySqli extensionen så den kan kommunikere med MySql. Tjek php.ini eller rekompiler PHP, MySqli extensionen er ikke tilgængelig for PHP 4';
 $string['name'] = 'Navn';
 $string['next'] = 'Næste';
 $string['oci8po'] = 'Oracle (oci8po)';
 $string['ociextensionisnotpresentinphp'] = 'PHP er ikke konfigureret ordentligt med OCI8-extensionen så den kan kommunikere med Oracle. Vær venlig at tjekke din php.ini-fil eller genkompiler PHP.';
-$string['odbc_mssql'] = 'SQL*Server over ODBC (odbc_mssql)';
 $string['odbcextensionisnotpresentinphp'] = 'PHP er ikke blevet korrekt konfigureret med PHP\'s ODBC modul så den kan kommunikere med SQL*Serveren. Kontroller venligst php.ini filen eller rekompiler PHP.';
+$string['odbc_mssql'] = 'SQL*Server over ODBC (odbc_mssql)';
 $string['ok'] = 'OK';
 $string['pass'] = 'OK';
 $string['password'] = 'Adgangskode';
@@ -197,20 +265,30 @@ $string['phpversionhelp'] = '<p>Moodle kræver en PHP version der er nyere end 4
 <p>Du bliver nødt til at opdatere PHP eller flytte systemet over på en anden webserver der har en nyere version af PHP!</p>';
 $string['postgres7'] = 'PostgreSQL (postgres7)';
 $string['previous'] = 'Forrige';
+$string['releasenoteslink'] = 'For information om denne version af Moodle kan du læse <a target=\"_new\" href=\"$a\">Versions info</a> online';
 $string['remotedownloadnotallowed'] = 'Download af komponenter til din server er ikke tilladt (\"allow_url_fopen\" er deaktiveret).<br /><br />Du må downloade 
 <a href=\"$a->url\">$a->url</a>-filen manuelt, kopiere den til \"$a->dest\" til din server og unzippe den der.';
 $string['report'] = 'Rapport';
 $string['restricted'] = 'Afvist';
 $string['safemode'] = 'Safe mode';
 $string['safemodeerror'] = 'Moodle kan have problemer med \"Safe mode : on\"';
+$string['safemodehelp'] = '<p>Moodle kan have flere problemer når \'safe mode\' er slået til, ikke mindst kan systemet sandsynligvis ikke oprette nye filer.</p>
+
+<p>\'Safe Mode\' er oftest slået til hos paranoide offentlige webhoteller, så det kan være at du bliver nødt til at finde et andet webhotel til Moodle.</p>
+
+<p>Du kan godt fortsætte installationen, men der vil sandsynligvis opstå problemer senere.</p>';
 $string['sessionautostart'] = 'Session autostart';
 $string['sessionautostarterror'] = 'Denne skulle være deaktiveret';
+$string['sessionautostarthelp'] = '<p>Moodle kræver at PHP understøtter sessions.</p>
+
+<p>Sessions kan aktiveres i php.ini filen ... kik efter parameteren session.auto_start</p>';
 $string['skipdbencodingtest'] = 'Spring DB tegnsæts testen over';
 $string['status'] = 'Status';
 $string['thischarset'] = 'UTF-8';
+$string['thisdirection'] = 'ltr';
 $string['thislanguage'] = 'Dansk';
-$string['unicoderecommended'] = 'Alle data skal helst gemmes i Unicode (UTF-8). Nye installationer skal helst installeres i databaser der har UTF-8 som standard karaktersæt. Hvis du opgradere fra en tidligere installation bør du migrere eksisterende data til UTF-8 (se Admin siderne)';
-$string['unicoderequired'] = 'Alle data skal gemmes i Unicode (UTF-8). Nye installationer skal helst installeres i databaser der har UTF-8 som standard karaktersæt. Hvis du opgradere fra en tidligere installation bør du migrere eksisterende data til UTF-8 (se Admin siderne)';
+$string['unicoderecommended'] = 'Alle data skal helst gemmes i Unicode (UTF-8). Nye installationer skal helst installeres i databaser der har UTF-8 som standard karaktersæt. Hvis du opgraderer fra en tidligere installation bør du migrere eksisterende data til UTF-8 (se Admin siderne)';
+$string['unicoderequired'] = 'Alle data skal gemmes i Unicode (UTF-8). Nye installationer skal helst installeres i databaser der har UTF-8 som standard karaktersæt. Hvis du opgraderer fra en tidligere installation bør du migrere eksisterende data til UTF-8 (se Admin siderne)';
 $string['user'] = 'Bruger';
 $string['welcomep10'] = '$a->installername ($a->installerversion)';
 $string['welcomep20'] = 'Du ser denne side fordi du med succes har installeret og åbnet pakken <strong>$a->packname $a->packversion</strong> på din computer.
@@ -220,8 +298,8 @@ $string['welcomep40'] = 'Pakken indeholder også <strong>Moodle $a->moodlereleas
 $string['welcomep50'] = 'Brugen af programmerne i denne pakke er styret af deres respektive licenser. Hele <strong>$a->installername</strong>-pakken er <a href=\"http://www.opensource.org/docs/definition_plain.html\">open source</a> og distribueret under <a href=\"http://www.gnu.org/copyleft/gpl.html\">GPL</a>-licensen.';
 $string['welcomep60'] = 'De følgende sider vil hjælpe dig gennem nogle nemme trin til konfiguration og opsætning af <strong>Moodle</strong> på din computer. Du kan acceptere standardindstillingerne eller vælge at ændre dem så de bedre svarer til dine egne behov.';
 $string['welcomep70'] = 'Klik på \"Næste\" herunder for at forsætte opsætningen af <strong>Moodle</strong>.';
-$string['wrongdestpath'] = 'Forkert  destinations sti';
-$string['wrongsourcebase'] = 'Forkert kilde URL';
+$string['wrongdestpath'] = 'Forkert destinationssti';
+$string['wrongsourcebase'] = 'Forkert kilde-URL';
 $string['wrongzipfilename'] = 'Forkert zip-filnavn.';
 $string['wwwroot'] = 'Web-adresse';
 $string['wwwrooterror'] = 'Webadressen lader ikke til at være korrekt - Moodle-installationen kunne ikke findes der.';
@@ -7,14 +7,25 @@
 /// keep us informed using http://moodle.org/bugs Thanks!
 ///
 /// File generated by cvs://contrib/lang2installer/installer_builder
-/// using strings defined in installer_strings (same dir)
+/// using strings defined in stringnames.txt (same dir)

+$string['admindirsetting'] = 'Einige wenige Webhosting-Anbieter benutzen /admin als spezielles Verzeichnis für den Zugang zum Administrationstool oder andere Dinge. Leider kommt es dadurch zu Konflikten mit dem Standard für das Administrationsverzeichnis von Moodle. Du kannst dies ändern, indem du das Verzeichnis /admin in der Moodle-Installation umbenennst. Den geänderten Namen dieses Verzeichnisses musst du hier eingeben, z.B.: <br /> <br /><b>moodleadmin</b><br /> 
+Dies ändert die Links für das Admin-Verzeichnis in Moodle.';
 $string['admindirsettingsub'] = 'Einige wenige Webhosting-Anbieter benutzen /admin als spezielles Verzeichnis für den Zugang zum Administrationstool oder andere Dinge. Leider kommt es dadurch zu Konflikten mit dem Standard für das Administrationsverzeichnis von Moodle. Du kannst dies ändern, indem du das Verzeichnis /admin in der Moodle-Installation umbenennst. Den geänderten Namen dieses Verzeichnisses musst du hier eingeben.
 z.B.: <br /> <br /><b>moodleadmin</b><br /> 
 Dies ändert die Links für das Admin-Verzeichnis in Moodle.';
 $string['chooselanguagesub'] = 'Wähle eine Sprache, die du während der Installation verwenden möchtest. Nach der Installation kannst du die Sprache für die Oberfläche und die Nutzer/innen festlegen.';
 $string['configfilenotwritten'] = 'Das Installationsscript kann die Datei config.php, welche die gewählten Einstellungen enthält, nicht automatisch erstellen. Der webuser hat keine Schreibrechte für das Moodle-Verzeichnis. Du kannst den folgenden Code manuell in der Datei config.php speichern und diese dann ins Hauptverzeichnis Ihrer Moodle-Installation kopieren.';
 $string['configurationcompletesub'] = 'Moodle speichert deine Konfigurationseinstellungen nun im Hauptverzeichnis deiner Moodle-Installation.';
+$string['databasecreationsettings'] = 'Du musst die Datenbankeinstellungen für die Speicherung der Moodle-Daten konfigurieren. Die Datenbank wird automatisch vom Moodle4Windows-Installationsprozess mit den unten festgelegten Einstellungen angelegt:
+<br />
+<br /> <br />
+<b>Typ:</b> \"mysql\" vom Installer festgelegt<br />
+<b>Host:</b> \"localhost\" vom Installer festgelegt<br />
+<b>Name:</b> Datenbankname, z.B. moodle<br />
+<b>User:</b> \"root\" vom Installer festgelegt<br />
+<b>Password:</b> Dein Datenbankpasswort<br />
+<b>Tables Prefix:</b> optionaler Prefix für alle Tabellennamen';
 $string['databasecreationsettingshead'] = 'Du musst Einstellungen für die Datenbank konfigurieren, in der die meisten Moodle-Daten abgelegt werden. Der Installationsprozess erstellt die Datenbanktabellen automatisch auf der Grundlage der Einstellungen.';
 $string['databasecreationsettingssub'] = '<b>Typ:</b> \"mysql\" vom Installer festgelegt<br />
 <b>Host:</b> \"localhost\" vom Installer festgelegt<br />
@@ -22,6 +33,14 @@ $string['databasecreationsettingssub'] = '<b>Typ:</b> \"mysql\" vom Installer fe
 <b>User:</b> \"root\" vom Installer festgelegt<br />
 <b>Password:</b> Dein Datenbankpasswort<br />
 <b>Tables Prefix:</b> optionaler Prefix für alle Tabellennamen';
+$string['databasesettings'] = 'Jetzt wird die Datenbank erstellt, in der die meisten Moodle-Daten gespeichert werden. Diese Datenbank muss bereits vorher angelegt sein und du musst den Datenbankuser und das Passwort kennen.<br />
+ <br />
+<b>Typ:</b> mysql oder postgres7<br />
+<b>Host:</b> z.B. localhost oder db.isp.com<br />
+<b>Name:</b> Datenbankname, z.B. moodle<br />
+<b>Nutzer:</b> Dein Benutzername für die Datenbank<br />
+<b>Passwort:</b> Dein Passwort für die Datenbank<br />
+<b>Tabellen Prefix:</b> optionaler Prefix, der für alle Tabellen genutzt wird';
 $string['databasesettingshead'] = 'Du musst nun die Einstellungen für die Datenbank konfigurieren, in der die meisten Moodle-Daten abgelegt werden. Diese Datenbank muss bereits vorher angelegt und mit Nutzernamen und Passwort versehen worden sein, um auf sie zugreifen zu können.';
 $string['databasesettingssub'] = '<b>Typ:</b> mysql oder postgres7<br />
 <b>Host:</b> z.B. localhost oder db.isp.com<br />
@@ -71,6 +90,16 @@ $string['dbwrongencoding'] = 'Die ausgewählte Datenbank läuft unter einem nich
 $string['dbwronghostserver'] = 'Du musst den oben genannten \"Host\"-Regeln folgen.';
 $string['dbwrongnlslang'] = 'Die Umgebungsvariable NLS_LANG deines Webservers muss den Zeichensatz AL32UTF8 benutzen. Lies in der PHP-Dokumentation nach, wie du OCI8 richtig einstellst.';
 $string['dbwrongprefix'] = 'Du musst den oben genannten \"Tabellen-Prefix\"- Regeln folgen.';
+$string['directorysettings'] = '<p>Bitte überprüfe das Verzeichnis für diese Moodle-Installation.</p>
+
+<p><b>URL-Adresse:</b>
+Gib hier die vollständige URL für deine Moodle-Installation an. Sollte deine Seite über mehrere Adressen erreichbar sein, gib die Adresse an, die am häufigsten genutzt wird. Bitte gib am Ende kein Slash ein.</p>
+
+<p><b>Moodle-Verzeichnis:</b>
+Gib den absoluten Pfad für deine Moodle-Installation an. Bitte prüfe, ob die Groß-/ Kleinschreibung korrekt ist.</p>
+
+<p><b>Datenverzeichnis:</b>
+Moodle benötigt ein Verzeichnis, indem hochgeladene Dateien abgelegt werden. Dieses Verzeichnis muss Lese- und Schreibrechte für den webuser des Servers haben. (üblicherweise \'nobody\' or \'apache\'), aber es sollte nicht direkt über das Internet erreichbar sein.</p>';
 $string['directorysettingshead'] = 'Bestätige bitte die Verzeichniseinträge für deine Moodle-Installation';
 $string['directorysettingssub'] = '<p><b>URL-Adresse:</b>
 Gib hier die vollständige URL für deine Moodle-Installation an. Sollte deine Seite über mehrere Adressen erreichbar sein, gib die Adresse an, die am häufigsten genutzt wird. Bitte gib am Ende kein Slash ein.</p>
@@ -83,22 +112,39 @@ Moodle benötigt ein Verzeichnis, indem hochgeladene Dateien abgelegt werden. Di
 $string['downloadedfilecheckfailed'] = 'Die Prüfung der heruntergeladenen Datei ist gescheitert';
 $string['downloadlanguagenotneeded'] = 'Du kannst die Installation mit dem Sprachpaket \"$a\" fortsetzen.';
 $string['downloadlanguagesub'] = 'Du hast nun die Möglichkeit, ein Sprachpaket herunterzuladen und den Installationsprozess mit dieser Sprache fortzusetzen. <br /><br /> Falls du keinen Download durchführen kannst, wird die Installation auf Englisch fortgeführt. (Wenn die Installation abgeschlossen ist, hast du die Option weitere Sprachpakete herunterzuladen.)';
+$string['doyouagree'] = 'Hast du diese Bedingungen gelesen, verstanden und stimmst ihnen zu?';
 $string['environmenterrortodo'] = 'Du musst zunächst alle Probleme mit der Server-Konfiguration beheben, bevor du mit der Installation dieser Moodle-Version fortfahren kannst.';
 $string['environmentsub'] = 'Es wird geprüft, ob die verschiedenen Komponenten deines Systems die Installationsanforderungen erfüllen.';
+$string['fileuploadshelp'] = '<p>Dateien hochladen ist auf diesem Server abgestellt.</p>
+
+<p>Moodle kann installiert werden. Es ist aber nicht möglich, Dateien für Kurse oder Bilder in den Profilen hochzuladen.</p>
+
+<p>Um das Hochladen von Dateien zu ermöglichen, musst du oder der Administrator des Servers die Datei php.ini anpassen und die Einstellungen für<b>file_uploads</b> ändern auf \'1\'.</p>';
 $string['gdversionhelp'] = '<p>Auf deinem Server ist vermutlich GD nicht installiert. </p>
 <p>GD ist eine Bibliothek, die von PHP benötigt wird, um damit Bilder von Moodle angezeigt werden können, z.B. Nutzer-Bilder oder grafische Darstellungen der Log-Daten. Moodle arbeitet auch ohne GD. Die o.g. Funktionen stehen dir dann jedoch nicht zur Verfügung.</p>
 <p> Wenn du GD unter UNIX zu PHP hinzufügen möchtest, kompilierst du PHP unter Verwendung des Parameters   with-gd </p>
 <p>Unter Windows kannst du die Datei php.ini bearbeiten und die Zeile libgd.dll auskommentieren.</p>';
 $string['globalsquoteserror'] = 'Prüfe die PHP-Einstellungen: deaktiviere register_globals und/oder aktiviere magic_quotes_gpc';
+$string['globalsquoteshelp'] = '<p>Die Kombination von deaktivierten Magic Quotes GPC und aktivierten Register Globals zur gleichen Zeit sind nicht empfehlenswert.</p>
+
+<p>Die empfohlene Einstellung ist <b>magic_quotes_gpc = On</b> und <b>register_globals = Off</b> in deiner php.ini-Datei</p>
+
+<p>Wenn du keinen Zugriff auf die Datei php.ini hast, kannst du die folgende Zeile in der Datei .htaccess im Moodle Verzeichnis einfügen:
+<blockquote>php_value magic_quotes_gpc On</blockquote>
+<blockquote>php_value register_globals Off</blockquote>
+</p>';
 $string['iconvrecommended'] = 'Die Installation der ICONV Bibliothek wird zur Leistungsverbesserung dringend empfohlen. Dies ist besonders wichtig, wenn du Sprachen mit anderen als lateinischen Zeichensätzen verwendst.';
+$string['magicquotesruntimehelp'] = '<p>Magic Quotes Runtime sollte abgeschaltet \'off\' sein, damit Moodle richtig läuft.  </p>
+<p>Normalerweise ist dies der Fall. Prüfe die Einstellung <b>magic_quotes_runtime</b> in der Datei php.ini. </p>
+<p>Wenn du keinen Zugriff zur Datei php.ini hast, solltest du die folgende Zeile in eine Datei .htacess in deinem Moodle-Verzeichnis einfügen: <blockquote>php_value magic_quotes_runtime Off</blockquote></p>';
 $string['mbstringrecommended'] = 'Die Installation der Bibliothek MBSTRING wird zur Leistungsverbesserung dringend empfohlen. Dies ist besonders wichtig, wenn du Sprachen mit anderen als lateinischen Zeichensätzen verwendest.';
 $string['memorylimithelp'] = '<p>Die PHP-Einstellung memory_limit für deinen Server ist zur Zeit auf $a eingestellt. </p>
 <p>Dies wird vermutlich zu Problemen führen, wenn du Moodle mit vielen Aktivitäten oder vielen Nutzer/innen verwendst. </p>
-<p>Wir empfehlen die Einstellung zu erhöhen. Empfohlen werden 16M oder mehr. Dies kannst du auf verschiedene Arten machen:</p>
+<p>Wir empfehlen die Einstellung zu erhöhen. Empfohlen werden 40M oder mehr. Dies kannst du auf verschiedene Arten machen:</p>
 <ol>
 <li>Wenn du PHP neu kompilieren kannst, nimm die Einstellung <i>--enable-memory-limit</i>. Dann kann Moodle die Einstellung selber vornehmen.
-<li>Wenn du Zugriff auf die Datei php.ini hast, kannst du die Einstellung <b>memory_limit</b> selber auf z.B. 16M anpassen. Wenn du selber keinen Zugriff hast, fragst du den Server-Admin, dies für dich zu tun.
-<li>Auf einigen PHP-Servern kannst du eine .htaccess-Datei im Moodle-Verzeichnis einrichten. Trage darin die folgende Zeile ein: <p><blockquote>php_value memory_limit 16M</blockquote></p>
+<li>Wenn du Zugriff auf die Datei php.ini hast, kannst du die Einstellung <b>memory_limit</b> selber auf z.B. 40M anpassen. Wenn du selber keinen Zugriff hast, fragst du den Server-Admin, dies für dich zu tun.
+<li>Auf einigen PHP-Servern kannst du eine .htaccess-Datei im Moodle-Verzeichnis einrichten. Trage darin die folgende Zeile ein: <p><blockquote>php_value memory_limit 40M</blockquote></p>
 <p>Achtung: auf einigen Servern hindert diese Einstellung <b>alle</b> PHP-Seiten und du erhältst Fehlermeldungen. Entferne dann den Eintrag in der .htaccess-Datei wieder.</p></li>
 </ol>';
 $string['mssqlextensionisnotpresentinphp'] = 'PHP wurde nicht richtig konfiguriert, um über die MSSQL-Erweiterung mit SQL*Server zu kommunizieren. Bitte prüfe die Datei php.ini oder kompiliere PHP neu.';
@@ -113,8 +159,15 @@ $string['phpversionhelp'] = '<p>Moodle erwartet PHP mindestens in der Version 4.
 <p>Du benutzt zur Zeit die Version $a.</p>
 <p>Du musst deine PHP-Verson aktualisieren oder auf einen Rechner wechseln, der eine neuere Version von PHP nutzt.<br />
 (Im Falle von 5.0.x könntest du auch zu einer Version 4.3.x/4.4.x downgraden)</p>';
+$string['releasenoteslink'] = 'Weitere Informationen über diese Version findest du online: <a target=\"_new\" href=\"$a\">Versionsinformation</a>';
 $string['remotedownloadnotallowed'] = 'Der Download von Komponenten auf deinen Server ist nicht erlaubt (allow_url_fopen ist deaktiviert). <br /><br /> Die Datei <a href=\"$a->url\">$a->url</a> muss manuell heruntergeladen werden. Kopiere die Datei nach \"$a->dest\" auf deinen Server und entpacke sie dort.';
+$string['safemodehelp'] = '<p>Moodle kann beim Betrieb im Safe Mode verschiedene Probleme haben, nicht zuletzt kann es unmöglich sein, neue Dateien zu erzeugen. </p>
+<p>Safe Mode ist zumeist nur auf einigen öffentlichen Webservern eingestellt. Suche dir einen Anbieter, der auf diese Einstellung verzichtet oder bitte deinen Dienstleister, dass du auf einen Server \'umziehen\' kannst, der diese Einstellung nicht verwendet.</p>
+<p>Du kannst versuchen, die Installation fortzusetzen. Du musst aber später mit Problemen rechnen. </p>';
+$string['sessionautostarthelp'] = '<p>Moodle benötigt den Session Support und kann ohne diese Einstellung nicht funktionieren.</p>
+<p>Sessions sind durch Einstellungen in der Datei php.ini möglich. Bitte suche nach der Einstellung für session.auto_start </p>';
 $string['thischarset'] = 'UTF-8';
+$string['thisdirection'] = 'ltr';
 $string['thislanguage'] = 'Deutsch - Du';
 $string['unicoderecommended'] = 'Es wird empfohlen, alle Daten im Format Unicode UTF8 zu speichern. Neuinstallationen sollten mit Datenbanken vorgenommen werden, die als Standardzeichensatz UTF8 benutzen. Wenn du ein Upgrade durchführst, solltest du die UTF8-Migration starten (Admin-Seite).';
 $string['unicoderequired'] = 'Es ist notwendig, alle Daten im Format Unicode UTF8 zu speichern. Neuinstallationen müssen mit Datenbanken vorgenommen werden, die als Standardzeichensatz UTF8 benutzen. Wenn du ein Upgrade durchführst, solltest du die UTF8-Migration starten (Admin-Seite).';
@@ -7,100 +7,181 @@
 /// keep us informed using http://moodle.org/bugs Thanks!
 ///
 /// File generated by cvs://contrib/lang2installer/installer_builder
-/// using strings defined in installer_strings (same dir)
+/// using strings defined in stringnames.txt (same dir)

+$string['aborting'] = 'Installation abbrechen';
 $string['admindirerror'] = 'Das angegebene Admin-Verzeichnis ist falsch.';
 $string['admindirname'] = 'Name für das Admin-Verzeichnis';
+$string['admindirsetting'] = 'Einige wenige Webhosting-Anbieter benutzen /admin als spezielles Verzeichnis für den Zugang zum Administrationstool oder andere Dinge. Leider kommt es dadurch zu Konflikten mit dem Standard für das Administrationsverzeichnis von Moodle. Sie können dies ändern, indem Sie das Verzeichnis /admin in der Moodle-Installation umbenennen. Den geänderten Namen dieses Verzeichnisses müssen Sie hier eingeben, z.B.: <br /> <br /><b>moodleadmin</b><br /> 
+Dies ändert die Links für das Admin-Verzeichnis in Moodle.';
 $string['admindirsettinghead'] = 'Admin-Verzeichnis festlegen ...';
 $string['admindirsettingsub'] = 'Einige wenige Webhosting-Anbieter benutzen /admin als spezielles Verzeichnis für den Zugang zum Administrationstool oder andere Dinge. Leider kommt es dadurch zu Konflikten mit dem Standard für das Administrationsverzeichnis von Moodle. Sie können dies ändern, indem Sie das Verzeichnis /admin in der Moodle-Installation umbenennen. Den geänderten Namen dieses Verzeichnisses müssen Sie hier eingeben.
 z.B.: <br /> <br /><b>moodleadmin</b><br /> 
 Dies ändert die Links für das Admin-Verzeichnis in Moodle.';
+$string['adminemail'] = 'E-Mail :';
+$string['adminfirstname'] = 'Vorname :';
+$string['admininfo'] = 'Administratordetails';
+$string['adminlastname'] = 'Nachname :';
+$string['adminpassword'] = 'Passwort :';
+$string['adminusername'] = 'Anmeldename :';
+$string['askcontinue'] = 'Fortsetzen (ja/nein) :';
+$string['availabledbtypes'] = 'Verfügbare Datenbank-Typen';
+$string['availablelangs'] = 'Liste der verfügbaren Sprachen';
 $string['bypassed'] = 'Unberücksichtigt';
-$string['cannotcreatelangdir'] = 'Das Verzeichnis \"lang\" kann nicht angelegt werden.';
-$string['cannotcreatetempdir'] = 'Das temporäre Verzeichnis kann nicht angelegt werden.';
-$string['cannotdownloadcomponents'] = 'Komponenten können nicht heruntergeladen werden.';
+$string['cannotconnecttodb'] = 'Verbindung zur Datenbank gescheitert';
+$string['cannotcreatelangdir'] = 'Verzeichnis \"lang\" kann nicht angelegt werden';
+$string['cannotcreatetempdir'] = 'Das Verzeichnis \"temp\" kann nicht angelegt werden.';
+$string['cannotdownloadcomponents'] = 'Einige Komponenten können nicht heruntergeladen werden.';
 $string['cannotdownloadzipfile'] = 'ZIP-Datei kann nicht heruntergeladen werden.';
-$string['cannotfindcomponent'] = 'Komponente wurde nicht gefunden.';
-$string['cannotsavemd5file'] = 'Die md5-Datei konnte nicht gespeichert werden.';
-$string['cannotsavezipfile'] = 'Die ZIP-Datei konnte nicht gespeichert werden';
-$string['cannotunzipfile'] = 'Die Datei konnte nicht entpackt werden.';
+$string['cannotfindcomponent'] = 'Eine Komponente kann nicht gefunden werden';
+$string['cannotsavemd5file'] = 'Die md5-Datei kann nicht gespeichert werden.';
+$string['cannotsavezipfile'] = 'Die ZIP-Datei kann nicht gespeichert werden.';
+$string['cannotunzipfile'] = 'Die Datei kann nicht entpackt werden.';
 $string['caution'] = 'Warnung';
 $string['check'] = 'Prüfen';
-$string['chooselanguagehead'] = 'Eine Sprache wählen';
+$string['checkingphpsettings'] = 'PHP-Einstellungen prüfen';
+$string['chooselanguage'] = 'Sprache wählen';
+$string['chooselanguagehead'] = 'Sprache wählen';
 $string['chooselanguagesub'] = 'Wählen Sie eine Sprache, die Sie während der Installation verwenden wollen. Nach der Installation können Sie die Sprache für die Oberfläche und die Nutzer/innen festlegen.';
 $string['closewindow'] = 'Dieses Fenster schließen';
+$string['compatibilitysettings'] = 'Prüfung Ihrer PHP-Einstellungen ...';
 $string['compatibilitysettingshead'] = 'Prüfung Ihrer PHP-Einstellungen ...';
 $string['compatibilitysettingssub'] = 'Alle Tests sollten vom Server bestätigt werden, damit Moodle später reibungslos laufen kann.';
-$string['componentisuptodate'] = 'Die Komponente ist nicht aktuell.';
+$string['componentisuptodate'] = 'Die Komponente ist aktuell.';
+$string['configfilecreated'] = 'Konfiguartionsdatei wurde erfolgreich erstellt';
+$string['configfiledoesnotexist'] = 'Keine Konfiguarationsdatei gefunden!!!';
 $string['configfilenotwritten'] = 'Das Installationsscript kann die Datei config.php, welche die gewählten Einstellungen enthält, nicht automatisch erstellen. Der web-user hat keine Schreibrechte für das Moodle-Verzeichnis. Sie können den folgenden Code manuell in der Datei config.php speichern und diese dann ins Hauptverzeichnis Ihrer Moodle-Installation kopieren.';
 $string['configfilewritten'] = 'Die Datei config.php wurde erfolgreich erstellt';
-$string['configurationcompletehead'] = 'Die Konfiguration ist abgeschlossen.';
+$string['configurationcomplete'] = 'Konfiguration ist abgeschlossen.';
+$string['configurationcompletehead'] = 'Konfiguration ist abgeschlossen';
 $string['configurationcompletesub'] = 'Moodle speichert Ihre Konfigurationseinstellungen nun im Hauptverzeichnis Ihrer Moodle-Installation.';
+$string['configurationfileexist'] = 'Konfiguarationsdatei existiert bereits!';
 $string['continue'] = 'Weiter';
-$string['curlrecommended'] = 'Die Installation der optionalen Bibliothek Curl wird empfohlen, um die Moodle-Netzwerk-Funktionalität einzuschalten.';
+$string['creatingconfigfile'] = 'Konfiguarationsdatei wird erstellt ...';
+$string['ctyperecommended'] = 'Die Installation der optionalen Bibliothek ctype wird empfohlen, um die Geschwindigkeit der Website zu steigern. Dies ist besonders wichtig, wenn Sie Sprachen mit anderen als lateinischen Zeichensätzen verwenden.';
+$string['ctyperequired'] = 'Die PHP-Erweiterung ctype wird von Moodle benötigt, um die Geschwindigkeit der Website zu steigern und die Mehrsprachkompatibilität zu ermöglichen.';
+$string['curlrecommended'] = 'Die Installation der optionalen Bibliothek cURL wird empfohlen, um die Netzwerk-Funktionalität von Moodle einzuschalten.';
+$string['curlrequired'] = 'Die PHP-Erweiterung cURL wird von Moodle benötigt, um mit den Moodle Repositories zu kommunizieren';
+$string['customcheck'] = 'Weitere Überprüfungen';
 $string['database'] = 'Datenbank';
-$string['databasecreationsettingshead'] = 'Sie müssen Einstellungen für die Datenbank konfigurieren, in der die meisten Moodle-Daten abgelegt werden. Der Installationsprozess erstellt die Datenbanktabellen automatisch auf der Grundlage der Einstellungen.';
-$string['databasecreationsettingssub'] = '<b>Typ:</b> \"mysql\" vom Installer festgelegt<br />
-<b>Host:</b> \"localhost\" vom Installer festgelegt<br />
+$string['databasecreationsettings'] = 'Sie müssen die Datenbankeinstellungen für die Speicherung der Moodle-Daten konfigurieren. Die Datenbank wird automatisch vom Moodle4Windows-Installationsprozess mit den unten festgelegten Einstellungen angelegt:
+<br />
+<br /> <br />
+<b>Typ:</b> vom Installer festgelegt auf  \"mysql\"<br />
+<b>Host:</b> vom Installer festgelegt auf  \"localhost\"<br />
 <b>Name:</b> Datenbankname, z.B. moodle<br />
-<b>User:</b> \"root\" vom Installer festgelegt<br />
-<b>Password:</b> Ihr Datenbankpasswort<br />
-<b>Tables Prefix:</b> optionaler Prefix für alle Tabellennamen';
+<b>Nutzer:</b> vom Installer festgelegt auf  \"root\"<br />
+<b>Passwort:</b> Ihr Datenbankpasswort<br />
+<b>Tabellen-Prefix:</b> optionaler Prefix für alle Tabellennamen';
+$string['databasecreationsettingshead'] = 'Sie müssen Einstellungen für die Datenbank konfigurieren, in der die meisten Moodle-Daten abgelegt werden. Der Installationsprozess erstellt die Datenbanktabellen automatisch auf der Grundlage der Einstellungen.';
+$string['databasecreationsettingssub'] = '<b>Typ:</b> vom Installer festgelegt auf  \"mysql\" <br />
+<b>Host:</b> vom Installer festgelegt auf  \"localhost\"<br />
+<b>Name:</b> Datenbankname, z.B. moodle<br />
+<b>Nutzer:</b> vom Installer festgelegt auf  \"root\"<br />
+<b>Passwort:</b> Ihr Datenbankpasswort<br />
+<b>Tabellen-Prefix:</b> optionaler Prefix für alle Tabellennamen';
+$string['databasecreationsettingssub2'] = '<b>Typ:</b> vom Installer festgelegt auf \"mysqli\"<br />
+<b>Host:</b> vom Installer festgelegt auf  \"localhost\"<br />
+<b>Name:</b> Datenbankname, z.B. moodle<br />
+<b>Nutzer:</b> vom Installer festgelegt auf \"root\"<br />
+<b>Passwort:</b> Ihr Datenbankpasswort<br />
+<b>Tabellen-Prefix:</b> optionaler Prefix für alle Tabellennamen';
+$string['databasehost'] = 'Datenbank-Server :';
+$string['databasename'] = 'Datenbank-Name :';
+$string['databasepass'] = 'Datenbank-Passwort :';
+$string['databasesettings'] = 'Jetzt wird die Datenbank erstellt, in der die meisten Moodle-Daten gespeichert werden. Diese Datenbank muss bereits vorher angelegt sein und Sie müssen den Datenbankuser und das Passwort kennen.<br />
+ <br />
+<b>Typ:</b> mysql oder postgres7<br />
+<b>Host:</b> z.B. localhost oder db.isp.com<br />
+<b>Name:</b> Datenbankname, z.B. moodle<br />
+<b>Nutzer:</b> Ihr Benutzername für die Datenbank<br />
+<b>Passwort:</b> Ihr Passwort für die Datenbank<br />
+<b>Tabellen Prefix:</b> optionaler Prefix für alle Tabellennamen';
+$string['databasesettingsformoodle'] = 'Datenbank-Einstellungen für Moodle';
 $string['databasesettingshead'] = 'Sie müssen nun die Einstellungen für die Datenbank konfigurieren, in der die meisten Moodle-Daten abgelegt werden. Diese Datenbank muss bereits vorher angelegt und mit Nutzernamen und Passwort versehen worden sein, um auf sie zugreifen zu können.';
 $string['databasesettingssub'] = '<b>Typ:</b> mysql oder postgres7<br />
 <b>Host:</b> z.B. localhost oder db.isp.com<br />
 <b>Name:</b> Datenbankname, z.B. moodle<br />
-<b>Nutzer:</b> Ihr Anmeldename für die Datenbank<br />
+<b>Nutzer:</b> Ihr Benutzername für die Datenbank<br />
 <b>Passwort:</b> Ihr Passwort für die Datenbank<br />
-<b>Tabellen-Prefix:</b> optionaler Prefix für alle Tabellen';
-$string['databasesettingssub_mssql'] = '<b>Typ:</b> SQL*Server (ohne UTF-8)<br />
+<b>Tabellen-Prefix:</b> optionaler Prefix für alle Tabellennamen';
+$string['databasesettingssub_mssql'] = '<b>Typ:</b> SQL*Server (ohne UTF-8)<b><strong class=\"errormsg\">Experimentell! (nicht für Produktivumgebungen)</strong></b><br /><br />
 <b>Host:</b> z.B. localhost oder db.isp.com<br />
 <b>Name:</b> Datenbankname, z.B. moodle<br />
-<b>User:</b> Ihr Anmeldename für die Datenbank<br />
-<b>Password:</b> Ihr Passwort für die Datenbank<br />
-<b>Tabellen-Prefix:</b> Prefix für alle Tabellen (notwendig)';
+<b>Nutzer:</b> Ihr Benutzername für die Datenbank<br />
+<b>Passwort:</b> Ihr Passwort für die Datenbank<br />
+<b>Tabellen-Prefix:</b> Prefix für alle Tabellennamen (notwendig)';
 $string['databasesettingssub_mssql_n'] = '<b>Typ:</b> SQL*Server (mit UTF-8)<br />
 <b>Host:</b> z.B. localhost oder db.isp.com<br />
 <b>Name:</b> Datenbankname, z.B. moodle<br />
-<b>User:</b> Ihr Anmeldename für die Datenbank<br />
-<b>Password:</b> Ihr Passwort für die Datenbank<br />
+<b>Nutzer:</b> Ihr Anmeldename für die Datenbank<br />
+<b>Passwort:</b> Ihr Passwort für die Datenbank<br />
 <b>Tabellen-Prefix:</b> Prefix für alle Tabellen (notwendig)';
 $string['databasesettingssub_mysql'] = '<b>Typ:</b> MySQL<br />
 <b>Host:</b> z.B. localhost oder db.isp.com<br />
 <b>Name:</b> Datenbankname, z.B. moodle<br />
-<b>User:</b> Ihr Anmeldename für die Datenbank<br />
-<b>Password:</b> Ihr Passwort für die Datenbank<br />
+<b>Nutzer:</b> Ihr Benutzername für die Datenbank<br />
+<b>Passwort:</b> Ihr Passwort für die Datenbank<br />
+<b>Tabellen-Prefix:</b> Prefix für alle Tabellen (optional)';
+$string['databasesettingssub_mysqli'] = '<b>Typ:</b> Improved MySQL<br />
+<b>Host:</b> z.B. localhost oder db.domain.com<br />
+<b>Name:</b> Datenbank-Name, z.B moodle<br />
+<b>Nutzer:</b> Ihr Benutzername für die Datenbank<br />
+<b>Passwort:</b> Ihr Passwort für die Datenbank<br />
 <b>Tabellen-Prefix:</b> Prefix für alle Tabellen (optional)';
 $string['databasesettingssub_oci8po'] = '<b>Typ:</b> Oracle<br />
 <b>Host:</b> unbenutzt - muss leer bleiben!<br />
 <b>Name:</b> vorgegebener Verbindungname zu tnsnames.ora<br />
-<b>User:</b> Ihr Anmeldename für die Datenbank<br />
-<b>Password:</b> Ihr Passwort für die Datenbank<br />
+<b>Nutzer:</b> Ihr Benutzername für die Datenbank<br />
+<b>Passwort:</b> Ihr Passwort für die Datenbank<br />
 <b>Tabellen-Prefix:</b> Prefix für alle Tabellen (notwendig, 2cc. max)';
 $string['databasesettingssub_odbc_mssql'] = '<b>Typ:</b> SQL*Server (over ODBC) <b><font color=\"red\">Experimentell! (nicht für den produktiven Einsatz)</font></b><br />
 <b>Host:</b> vorgegebener DSN-Name im ODBC-Kontrolldialog<br />
 <b>Name:</b> Datenbankname, z.B. moodle<br />
-<b>User:</b> Ihr Anmeldename für die Datenbank<br />
-<b>Password:</b> Ihr Passwort für die Datenbank<br />
+<b>Nutzer:</b> Ihr Benutzername für die Datenbank<br />
+<b>Passwort:</b> Ihr Passwort für die Datenbank<br />
 <b>Tabellen-Prefix:</b> Prefix für alle Tabellen (notwendig)';
 $string['databasesettingssub_postgres7'] = '<b>Typ:</b> PostgreSQL<br />
 <b>Host:</b> z.B. localhost oder db.isp.com<br />
 <b>Name:</b> Datenbankname, z.B. moodle<br />
-<b>User:</b> Ihr Anmeldename für die Datenbank<br />
-<b>Password:</b> Ihr Passwort für die Datenbank<br />
+<b>Nutzer:</b> Ihr Benutzername für die Datenbank<br />
+<b>Passwort:</b> Ihr Passwort für die Datenbank<br />
 <b>Tabellen-Prefix:</b> Prefix für alle Tabellen (notwendig)';
-$string['dataroot'] = 'Datenverzeichnis';
+$string['databasesettingssub_sqlite3_pdo'] = '<b>Typ:</b> SQLite 3 (PDO) <b><strong class=\"errormsg\">Experimentell! (nicht für produktive Server benutzen!!)</strong></b><br />
+<b>Host:</b> Pfad zum Verzeichnis, in dem die Datenbankdatei gespeichert werden soll (vollständiger Pfad); mit localhost oder einem leeren Feld wird dasdas Moodle Datenverzeichnis verwendet<br />
+<b>Name:</b> Datenbankname, z.B. moodle (optional)<br />
+<b>Nutzer:</b> Ihr Benutzername für die Datenbank (optional)<br />
+<b>Passwort:</b> Ihr Passwort für die Datenbank (optional)<br />
+<b>Tabellen-Prefix:</b> optionaler Prefix für alle Tabellen<br />
+Der Name der Datenbankdatei wird über den Nutzernamen erkannt, der Datenbankname und das Passwort sind oben angegeben.';
+$string['databasesettingswillbecreated'] = '<b>Hinweis: </b> Das Installationsprogramm wird versuchen, automatisch eine Datenbank anzulegen, sofern diese noch nicht besteht.';
+$string['databasetype'] = 'Datenbank-Typ :';
+$string['databaseuser'] = 'Datenbank-Nutzer :';
+$string['dataroot'] = 'Daten-Verzeichnis';
 $string['datarooterror'] = 'Das angegebene Datenverzeichnis ist nicht vorhanden und kann nicht angelegt werden. Korrigieren Sie die Pfad-Eingabe oder legen Sie das Verzeichnis manuell an.';
+$string['datarootpublicerror'] = 'Das von Ihnen angegebene Verzeichnis dataroot ist direkt aus dem Internet zugänglich. Sie müssen das Verzeichnis ändern!';
 $string['dbconnectionerror'] = 'Eine Verbindung zur angegebenen Datenbank konnte nicht hergestellt werden. Bitte überprüfen Sie Ihre Eingaben.';
 $string['dbcreationerror'] = 'Fehler beim Anlegen der Datenbank. Die Datenbank konnte mit diesen Einstellungen nicht erstellt werden.';
-$string['dbhost'] = 'Name des Datenbankservers';
-$string['dbprefix'] = 'Prefix für alle Tabellen';
-$string['dbtype'] = 'Datenbankart';
+$string['dbhost'] = 'Server';
+$string['dbpass'] = 'Passwort';
+$string['dbprefix'] = 'Tabellen-Prefix';
+$string['dbtype'] = 'Typ';
 $string['dbwrongencoding'] = 'Die ausgewählte Datenbank läuft unter einem nicht empfohlenen Zeichensatz. Es wäre besser, wenn Sie eine Unicode (UTF-8) basierte Datenbank verwenden würden. Sie haben die Möglichkeit diesen Schritt zu überspringen. Vermutlch wird dies später bei der Nutzung aber zu Problemen führen.
 Die ausgewählte Datenbank läuft unter einem nicht empfohlenen Zeichensatz. Es wäre besser, wenn Sie eine Unicode (UTF-8) basierte Datenbank verwenden würden. Sie haben die Möglichkeit diesen Schritt zu überspringen. Vermutlich wird dies später bei der Nutzung aber zu Problemen führen.';
-$string['dbwronghostserver'] = 'Sie müssen den oben genannten \"Host\"-Regeln folgen.';
+$string['dbwronghostserver'] = 'Sie müssen den oben genannten \"Server\"-Regeln folgen.';
 $string['dbwrongnlslang'] = 'Die Umgebungsvariable NLS_LANG Ihres Webservers muss den Zeichensatz AL32UTF8 benutzen. Lesen Sie in der PHP-Dokumentation nach, wie Sie OCI8 richtig einstellen.';
 $string['dbwrongprefix'] = 'Sie müssen den oben genannten \"Tabellen-Prefix\"- Regeln folgen.';
+$string['directorysettings'] = '<p>Bitte überprüfen Sie das Verzeichnis für diese Moodle-Installation.</p>
+
+<p><b>URL-Adresse:</b>
+Geben Sie hier die vollständige URL für Ihre Moodle-Installation an. Sollte Ihre Seite über mehrere Adressen erreichbar sein, geben Sie die Adresse an, die am häufigsten genutzt wird. Bitte geben Sie am Ende kein Slash ein.</p>
+
+<p><b>Moodle-Verzeichnis:</b>
+Geben Sie den absoluten Pfad für Ihre Moodle-Installation an. Bitte prüfen Sie, ob die Groß- und Kleinschreibung korrekt ist.</p>
+
+<p><b>Datenverzeichnis:</b>
+Moodle benötigt ein Verzeichnis, indem hochgeladene Dateien abgelegt werden. Dieses Verzeichnis muss Lese- und Schreibrechte für den 
+web-user des Servers haben. (üblicherweise \'nobody\' or \'apache\'), aber es sollte nicht direkt über das Internet erreichbar sein.</p>';
 $string['directorysettingshead'] = 'Bestätigen Sie bitte die Verzeichniseinträge für Ihre Moodle-Installation';
 $string['directorysettingssub'] = '<p><b>URL-Adresse:</b>
 Geben Sie hier die vollständige URL für Ihre Moodle-Installation an. Sollte Ihre Seite über mehrere Adressen erreichbar sein, geben Sie die Adresse an, die am häufigsten genutzt wird. Bitte geben Sie am Ende kein Slash ein.</p>
@@ -113,24 +194,32 @@ Moodle benötigt ein Verzeichnis, indem hochgeladene Dateien abgelegt werden. Di
 web-user des Servers haben. (üblicherweise \'nobody\' or \'apache\'), aber es sollte nicht direkt über das Internet erreichbar sein.</p>';
 $string['dirroot'] = 'Moodle-Verzeichnis';
 $string['dirrooterror'] = 'Die Einstellungen für das Moodle-Verzeichnis sind nicht korrekt.  Es wurde keine Moodle-Installation gefunden. Die anderen Werte wurden gelöscht.';
+$string['disagreelicense'] = 'Das Upgrade wird nicht ohne Zustimmung zur GPL durchgeführt!';
 $string['download'] = 'Herunterladen';
-$string['downloadedfilecheckfailed'] = 'Die Prüfung der heruntergeladenen Datei ist gescheitert';
+$string['downloadedfilecheckfailed'] = 'Die Überprüfung der heruntergeladenen Datei ist gescheitert';
 $string['downloadlanguagebutton'] = 'Download des Sprachpakets: $a';
 $string['downloadlanguagehead'] = 'Download der Sprachpakete';
 $string['downloadlanguagenotneeded'] = 'Sie können die Installation mit dem Sprachpaket \"$a\" fortsetzen.';
+$string['downloadlanguagepack'] = 'Möchten Sie jetzt das Sprachpaket herunterladen (ja/nein) :';
 $string['downloadlanguagesub'] = 'Sie haben nun die Möglichkeit, ein Sprachpaket herunterzuladen und den Installationsprozess mit dieser Sprache fortzusetzen. <br /><br /> Falls sie keinen Download durchführen können, wird die Installation auf Englisch fortgeführt. (Wenn die Installation abgeschlossen ist, haben Sie die Option weitere Sprachpakete herunterzuladen.)';
+$string['downloadsuccess'] = 'Sprachpaket erfolgreich heruntergeladen';
+$string['doyouagree'] = 'Stimmen Sie zu ? (ja/nein)';
 $string['environmenterrortodo'] = 'Sie müssen zunächst alle Probleme mit der Server-Konfiguration beheben, bevor Sie mit der Installation dieser Moodle-Version fortfahren können.';
 $string['environmenthead'] = 'Prüfung der Installationsvoraussetzungen';
+$string['environmentrecommendcustomcheck'] = 'Wenn dieser Test fehlschlägt, dann ist ein  mögliches Problem vorhanden.';
 $string['environmentrecommendinstall'] = 'sollte installiert und aktiviert sein.';
 $string['environmentrecommendversion'] = 'Version $a->needed wird empfohlen - aktuell ist $a->current installiert.';
+$string['environmentrequirecustomcheck'] = 'Dieser Test muss erfolgreich verlaufen.';
 $string['environmentrequireinstall'] = 'muss installiert und aktiviert sein.';
 $string['environmentrequireversion'] = 'Version $a->needed ist erforderlich - aktuell ist $a->current installiert.';
 $string['environmentsub'] = 'Es wird geprüft, ob die verschiedenen Komponenten Ihres Systems die Installationsanforderungen erfüllen.';
-$string['environmentxmlerror'] = 'Beim Auslesen der Server-Konfiguration ist ein Fehler aufgetreten ($a->error_code)';
+$string['environmentxmlerror'] = 'Fehler beim Auslesen der Server-Konfiguration ($a->error_code)';
 $string['error'] = 'Fehler';
+$string['errorsinenvironment'] = 'Fehler bei den Anforderungen!';
 $string['fail'] = 'Fehlgeschlagen';
 $string['fileuploads'] = 'Dateien hochladen';
-$string['fileuploadserror'] = 'Dies sollte auf \'on\' stehen';
+$string['fileuploadserror'] = 'Dies sollte eingeschaltet sein';
+$string['fileuploadshelp'] = '<p>Dateien hochladen ist auf diesem Server abgestellt.</p> <p>Moodle kann installiert werden. Es ist aber nicht möglich, Dateien für Kurse oder Bilder in den Profilen hochzuladen.</p> <p>Um das Hochladen von Dateien zu ermöglichen, müssen Sie oder der Administrator des Servers die Datei php.ini anpassen und die Einstellungen für<b>file_uploads</b> ändern auf \'1\'.</p>';
 $string['gdversion'] = 'GD-Version';
 $string['gdversionerror'] = 'Die GD-Bibliothek sollte verfügbar sein, um Bilder zu erzeugen und anzuzeigen.';
 $string['gdversionhelp'] = '<p>Auf Ihrem Server ist vermutlich GD nicht installiert. </p>
@@ -139,83 +228,199 @@ $string['gdversionhelp'] = '<p>Auf Ihrem Server ist vermutlich GD nicht installi
 <p>Unter Windows können Sie die Datei php.ini bearbeiten und die Zeile libgd.dll auskommentieren.</p>';
 $string['globalsquotes'] = 'Unsichere Einstellung von Globalparametern';
 $string['globalsquoteserror'] = 'Prüfen Sie die PHP-Einstellungen: deaktivieren Sie register_globals und/oder aktivieren Sie magic_quotes_gpc';
+$string['globalsquoteshelp'] = '<p>Die Kombination von deaktivierten Magic Quotes GPC und aktivierten Register Globals zur gleichen Zeit sind nicht empfehlenswert.</p>
+
+<p>Die empfohlene Einstellung ist <b>magic_quotes_gpc = On</b> und <b>register_globals = Off</b> in Ihrer php.ini-Datei</p>
+
+<p>Wenn Sie keinen Zugriff auf die Datei php.ini haben, können Sie die folgende Zeile in der Datei .htaccess im Moodle Verzeichnis einfügen:
+<blockquote><div>php_value magic_quotes_gpc On</div></blockquote>
+<blockquote><div>php_value register_globals Off</div></blockquote>
+</p>';
+$string['globalswarning'] = '<p><strong>Sicherheitshinweis</strong>: Um ordnungsgemäß funktionieren zu können, benötigt <br />Moodle mehrere Änderungen in Ihren aktuellen PHP-Einstellungen.<p/> <p>Sie <em>müssen</em> den Parameter <code>register_globals=off</code> setzen.<p>Diese Einstellung können Sie vornehmen, in dem Sie die Datei <code>php.ini</code>, die Apache/IIS <br />Konfiguration oder die Datei <code>.htaccess</code> bearbeiten.</p>';
 $string['help'] = 'Hilfe';
 $string['iconvrecommended'] = 'Die Installation der ICONV Bibliothek wird zur Leistungsverbesserung dringend empfohlen. Dies ist besonders wichtig, wenn Sie Sprachen mit anderen als lateinischen Zeichensätzen verwenden.';
 $string['info'] = 'Informationen';
+$string['inputdatadirectory'] = 'Daten-Verzeichnis :';
+$string['inputwebadress'] = 'Web-Adresse';
+$string['inputwebdirectory'] = 'Moodle-Verzeichnis :';
 $string['installation'] = 'Installation';
+$string['installationiscomplete'] = 'Die Installation ist abgeschlossen!';
+$string['invalidargumenthelp'] = 'Fehler: Ungültige Argumente
+Benutzung: $php cliupgrade.php OPTIONS
+Geben Sie --help ein, um weitere Hilfe zu bekommen';
+$string['invalidemail'] = 'Ungültige E-Mail';
+$string['invalidhost'] = 'Ungültiger Server';
+$string['invalidint'] = 'Fehler: Wert ist keine Zahl';
+$string['invalidintrange'] = 'Fehler: Wert ist außerhalb des Bereichs';
 $string['invalidmd5'] = 'md5 ungültig';
+$string['invalidpath'] = 'Ungültiger Pfad';
+$string['invalidsetelement'] = 'Fehler: Wert ist nicht in den vorgegebenen Optionen enthalten';
+$string['invalidtextvalue'] = 'Ungültiger Text';
+$string['invalidurl'] = 'Ungültige URL';
+$string['invalidvalueforlanguage'] = 'Ungültiger Wert für die Option --lang. Geben Sie --help ein, um mehr Hilfe zu bekommen';
+$string['invalidyesno'] = 'Fehler: Wert ist kein gültiges Ja/Nein-Argument';
 $string['langdownloaderror'] = 'Leider konnte die Sprache \"$a\" nicht installiert werden. Die Installation wird auf Englisch fortgesetzt.';
 $string['langdownloadok'] = 'Die Installation der Sprache \"$a\" war erfolgreich. Der weitere Installationsprozess erfolgt nun in dieser Sprache.';
 $string['language'] = 'Sprache';
+$string['locationanddirectories'] = 'Speicherort und -verzeichnisse';
 $string['magicquotesruntime'] = 'Magic Quotes Run Time';
 $string['magicquotesruntimeerror'] = 'Dies sollte ausgeschaltet sein (\'off\')';
+$string['magicquotesruntimehelp'] = '<p>Magic Quotes Runtime sollte abgeschaltet \'off\' sein, damit Moodle richtig läuft.  </p>
+<p>Normalerweise ist dies der Fall. Prüfen Sie die Einstellung <b>magic_quotes_runtime</b> in der Datei php.ini. </p>
+<p>Wenn Sie keinen Zugriff zur Datei php.ini haben sollten Sie die folgende Zeile in eine Datei .htacess in Ihrem Moodle-Verzeichnis einfügen: <blockquote><div>php_value magic_quotes_runtime Off</div></blockquote></p>';
 $string['mbstringrecommended'] = 'Die Installation der Bibliothek MBSTRING wird zur Leistungsverbesserung dringend empfohlen. Dies ist besonders wichtig, wenn Sie Sprachen mit anderen als lateinischen Zeichensätzen verwenden.';
 $string['memorylimit'] = 'Memory Limit';
 $string['memorylimiterror'] = 'Die PHP-Speichereinstellung memory_limit ist zu niedrig. Dies könnte später zu Problemen führen.';
 $string['memorylimithelp'] = '<p>Die PHP-Einstellung memory_limit für Ihren Server ist zur Zeit auf $a eingestellt. </p>
 <p>Dies wird vermutlich zu Problemen führen, wenn Sie Moodle mit vielen Aktivitäten oder vielen Nutzer/innen verwenden. </p>
-<p>Wir empfehlen die Einstellung zu erhöhen. Empfohlen werden 16M oder mehr. Dies können Sie auf verschiedene Arten machen:</p>
+<p>Wir empfehlen die Einstellung zu erhöhen. Empfohlen werden 40M oder mehr. Dies können Sie auf verschiedene Arten machen:</p>
 <ol>
 <li>Wenn Sie PHP neu kompilieren können, nehmen Sie die Einstellung <i>--enable-memory-limit</i>. Dann kann Moodle die Einstellung selber vornehmen.
-<li>Wenn Sie Zugriff auf die Datei php.ini haben, können Sie die Einstellung <b>memory_limit</b> selber auf z.B. 16M anpassen. Wenn Sie selber keinen Zugriff haben, fragen Sie den Server-Admin, dies für Sie zu tun.
-<li>Auf einigen PHP-Servern können Sie eine .htaccess-Datei im Moodle-Verzeichnis einrichten. Tragen Sie darin die folgende Zeile ein: <p><blockquote>php_value memory_limit 16M</blockquote></p>
+<li>Wenn Sie Zugriff auf die Datei php.ini haben, können Sie die Einstellung <b>memory_limit</b> selber auf z.B. 40M anpassen. Wenn Sie selber keinen Zugriff haben, fragen Sie den Server-Admin, dies für Sie zu tun.
+<li>Auf einigen PHP-Servern können Sie eine .htaccess-Datei im Moodle-Verzeichnis einrichten. Tragen Sie darin die folgende Zeile ein: <p><blockquote><div>php_value memory_limit 40M</div></blockquote></p>
 <p>Achtung: auf einigen Servern hindert diese Einstellung <b>alle</b> PHP-Seiten und Sie erhalten Fehlermeldungen. Entfernen Sie dann den Eintrag in der .htaccess-Datei wieder.</p></li>
 </ol>';
 $string['missingrequiredfield'] = 'Einige erforderliche Felder sind nicht ausgefüllt.';
 $string['moodledocslink'] = 'Moodle-Dokumentation für diese Seite';
 $string['mssql'] = 'SQL*Server (mssql)';
-$string['mssql_n'] = 'SQL*Server mit UTF-8-Unterstützung (mssql_n)';
 $string['mssqlextensionisnotpresentinphp'] = 'PHP wurde nicht richtig konfiguriert, um über die MSSQL-Erweiterung mit SQL*Server zu kommunizieren. Bitte prüfen Sie die Datei php.ini oder kompilieren Sie PHP neu.';
+$string['mssql_n'] = 'SQL*Server mit UTF-8-Unterstützung (mssql_n)';
 $string['mysql'] = 'MySQL (mysql)';
 $string['mysql416bypassed'] = 'Wenn Sie in Ihrer Website ausschließlich ISO-8859-1 (lateinische) Sprachen verwenden, können Sie eine MySQL-Version ab 4.1.12 (oder höher) verwenden.';
 $string['mysql416required'] = 'MySQL 4.1.16 (oder höher) ist für Moodle 1.6 unbedingt erforderlich, um eine Datenkonvertierung nach UTF-8 sicherzustellen.';
 $string['mysqlextensionisnotpresentinphp'] = 'PHP wurde nicht richtig konfiguriert, um über die MySQL-Erweiterung mit MySQL zu kommunizieren. Bitte prüfen Sie die Datei php.ini oder kompilieren Sie PHP neu.';
+$string['mysqli'] = 'Improved MySQL (mysqli)';
+$string['mysqliextensionisnotpresentinphp'] = 'PHP wurde nicht ordnungsgemäß für die MySQLi-Erweiterung konfiguriert, um mit MySQL zu kommunizieren. Bitte überprüfen Sie die Datei php.ini oder übersetzen Sie PHP neu. Die MySQLi-Erweiterung ist nicht für PHP4 verfügbar.';
 $string['name'] = 'Name';
+$string['nativemysqli'] = 'Verbessertes MySQL (nativ/mysqli)';
 $string['next'] = 'Nächste';
 $string['oci8po'] = 'Oracle (oci8po)';
 $string['ociextensionisnotpresentinphp'] = 'PHP wurde nicht richtig konfiguriert, um über die OCI8-Erweiterung mit Oracle zu kommunizieren. Bitte prüfen Sie die Datei php.ini oder kompilieren Sie PHP neu.';
-$string['odbc_mssql'] = 'SQL*Server über ODBC (odbc_mssql)';
 $string['odbcextensionisnotpresentinphp'] = 'PHP wurde nicht richtig konfiguriert, um über die ODBC-Erweiterung mit SQL*Server zu kommunizieren. Bitte prüfen Sie die Datei php.ini oder kompilieren Sie PHP neu.';
+$string['odbc_mssql'] = 'SQL*Server über ODBC (odbc_mssql)';
 $string['ok'] = 'OK';
-$string['opensslrecommended'] = 'Die optionale Installation der OpenSSL Bibliothek wird strikt empfohlen. Dadurch wird die Moodle-Netzwerk-Funktionalität ermöglicht.';
+$string['opensslrecommended'] = 'Die optionale Installation der OpenSSL Bibliothek wird dringend empfohlen. Dadurch wird die Moodle-Netzwerk-Funktionalität ermöglicht.';
 $string['parentlanguage'] = 'en_utf8';
 $string['pass'] = 'Durchgang';
 $string['password'] = 'Kennwort';
 $string['pgsqlextensionisnotpresentinphp'] = 'PHP wurde nicht richtig konfiguriert, um über die PGSQL-Erweiterung mit PostgreSQL zu kommunizieren. Bitte prüfen Sie die Datei php.ini oder kompilieren Sie PHP neu.';
 $string['php50restricted'] = 'PHP 5.0.x hat eine Reihe bekannter Fehler! Sie sollten die Versionen 5.1.x bzw. 4.3.x/4.4.x benutzen.';
+$string['php52versionerror'] = 'PHP-Version muss mindestens 5.2.4 sein.';
+$string['php52versionhelp'] = '<p>Moodle benötigt mindestens PHP Version 5.2.4</p>
+<p>Sie nutzen zur Zeit Version $a.</p>
+<p>Ihre PHP-Version muss aktualisiert oder ein anderer Host genutzt werden.</p>';
 $string['phpversion'] = 'PHP-Version';
-$string['phpversionerror'] = 'PHP muss mindestens in der Version 4.3.0 oder 5.1.0 installiert sein (5.0.x weist eine Reihe bekannter Fehler auf).';
+$string['phpversionerror'] = 'PHP muss mindestens in der Version 4.3.0 oder 5.1.0 installiert sein (5.0.x weist eine Reihe bekannter Fehler auf).'; // ORPHANED
 $string['phpversionhelp'] = '<p>Moodle erwartet PHP mindestens in der Version 4.3.0/4.4.0 oder 5.1.0 (5.0.x weist eine Reihe bekannter Fehler auf).</p>
 <p>Sie nutzen zur Zeit die Version $a.</p>
 <p>Sie müssen Ihre PHP-Verson aktualisieren oder auf einen Rechner wechseln, der eine neuere Version von PHP nutzt.<br />
 (Im Falle von 5.0.x könnten Sie auch zu einer Version 4.3.x/4.4.x downgraden)</p>';
 $string['postgres7'] = 'PostgreSQL (postgres7)';
+$string['prefixcannotbeempty'] = '<p>Fehler: Datenbanktabellen-Prefix kann nicht leer sein.(§a)</p>
+<p>Der Administrator muss dieses Problem beseitigen.</p>';
+$string['prefixtoolong'] = '<p>Fehler: Datenbanktabellen-Prefix ist zu lang ($a->dbfamily)</p>
+<p>Der Administrator muß dieses Problem anpassen. Tabellen -Prefixes in $a->dbfamily ist max. $a->maxlength Zeichen lang.</p>';
 $string['previous'] = 'Frühere';
+$string['qtyperqpwillberemoved'] = 'Während des Updates wird der Fragentyp RQP entfernt. Da Sie diesen Fragentyp nicht benutzen, sollten Sie keinerlei Probleme bekommen.';
+$string['qtyperqpwillberemovedanyway'] = 'Während des Updates wird der Fragentyp RQP entfernt. Sie haben einige RQP Fragen in Ihrer Datenbank, die nicht mehr funktionieren werden, falls Sie nicht den dafür notwendigen Code vor der Fortsetzung dieses Updates installieren. http://moodle.org/mod/data/view.php?d=13&amp;rid=797';
+$string['releasenoteslink'] = 'Um Informationen über diese Moodle-Version zu erhalten, schauen Sie bitte in die Release-Hinweise auf $a';
+$string['remotedownloaderror'] = 'Der Download auf Ihren Server konnte nicht ausgeführt werden. Prüfen Sie bitte die Proxy-Einstellungen, die PHP CURL Erweiterung wird dringend empfohlen.<br /><br />Die Datei <a href=\"$a->url\">$a->url</a> muss nun manuell herunter geladen, entpackt und auf den Server nach \"$a->dest\" kopiert werden. there.';
 $string['remotedownloadnotallowed'] = 'Der Download von Komponenten auf Ihren Server ist nicht erlaubt (allow_url_fopen ist deaktiviert). <br /><br /> Die Datei <a href=\"$a->url\">$a->url</a> muss manuell heruntergeladen werden. Kopieren Sie die Datei nach \"$a->dest\" auf Ihren Server und entpacken Sie sie dort.';
 $string['report'] = 'Bericht';
+$string['requiredentrieschanged'] = '<strong>WICHTIG - UNBEDINGT LESEN<br />Die Warnung wird ausschließlich bei dieser Aktualisierung gezeigt!</strong><br />
+Infolge einer Fehlerkorrektur wird sich das Verhalten von Datenbankaktivitäten ändern, die die Einstellungen \'Required entries\' und \'Required entries before viewing settings\' nutzen.
+
+Weitere Erklärungen entnehmen Sie bitte den  <a href=\"http://docs.moodle.org/en/Adding/editing_a_database#Required_entries\" target=\"_blank\">Moodle Docs</a>.
+<br/><br/>Diese Änderung betrifft die folgenden Daten in Ihrem System . Bitte sichern Sie die nachfolgende Liste und prüfen Sie nach der Aktualisierung, ob alle Aktivitäten noch wie beabsichtigt funktionieren.<br/><strong style=\"color:red\">$a->text</strong><br/>';
 $string['restricted'] = 'Eingeschränkt';
 $string['safemode'] = 'Safe Mode';
 $string['safemodeerror'] = 'Die Nutzung von Moodle im Safe Mode kann zu Schwierigkeiten führen.';
+$string['safemodehelp'] = '<p>Moodle kann beim Betrieb im Safe Mode verschiedene Probleme haben, nicht zuletzt kann es unmöglich sein, neue Dateien zu erzeugen. </p>
+<p>Safe Mode ist zumeist nur auf einigen öffentlichen Webservern eingestellt. Suchen Sie sich einen Anbieter, der auf diese Einstellung verzichtet oder bitten Sie Ihren Dienstleister, dass Sie auf einen Server \'umziehen\' können, der diese Einstellung nicht verwendet.</p>
+<p>Sie können versuchen, die Installation fortzusetzen. Sie müssen aber später mit Problemen rechnen. </p>';
+$string['selectlanguage'] = 'Sprache für die Installation auswählen';
+$string['serverchecks'] = 'Server-Überprüfung';
 $string['sessionautostart'] = 'Session Auto Start';
 $string['sessionautostarterror'] = 'Diese Option sollte abgeschaltet sein';
+$string['sessionautostarthelp'] = '<p>Moodle benötigt den Session Support und kann ohne diese Einstellung nicht funktionieren.</p>
+<p>Sessions sind durch Einstellungen in der Datei php.ini möglich. Bitte suchen Sie nach der Einstellung für session.auto_start </p>';
+$string['sitefullname'] = 'Name der gesamten Website :';
+$string['siteinfo'] = 'Details der Website';
+$string['sitenewsitems'] = 'Anzahl neuer Nachrichten :';
+$string['siteshortname'] = 'Kurzname der Website :';
+$string['sitesummary'] = 'Beschreibung der Website :';
 $string['skipdbencodingtest'] = 'Prüfung der Datenbank-Verschlüsselung überspringen';
+$string['sqlite3_pdo'] = 'SQLite 3 (PDO) <b><strong class=\"errormsg\">Experimentell! (nicht für produktive Server benutzen!!)</strong></b>';
+$string['sqliteextensionisnotpresentinphp'] = 'PHP ist für die Erweiterung SQLite nicht richtig konfiguriert. Bitte prüfen Sie Ihre php.ini oder übersetzen Sie PHP neu.';
 $string['status'] = 'Status';
+$string['tableprefix'] = 'Tabellen-Prefix :';
 $string['thischarset'] = 'UTF-8';
+$string['thisdirection'] = 'ltr';
 $string['thislanguage'] = 'Deutsch';
 $string['unicoderecommended'] = 'Es wird empfohlen, alle Daten im Format Unicode UTF-8 zu speichern. Neuinstallationen sollten mit Datenbanken vorgenommen werden, die als Standardzeichensatz UTF-8 benutzen. Wenn Sie ein Upgrade durchführen, sollten Sie die UTF-8-Migration starten (Admin-Seite).';
 $string['unicoderequired'] = 'Es ist notwendig, alle Daten im Format Unicode UTF-8 zu speichern. Neuinstallationen müssen mit Datenbanken vorgenommen werden, die als Standardzeichensatz UTF-8 benutzen. Wenn Sie ein Upgrade durchführen, sollten Sie die UTF-8-Migration starten (Admin-Seite).';
+$string['upgradingactivitymodule'] = 'Aktivitäten-Module aktualisieren';
+$string['upgradingbackupdb'] = 'Datenbanktabelle zum Backup aktualisieren';
+$string['upgradingblocksdb'] = 'Datenbanktabelle für Blöcke aktualisieren';
+$string['upgradingblocksplugin'] = 'Plugin für Blöcke aktualisieren';
+$string['upgradingcompleted'] = 'Aktualisierung abgeschlossen ...';
+$string['upgradingcourseformatplugin'] = 'Plugin für das Kursformat aktualisieren';
+$string['upgradingenrolplugin'] = 'Plugin zur Einschreibung aktualisieren';
+$string['upgradinggradeexportplugin'] = 'Plugin zum Bewertungsexport aktualisieren';
+$string['upgradinggradeimportplugin'] = 'Plugin zum Bewertungsimport aktualisieren';
+$string['upgradinggradereportplugin'] = 'Plugin zum Bewertungsbericht aktualisieren';
+$string['upgradinglocaldb'] = 'Lokale Datenbank aktualisieren';
+$string['upgradingmessageoutputpluggin'] = 'Plugin zur Mitteilungsausgabe aktualisieren';
+$string['upgradingqtypeplugin'] = 'Plugin für Frage/Typ aktualisieren';
+$string['upgradingrpcfunctions'] = 'RPC-Funktionen aktualisieren';
+$string['usagehelp'] = 'Übersicht:
+$php cliupgrade.php --Parameter
+
+Parameter:
+--lang : Spracheinstellung für die Installation (Standard Englisch (en))
+--webaddr : Web-Adresse der Moodle-Site
+--moodledir : Pfad zum Moodle-Verzeichnis
+--datadir : Pfad zum Daten-Verzeichnis (sollte vor direktem Zugriff geschützt sein!!)
+--dbtype : Datenbank-Typ (Standard mysql)
+--dbhost : Datenbank-Server (Standard localhost)
+--dbname : Datenbank-Name (Standard moodle)
+--dbuser : Datenbank-Nutzer
+--dbpass : Datenbank-Passwort
+--prefix : Tabellen-Prefix für alle Datenbank-Tabellen. (Standard mdl_)
+--verbose : 0 keine Ausgabe, 1 Zusammenfassung (Standard), 2 Ausgabe aller Details
+--interactivelevel : 0 nicht interaktiv, 1 semi-interaktiv (Standard), 2 interaktiv
+--agreelicense : Yes (Standard) oder No
+--confirmrelease : Yes (Standard) oder No
+--sitefullname : Name der Website. (Standard \"Moodle Site\" - bitte ändern!!)
+--siteshortname : Kurzname der Website (Standard moodle)
+--sitesummary : Bescheibung der Website
+--adminfirstname : Vorname des Adminstrators (Standard Admin)
+--adminlastname : Nachname des Adminstrators (Standard User)
+--adminusername : Anmeldename des Adminstrators (Standard admin)
+--adminpassword : Passwort für den Adminstrator (Standard admin)
+--adminemail : E-Mail-Adresse des Adminstrators (Standard root@localhost)
+--help : Hilfe anzeigen
+
+Nutzungsbeispiel:
+$php cliupgrade.php --lang=en --webaddr=http://www.example.com --moodledir=/var/www/html/moodle --datadir=/var/moodledata --dbtype=mysql --dbhost=localhost --dbname=moodle --dbuser=root --prefix=mdl --agreelicense=yes --confirmrelease=yes --sitefullname=\"Example Moodle Site\" --siteshortname=moodle --sitesummary=siteforme --adminfirstname=Admin --adminlastname=User --adminusername=admin --adminpassword=admin --adminemail=admin@example.com --verbose=1 --interactivelevel=2';
 $string['user'] = 'Nutzer';
+$string['versionerror'] = 'Fehler: Nutzerabbruch bei der Versionsabfrage';
 $string['welcomep10'] = '$a->installername ($a->installerversion)';
 $string['welcomep20'] = 'Sie haben das Paket <strong>$a->packname $a->packversion</strong> erfolgreich auf Ihrem Computer installiert.';
 $string['welcomep30'] = 'Diese Version von <strong>$a->installername</strong> enthält folgende Anwendungen, mit denen Sie <strong>Moodle</strong> ausführen können:';
 $string['welcomep40'] = 'Das Paket enthält: <strong>Moodle $a->moodlerelease ($a->moodleversion)</strong>.';
 $string['welcomep50'] = 'Die Nutzung dieser Anwendungen ist lizenzrechtlich geprüft. Alle Anwendungen von <strong>$a->installername</strong> sind
-<a href=\"http://www.opensource.org/docs/definition_plain.html\">Open Source</a> und unterliegen der <a href=\"http://www.gnu.org/copyleft/gpl.html\">GPL</a> Lizenz.';
+<a href=\"http://www.opensource.org/docs/definition_plain.html\"> Open Source </a> und unterliegen der <a href=\"http://www.gnu.org/copyleft/gpl.html\"> GPL</a> Lizenz.';
 $string['welcomep60'] = 'Die folgenden Seiten führen Sie in einfachen Schritten durch die Konfiguration und Installation von <strong>Moodle</strong> auf Ihrem Computer. Sie können die vorgeschlagenen Einstellungen übernehmen oder an Ihre Bedürfnisse anpassen.';
 $string['welcomep70'] = 'Klicken Sie auf den \"Weiter\"-Button, um mit dem Setup von <string>Moodle</string> fortzufahren.';
+$string['welcometext'] = '--- Moodle-Installation über die Komandozeile ---';
+$string['writetoconfigfilefaild'] = 'Fehler beim Schreiben der Konfigurationsdatei';
 $string['wrongdestpath'] = 'Falscher Pfad';
 $string['wrongsourcebase'] = 'Falsche URL-Quelle';
 $string['wrongzipfilename'] = 'Falscher ZIP-Dateiname';
 $string['wwwroot'] = 'Web-Adresse';
 $string['wwwrooterror'] = 'Diese Web-Adresse scheint nicht gültig zu sein. Moodle ist nicht unter dieser Adresse installiert.';
+$string['xmlrpcrecommended'] = 'Die Installation der optionalen xmlrpc Erweiterung ist für die Moodle-Network Funktionen nützlich.';
+$string['yourchoice'] = 'Ihre Wahl :';
+$string['ziprequired'] = 'Die PHP-Erweiterung zip wird ab sofort von Moodle gefordert. Die Pakete info-ZIP oder PclZip werden nicht weiter eingesetzt.';
 ?>
@@ -7,16 +7,19 @@
 /// keep us informed using http://moodle.org/bugs Thanks!
 ///
 /// File generated by cvs://contrib/lang2installer/installer_builder
-/// using strings defined in installer_strings (same dir)
+/// using strings defined in stringnames.txt (same dir)

-$string['check'] = 'Επιλογη';
+$string['availablelangs'] = 'Διαθέσιμα γλωσσικά πακέτα';
+$string['check'] = 'Επιλογή';
 $string['closewindow'] = 'Κλείστε αυτό το παράθυρο';
 $string['continue'] = 'Συνέχεια';
 $string['download'] = 'Κατέβασμα';
+$string['doyouagree'] = 'Έχετε διαβάσει και κατανοήσει αυτούς τους όρους;';
 $string['error'] = 'Σφάλμα';
 $string['gdversion'] = 'Έκδοση GD';
 $string['help'] = 'Βοήθεια';
 $string['info'] = 'Πληροφορίες';
+$string['invalidemail'] = 'Εσφαλμένη διεύθυνση ηλεκτρονικού ταχυδρομείου';
 $string['language'] = 'Γλώσσα';
 $string['moodledocslink'] = 'Αρχεία βοήθειας για αυτήν την σελίδα';
 $string['name'] = 'Όνομα';
@@ -28,6 +31,7 @@ $string['report'] = 'Αναφορά';
 $string['restricted'] = 'Περιορισμένο';
 $string['status'] = 'Κατάσταση';
 $string['thischarset'] = 'UTF-8';
+$string['thisdirection'] = 'ltr';
 $string['thislanguage'] = 'Ελληνικά';
 $string['user'] = 'Χρήστης';
 ?>
@@ -7,7 +7,7 @@
 /// keep us informed using http://moodle.org/bugs Thanks!
 ///
 /// File generated by cvs://contrib/lang2installer/installer_builder
-/// using strings defined in installer_strings (same dir)
+/// using strings defined in stringnames.txt (same dir)

 $string['parentlanguage'] = 'en_utf8';
 $string['thischarset'] = 'iso-8859-1';
@@ -7,8 +7,9 @@
 /// keep us informed using http://moodle.org/bugs Thanks!
 ///
 /// File generated by cvs://contrib/lang2installer/installer_builder
-/// using strings defined in installer_strings (same dir)
+/// using strings defined in stringnames.txt (same dir)

 $string['thischarset'] = 'UTF-8';
+$string['thisdirection'] = 'ltr';
 $string['thislanguage'] = 'English';
 ?>
@@ -7,10 +7,16 @@
 /// keep us informed using http://moodle.org/bugs Thanks!
 ///
 /// File generated by cvs://contrib/lang2installer/installer_builder
-/// using strings defined in installer_strings (same dir)
+/// using strings defined in stringnames.txt (same dir)

 $string['admindirerror'] = 'The admin directory specified is incorrect';
 $string['admindirname'] = 'Admin Directory';
+$string['admindirsetting'] = 'A very few webhosts use /admin as a special URL for you to access a 
+    control panel or something.  Unfortunately this conflicts with the 
+    standard location for the Moodle admin pages.  You can fix this by 
+    renaming the admin directory in your installation, and putting that 
+    new name here.  For example: <br /> <br /><b>moodleadmin</b><br /> <br />
+    This will fix admin links in Moodle.';
 $string['admindirsettinghead'] = 'Setting the admin directory ...';
 $string['admindirsettingsub'] = 'A very few webhosts use /admin as a special URL for you to access a 
    control panel or something.  Unfortunately this conflicts with the 
@@ -18,6 +24,7 @@ $string['admindirsettingsub'] = 'A very few webhosts use /admin as a special URL
    renaming the admin directory in your installation, and putting that 
    new name here.  For example: <br /> <br /><b>moodleadmin</b><br /> <br />
    This will fix admin links in Moodle.';
+$string['availablelangs'] = 'Available language packs';
 $string['bypassed'] = 'Bypassed';
 $string['cannotcreatelangdir'] = 'Cannot create lang dir.';
 $string['cannotcreatetempdir'] = 'Cannot create temp dir.';
@@ -29,18 +36,32 @@ $string['cannotsavezipfile'] = 'Cannot save ZIP file.';
 $string['cannotunzipfile'] = 'Cannot unzip file.';
 $string['caution'] = 'Caution';
 $string['check'] = 'Check';
+$string['chooselanguage'] = 'Choose a language';
 $string['chooselanguagehead'] = 'Choose a language';
 $string['chooselanguagesub'] = 'Please choose a language for the installation ONLY. You will be able to choose site and user languages on a later screen.';
 $string['closewindow'] = 'Close this window';
+$string['compatibilitysettings'] = 'Checking your PHP settings ...';
 $string['compatibilitysettingshead'] = 'Checking your PHP settings ...';
 $string['compatibilitysettingssub'] = 'Your server should pass all these tests to make Moodle run properly';
 $string['componentisuptodate'] = 'Component is up to date.';
 $string['configfilenotwritten'] = 'The installer script was not able to automatically create a config.php file containing your chosen settings, probably because the Moodle directory is not writeable. You can manually copy the following code into a file named config.php within the root directory of Moodle.';
 $string['configfilewritten'] = 'config.php has been successfully created';
+$string['configurationcomplete'] = 'Configuration completed';
 $string['configurationcompletehead'] = 'Configuration completed';
 $string['configurationcompletesub'] = 'Moodle made an attempt to save your configuration in a file in the root of your Moodle installation.';
 $string['continue'] = 'Continue';
+$string['customcheck'] = 'Other Checks';
 $string['database'] = 'Database';
+$string['databasecreationsettings'] = 'Now you need to configure the database settings where most Moodle data
+    will be stored.  This database will be created automatically by the installer
+    with the settings specified below.<br />
+    <br /> <br />
+       <b>Type:</b> fixed to \"mysql\" by the installer<br />
+       <b>Host:</b> fixed to \"localhost\" by the installer<br />
+       <b>Name:</b> database name, eg moodle<br />
+       <b>User:</b> fixed to \"root\" by the installer<br />
+       <b>Password:</b> your database password<br />
+       <b>Tables Prefix:</b> optional prefix to use for all table names';
 $string['databasecreationsettingshead'] = 'Now you need to configure the database settings where most Moodle data
    will be stored.  This database will be created automatically by the installer
    with the settings specified below.';
@@ -50,6 +71,16 @@ $string['databasecreationsettingssub'] = '<b>Type:</b> fixed to \"mysql\" by the
       <b>User:</b> fixed to \"root\" by the installer<br />
       <b>Password:</b> your database password<br />
       <b>Tables Prefix:</b> optional prefix to use for all table names';
+$string['databasesettings'] = 'Now you need to configure the database where most Moodle data
+    will be stored.  This database must already have been created
+    and a username and password created to access it.<br />
+    <br /> <br />
+       <b>Type:</b> mysql or postgres7<br />
+       <b>Host:</b> eg localhost or db.isp.com<br />
+       <b>Name:</b> database name, eg moodle<br />
+       <b>User:</b> your database username<br />
+       <b>Password:</b> your database password<br />
+       <b>Tables Prefix:</b> optional prefix to use for all table names';
 $string['databasesettingshead'] = 'Now you need to configure the database where most Moodle data
    will be stored.  This database must already have been created
    and a username and password created to access it.';
@@ -100,12 +131,30 @@ $string['datarooterror'] = 'The \'Data Directory\' you specified could not be fo
 $string['dbconnectionerror'] = 'We could not connect to the database you specified. Please check your database settings.';
 $string['dbcreationerror'] = 'Database creation error. Could not create the given database name with the settings provided';
 $string['dbhost'] = 'Host Server';
+$string['dbpass'] = 'Password';
 $string['dbprefix'] = 'Tables prefix';
 $string['dbtype'] = 'Type';
 $string['dbwrongencoding'] = 'The selected database is running under one non-recommended encoding ($a). It would be better to use one Unicode (UTF-8) encoded database instead. Anyway, you can bypass this test by selecting the \"Skip DB Encoding Test\" check below, but you could experience problems in the future.';
 $string['dbwronghostserver'] = 'You must follow \"Host\" rules as explained above.';
 $string['dbwrongnlslang'] = 'The NLS_LANG environment variable in your web server must use the AL32UTF8 charset. See PHP documentation about how to configure OCI8 properly.';
 $string['dbwrongprefix'] = 'You must follow \"Tables Prefix\" rules as explained above.';
+$string['directorysettings'] = '<p>Please confirm the locations of this Moodle installation.</p>
+
+<p><b>Web Address:</b>
+Specify the full web address where Moodle will be accessed.  
+If your web site is accessible via multiple URLs then choose the 
+most natural one that your students would use.  Do not include 
+a trailing slash.</p>
+
+<p><b>Moodle Directory:</b>
+Specify the full directory path to this installation
+Make sure the upper/lower case is correct.</p>
+
+<p><b>Data Directory:</b>
+You need a place where Moodle can save uploaded files.  This
+directory should be readable AND WRITEABLE by the web server user 
+(usually \'nobody\' or \'apache\'), but it must not be accessible 
+directly via the web.</p>';
 $string['directorysettingshead'] = 'Please confirm the locations of this Moodle installation';
 $string['directorysettingssub'] = '<b>Web Address:</b>
 Specify the full web address where Moodle will be accessed.  
@@ -132,6 +181,7 @@ $string['downloadlanguagebutton'] = 'Download the &quot;$a&quot; language pack';
 $string['downloadlanguagehead'] = 'Download language pack';
 $string['downloadlanguagenotneeded'] = 'You may continue the installation process using the default language pack, \"$a\".';
 $string['downloadlanguagesub'] = 'You now have the option of downloading a language pack and continuing the installation process in this language.<br /><br />If you are unable to download the language pack, the installation process will continue in English. (Once the installation process is complete, you will have the opportunity to download and install additional language packs.)';
+$string['doyouagree'] = 'Have you read these conditions and understood them?';
 $string['environmenterrortodo'] = 'You must solve all the environmental problems (errors) found above before proceeding to install this Moodle version!';
 $string['environmenthead'] = 'Checking your environment ...';
 $string['environmentrecommendinstall'] = 'is recommended to be installed/enabled';
@@ -144,6 +194,14 @@ $string['error'] = 'Error';
 $string['fail'] = 'Fail';
 $string['fileuploads'] = 'File Uploads';
 $string['fileuploadserror'] = 'This should be on';
+$string['fileuploadshelp'] = '<p>File uploading seems to be disabled on your server.</p>
+
+<p>Moodle can still be installed, but without this ability, you will not be able 
+   to upload course files or new user profile images.</p>
+
+<p>To enable file uploading you (or your system administrator) will need to 
+   edit the main php.ini file on your system and change the setting for 
+   <b>file_uploads</b> to \'1\'.</p>';
 $string['gdversion'] = 'GD version';
 $string['gdversionerror'] = 'The GD library should be present to process and create images';
 $string['gdversionhelp'] = '<p>Your server does not seem to have GD installed.</p>
@@ -158,16 +216,35 @@ $string['gdversionhelp'] = '<p>Your server does not seem to have GD installed.</
 <p>Under Windows you can usually edit php.ini and uncomment the line referencing php_gd2.dll.</p>';
 $string['globalsquotes'] = 'Insecure Handling of Globals';
 $string['globalsquoteserror'] = 'Fix your PHP settings: disable register_globals and/or enable magic_quotes_gpc';
+$string['globalsquoteshelp'] = '<p>Combination of disabled Magic Quotes GPC and enabled Register Globals both at the same time is not recommended.</p>
+
+<p>The recommended setting is <b>magic_quotes_gpc = On</b> and <b>register_globals = Off</b> in your php.ini</p>
+
+<p>If you don\'t have access to your php.ini, you might be able to place the following line in a file 
+   called .htaccess within your Moodle directory:
+   <blockquote>php_value magic_quotes_gpc On</blockquote>
+   <blockquote>php_value register_globals Off</blockquote>
+</p>';
+$string['globalswarning'] = '<p><strong>Security Warning</strong>: to operate properly, Moodle requires <br />that you make certain changes to your current PHP settings.<p/><p>You <em>must</em> set <code>register_globals=off</code>.<p>This setting is controlled by editing your <code>php.ini</code>, Apache/IIS <br />configuration or <code>.htaccess</code> file.</p>';
 $string['help'] = 'Help';
 $string['iconvrecommended'] = 'Installing the optional ICONV library is highly recommended in order to improve site performance, particularly if your site is supporting non-latin languages.';
 $string['info'] = 'Information';
 $string['installation'] = 'Installation';
+$string['invalidemail'] = 'Invalid email address';
 $string['invalidmd5'] = 'Invalid md5';
 $string['langdownloaderror'] = 'Unfortunately the language \"$a\" was not installed. The installation process will continue in English.';
 $string['langdownloadok'] = 'The language \"$a\" was installed successfully. The installation process will continue in this language.';
 $string['language'] = 'Language';
 $string['magicquotesruntime'] = 'Magic Quotes Run Time';
 $string['magicquotesruntimeerror'] = 'This should be off';
+$string['magicquotesruntimehelp'] = '<p>Magic quotes runtime should be turned off for Moodle to function properly.</p>
+
+<p>Normally it is off by default ... see the setting <b>magic_quotes_runtime</b> in your php.ini file.</p>
+
+<p>If you don\'t have access to your php.ini, you might be able to place the following line in a file 
+   called .htaccess within your Moodle directory:
+   <blockquote>php_value magic_quotes_runtime Off</blockquote>
+</p>';
 $string['mbstringrecommended'] = 'Installing the optional MBSTRING library is highly recommended in order to improve site performance, particularly if your site is supporting non-latin languages.';
 $string['memorylimit'] = 'Memory Limit';
 $string['memorylimiterror'] = 'The PHP memory limit is set quite low ... you may run into problems later.';
@@ -193,8 +270,8 @@ $string['memorylimithelp'] = '<p>The PHP memory limit for your server is current
 $string['missingrequiredfield'] = 'Some required field is missing';
 $string['moodledocslink'] = 'Moodle Docs for this page';
 $string['mssql'] = 'SQL*Server (mssql)';
-$string['mssql_n'] = 'SQL*Server with UTF-8 support (mssql_n)';
 $string['mssqlextensionisnotpresentinphp'] = 'PHP has not been properly configured with the MSSQL extension so that it can communicate with SQL*Server.  Please check your php.ini file or recompile PHP.';
+$string['mssql_n'] = 'SQL*Server with UTF-8 support (mssql_n)';
 $string['mysql'] = 'MySQL (mysql)';
 $string['mysql416bypassed'] = 'However, if your site is using iso-8859-1 (latin) languages ONLY, you may continue using your currently installed MySQL 4.1.12 (or higher).';
 $string['mysql416required'] = 'MySQL 4.1.16 is the minimum version required for Moodle 1.6 in order to guarantee that all data can be converted to UTF-8 in the future.';
@@ -203,8 +280,8 @@ $string['name'] = 'Name';
 $string['next'] = 'Next';
 $string['oci8po'] = 'Oracle (oci8po)';
 $string['ociextensionisnotpresentinphp'] = 'PHP has not been properly configured with the OCI8 extension so that it can communicate with Oracle.  Please check your php.ini file or recompile PHP.';
-$string['odbc_mssql'] = 'SQL*Server over ODBC (odbc_mssql)';
 $string['odbcextensionisnotpresentinphp'] = 'PHP has not been properly configured with the ODBC extension so that it can communicate with SQL*Server.  Please check your php.ini file or recompile PHP.';
+$string['odbc_mssql'] = 'SQL*Server over ODBC (odbc_mssql)';
 $string['ok'] = 'OK';
 $string['pass'] = 'Pass';
 $string['password'] = 'Password';
@@ -218,16 +295,29 @@ $string['phpversionhelp'] = '<p>Moodle requires a PHP version of at least 4.3.0
 (In case of 5.0.x you could also downgrade to 4.4.x version)</p>';
 $string['postgres7'] = 'PostgreSQL (postgres7)';
 $string['previous'] = 'Previous';
+$string['releasenoteslink'] = 'For information about this version of Moodle, please see the online <a target=\"_new\" href=\"$a\">Release Notes</a>';
 $string['remotedownloadnotallowed'] = 'Download of components to your server isn\'t allowed (allow_url_fopen is disabled).<br /><br />You must download the <a href=\"$a->url\">$a->url</a> file manually, copy it to \"$a->dest\" in your server and unzip it there.';
 $string['report'] = 'Report';
 $string['restricted'] = 'Restricted';
 $string['safemode'] = 'Safe Mode';
 $string['safemodeerror'] = 'Moodle may have trouble with safe mode on';
+$string['safemodehelp'] = '<p>Moodle may have a variety of problems with safe mode on, not least is that 
+   it probably won\'t be allowed to create new files.</p>
+   
+<p>Safe mode is usually only enabled by paranoid public web hosts, so you may have 
+   to just find a new web hosting company for your Moodle site.</p>
+   
+<p>You can try continuing the install if you like, but expect a few problems later on.</p>';
+$string['serverchecks'] = 'Server Checks';
 $string['sessionautostart'] = 'Session Auto Start';
 $string['sessionautostarterror'] = 'This should be off';
+$string['sessionautostarthelp'] = '<p>Moodle requires session support and will not function without it.</p>
+
+<p>Sessions can be enabled in the php.ini file ... look for the session.auto_start parameter.</p>';
 $string['skipdbencodingtest'] = 'Skip DB Encoding Test';
 $string['status'] = 'Status';
 $string['thischarset'] = 'UTF-8';
+$string['thisdirection'] = 'ltr';
 $string['thislanguage'] = 'English';
 $string['unicoderecommended'] = 'Storing all your data in Unicode (UTF-8) is recommended. New installations should be performed into databases that have their default character set as Unicode.  If you are upgrading, you should perform the UTF-8 migration process (see the Admin page).';
 $string['unicoderequired'] = 'It is required that you store all your data in Unicode format (UTF-8). New installations must be performed into databases that have their default character set as Unicode.  If you are upgrading, you should perform the UTF-8 migration process (see the Admin page).';
@@ -7,7 +7,7 @@
 /// keep us informed using http://moodle.org/bugs Thanks!
 ///
 /// File generated by cvs://contrib/lang2installer/installer_builder
-/// using strings defined in installer_strings (same dir)
+/// using strings defined in stringnames.txt (same dir)

 $string['parentlanguage'] = 'es_utf8';
 $string['thischarset'] = 'UTF-8';
@@ -7,12 +7,14 @@
 /// keep us informed using http://moodle.org/bugs Thanks!
 ///
 /// File generated by cvs://contrib/lang2installer/installer_builder
-/// using strings defined in installer_strings (same dir)
+/// using strings defined in stringnames.txt (same dir)

 $string['closewindow'] = 'Cerrar esta ventana';
 $string['continue'] = 'Continuar';
+$string['doyouagree'] = '¿Ha leído y comprendido estas condiciones?';
 $string['error'] = 'Error';
 $string['help'] = 'Ayuda';
+$string['invalidemail'] = 'Dirección de correo no válida';
 $string['language'] = 'Idioma';
 $string['name'] = 'Nombre';
 $string['next'] = 'Siguiente';
@@ -21,6 +23,7 @@ $string['parentlanguage'] = 'es_utf8';
 $string['password'] = 'Contraseña';
 $string['status'] = 'Estado';
 $string['thischarset'] = 'UTF-8';
+$string['thisdirection'] = 'ltr';
 $string['thislanguage'] = 'Español - España';
 $string['user'] = 'Usuario';
 ?>
@@ -7,9 +7,10 @@
 /// keep us informed using http://moodle.org/bugs Thanks!
 ///
 /// File generated by cvs://contrib/lang2installer/installer_builder
-/// using strings defined in installer_strings (same dir)
+/// using strings defined in stringnames.txt (same dir)

 $string['parentlanguage'] = 'es_utf8';
 $string['thischarset'] = 'UTF-8';
+$string['thisdirection'] = 'ltr';
 $string['thislanguage'] = 'Español - Mexico';
 ?>
@@ -7,16 +7,19 @@
 /// keep us informed using http://moodle.org/bugs Thanks!
 ///
 /// File generated by cvs://contrib/lang2installer/installer_builder
-/// using strings defined in installer_strings (same dir)
+/// using strings defined in stringnames.txt (same dir)

 $string['admindirerror'] = 'El directorio especificado para admin es incorrecto';
 $string['admindirname'] = 'Directorio Admin';
+$string['admindirsetting'] = '<p>Muy pocos servidores web usan /admin como URL especial para permitirle acceder a un panel de control o similar. Desgraciadamente, esto entra en conflicto con la ubicación estándar de las páginas de administración de Moodle Usted puede corregir esto renombrando el directorio admin en su instalación, y poniendo aquí ese nuevo nombre. Por ejemplo: <blockquote> moodleadmin</blockquote>.
+Así se corregirán los enlaces admin en Moodle.</p>';
 $string['admindirsettinghead'] = 'Seleccionar el directorio admin...';
 $string['admindirsettingsub'] = 'Muy pocos servidores web usan /admin como URL especial para permitirle acceder
    a un panel de control o similar. Desgraciadamente, esto entra en conflicto con la ubicación estándar
    de las páginas de administración de Moodle. Usted puede corregir esto renombrando el directorio admin 
    en su instalación, y poniendo aquí ese nuevo nombre. Por ejemplo: <br /> <br /><b>moodleadmin</b><br /> <br />
    Así se corregirán los enlaces admin en Moodle.';
+$string['availablelangs'] = 'Paquetes de idioma disponibles';
 $string['bypassed'] = 'Evitado';
 $string['cannotcreatelangdir'] = 'No se puede crear el directorio lang.';
 $string['cannotcreatetempdir'] = 'No se puede crear el directorio temp.';
@@ -28,19 +31,31 @@ $string['cannotsavezipfile'] = 'No se puede guardar el archivo ZIP.';
 $string['cannotunzipfile'] = 'No se puede descomprimir el archivo.';
 $string['caution'] = 'Precaución';
 $string['check'] = 'Revisar';
+$string['chooselanguage'] = 'Seleccionar idioma';
 $string['chooselanguagehead'] = 'Seleccionar idioma';
 $string['chooselanguagesub'] = 'Por favor, seleccione un idioma para el proceso de instalación.';
 $string['closewindow'] = 'Cerrar esta ventana';
+$string['compatibilitysettings'] = 'Comprobando sus ajustes PHP...';
 $string['compatibilitysettingshead'] = 'Comprobando sus ajustes PHP...';
 $string['compatibilitysettingssub'] = 'Su servidor debería pasar todos estas comprobaciones para que Moodle pueda funcionar correctamente.';
 $string['componentisuptodate'] = 'El componente está actualizado.';
 $string['configfilenotwritten'] = 'El script instalador no ha podido crear automáticamente un archivo config.php con las especificaciones elegidas. Por favor, copie el siguiente código en un archivo llamado config.php y coloque ese archivo en el directorio raíz de Moodle.';
 $string['configfilewritten'] = 'config.php se ha creado con éxito';
+$string['configurationcomplete'] = 'Configuración completa';
 $string['configurationcompletehead'] = 'Configuración completa';
 $string['configurationcompletesub'] = 'Moodle ha creado su fichero de configuración';
 $string['continue'] = 'Continuar';
 $string['curlrecommended'] = 'Se recomienda encarecidamente instalar la librería opcional Curl a fin de posibilitar la funcionalidad de la Red Moodle.';
+$string['customcheck'] = 'Otras comprobaciones';
 $string['database'] = 'Base de datos';
+$string['databasecreationsettings'] = 'Ahora necesita configurar los ajustes de la base de datos donde se almacenarán la mayoría de los datos de Moodle. El instalador creará la base de datos con los ajustes especificados más abajo.<br />
+<br /> <br />
+<b>Tipo:</b> el valor por defecto es \"mysql\"<br />
+<b>Servidor:</b> el valor por defecto es \"localhost\"<br />
+<b>Nombre:</b> nombre de la base de datos, e.g., moodle<br />
+<b>Usuario:</b> el valor por defecto es  \"root\"<br />
+<b>Contraseña:</b> contraseña de la base de datos<br />
+<b>Prefijo de tablas:</b> prefijo opcional para todas las tablas';
 $string['databasecreationsettingshead'] = 'Ahora necesita configurar los ajustes de la base de datos donde se almacenarán la mayoría de los datos de Moodle. El instalador creará la base de datos con los ajustes especificados más abajo.';
 $string['databasecreationsettingssub'] = '<b>Tipo:</b> el valor por defecto es \"mysql\"<br />
 <b>Servidor:</b> el valor por defecto es \"localhost\"<br />
@@ -48,6 +63,14 @@ $string['databasecreationsettingssub'] = '<b>Tipo:</b> el valor por defecto es \
 <b>Usuario:</b> el valor por defecto es  \"root\"<br />
 <b>Contraseña:</b> contraseña de la base de datos<br />
 <b>Prefijo de tablas:</b> prefijo opcional para todas las tablas';
+$string['databasesettings'] = 'Ahora necesita configurar la base de datos en la que se almacenará la mayor parte de datos de Moodle. Esta base de datos debe haber sido ya creada, y disponer de un nombre de usuario y de una contraseña de acceso.<br />
+<br /> <br />
+<b>Tipo:</b> mysql o postgres7<br />
+<b>Servidor:</b> e.g., localhost or db.isp.com<br />
+<b>Nombre:</b> Nombre de la base de datos, e.g., moodle<br />
+<b>Usuario:</b> nombre de usuario de la base de datos<br />
+<b>Contraseña:</b> contraseña de la base de datos<br />
+<b>Prefijo de tablas:</b> prefijo a utilizar en todos los nombres de tabla';
 $string['databasesettingshead'] = 'Ahora necesita configurar la base de datos en la que se almacenarán la mayor parte de los datos de Moodle. Esta base de datos debe haber sido ya creada y disponer de un nombre de usuario y una contraseña de acceso.';
 $string['databasesettingssub'] = '<b>Tipo:</b> mysql o postgres7<br />
 <b>Servidor:</b> p.ej.: localhost o db.tudominio.com<br />
@@ -72,6 +95,12 @@ $string['databasesettingssub_mysql'] = '<b>Tipo:</b> MySQL<br />
 <b>Usuario:</b> usuario de la base de datos<br />
 <b>Contraseña:</b> contraseña de la base de datos<br />
 <b>Prefijo de tablas:</b> prefijo a usar en los nombres de las tablas (opcional)';
+$string['databasesettingssub_mysqli'] = '<b>Tipo:</b> MySQL Mejorado<br />
+<b>Host:</b> e.g., localhost o db.isp.com<br />
+<b>Nombre:</b> nombre de la base de datos, e.g., moodle<br />
+<b>Usuario:</b> nombre de usuario de su base de datos<br />
+<b>Contraseña:</b> contraseña de su base de datos<br />
+<b>Prefijo de Tablas:</b> prefijo a usar en los nombres de las tablas (opcional)';
 $string['databasesettingssub_oci8po'] = '<b>Tipo:</b> Oracle<br />
 <b>Servidor:</b> no usado, puede dejarse en blanco<br />
 <b>Nombre:</b> nombre de la conexión tnsnames.ora<br />
@@ -90,17 +119,29 @@ $string['databasesettingssub_postgres7'] = '<b>Tipo:</b> PostgreSQL<br />
 <b>Usuario:</b> usuario de la base de datos<br />
 <b>Contraseña:</b> contraseña de la base de datos<br />
 <b>Prefijo de tablas:</b> prefijo para usar con todas las tablas (obligatorio)';
+$string['databasesettingswillbecreated'] = '<b>Nota:</> el instalador tratará de crear la base de datos en el caso de que no exista.';
 $string['dataroot'] = 'Directorio de Datos';
 $string['datarooterror'] = 'El \'Directorio de Datos\' no pudo ser encontrado o creado. Corrija la ruta o cree el directorio manualmente.';
+$string['datarootpublicerror'] = 'El \'Directorio de datos\' que ha especificado es directamente accesible vía web: debe utilizar un directorio diferente.';
 $string['dbconnectionerror'] = 'Error de conexión con la base de datos. Por favor, compruebe los ajustes de la base de datos.';
 $string['dbcreationerror'] = 'Error al crear la base de datos. No se ha podido crear la base de datos con el nombre y ajustes suministrados';
 $string['dbhost'] = 'Servidor';
+$string['dbpass'] = 'Contraseña';
 $string['dbprefix'] = 'Prefijo de tablas';
 $string['dbtype'] = 'Tipo';
 $string['dbwrongencoding'] = 'La base de datos seleccionada está ejecutándose bajo una codificación no recomendada ($a). Convendría usar en su lugar una base de datos con codificación Unicode (UTF-8). En cualquier caso, usted puede pasar por alto esta prueba seleccionando \"Pasar por alto la prueba de codificación BD\", si bien tal vez tenga problemas en el futuro.';
 $string['dbwronghostserver'] = 'Debe seguir las reglas \"Host\" tal como se explicó más arriba.';
 $string['dbwrongnlslang'] = 'La variable contextual NLS_LANG de su servidor web debe usar el conjunto de caracteres AL32UTF8. Revise la documentación PHP para ver cómo se configura adecuadamente OCI8.';
 $string['dbwrongprefix'] = 'Debe seguir las reglas \"Prefijo de Tablas\" como se explicó más arriba.';
+$string['directorysettings'] = '<p>Por favor, confirme las direcciones de la instalación de Moodle.</p>
+
+<p><b>Dirección web:</b>
+Necesita decir a Moodle dónde está localizado. Especifique la dirección web completa en la que se ha instalado Moodle. Si su sitio web es accesible a través de varias URLs, seleccione la que resulte de acceso más natural a sus estudiantes. No incluya la última barra</p>
+<p><b>Directorio de Moodle:</b>
+Especifique la ruta OS completa a esta misma ubicación
+Asegúrese de que escribe correctamente mayúsculas y minúsculas</p>
+<p><b>Directorio de datos:</b>
+Usted necesita un lugar en el que Moodle pueda guardar los archivos subidos. Este directorio debe ser legible Y ESCRIBIBLE por el usuario del servidor web (normalmente \'nobody\' o \'apache\'), pero no debería ser directamente accesible desde la web.</p>';
 $string['directorysettingshead'] = 'Por favor, confirme las siguientes direcciones de la instalación de Moodle';
 $string['directorysettingssub'] = '<b>Dirección Web:</b>
 Especifique la dirección web completa en la que se accederá a Moodle.
@@ -123,10 +164,13 @@ $string['downloadlanguagebutton'] = 'Descargar el paquete de idioma \"$a\"';
 $string['downloadlanguagehead'] = 'Descargar paquete de idioma';
 $string['downloadlanguagenotneeded'] = 'Puede continuar el proceso de instalación con el idioma por defecto, \"$a\".';
 $string['downloadlanguagesub'] = 'Ahora tiene la opción de descargar su paquete de idioma y continuar con el proceso de instalación en ese idioma.<br /><br />Si no es posible la descarga el proceso de instalación continuará en inglés (una vez que la instalación haya finalizado, podrá descargar e instalar otros idiomas).';
+$string['doyouagree'] = '¿Ha leído y comprendido los términos y condiciones?';
 $string['environmenterrortodo'] = 'Debe resolver todos los problemas de entorno (errores) encontrados arriba antes de proceder a instalar esta versión de Moodle';
 $string['environmenthead'] = 'Comprobando su entorno';
+$string['environmentrecommendcustomcheck'] = 'Si esta comprobación falla, ello indica un problema potencial';
 $string['environmentrecommendinstall'] = 'es recomendable que esté instalado/activado';
 $string['environmentrecommendversion'] = 'versión $a->needed es recomendada y está ejecutando $a->current';
+$string['environmentrequirecustomcheck'] = 'esta prueba debe pasar';
 $string['environmentrequireinstall'] = 'es obligatorio que esté instalado/activado';
 $string['environmentrequireversion'] = 'versión $a->needed es obligatoria y está ejecutando $a->current';
 $string['environmentsub'] = 'Estamos comprobando que diferentes componentes de su servidor cumplen con los requerimientos del sistema';
@@ -135,6 +179,11 @@ $string['error'] = 'Error';
 $string['fail'] = 'Fallo';
 $string['fileuploads'] = 'Subidas de archivos';
 $string['fileuploadserror'] = 'Debe estar activado';
+$string['fileuploadshelp'] = '<p>La subida de archivos parece estar desactivada en su servidor.</p>
+
+<p>Moodle aún puede ser instalado, pero usted no podrá subir archivos a un curso ni imágenes de los usuarios.</p>
+
+<p>Para posibilitar la subida de archivos, usted (o el administrador del sistema) necesita editar el archivo php.ini principal y cambiar el ajuste de <b>file_uploads</b> a \'1\'.</p>';
 $string['gdversion'] = 'Versión GD';
 $string['gdversionerror'] = 'La librería GD debería estar presente para procesar y crear imágenes';
 $string['gdversionhelp'] = '<p>Su servidor parece no tener el GD instalado.</p>
@@ -146,16 +195,34 @@ $string['gdversionhelp'] = '<p>Su servidor parece no tener el GD instalado.</p>
 <p>En un entorno Windows, puede editar php.ini y quitar los comentarios de la línea referida a php_gd2.dll.</p>';
 $string['globalsquotes'] = 'Manejo Inseguro de Ajustes Globales';
 $string['globalsquoteserror'] = 'Fije sus ajustes PHP: deshabilite register_globals y/o habilite magic_quotes_gpc';
+$string['globalsquoteshelp'] = '<p>No se recomienda la combinación simultánea de Magic Quotes GPC desactivado y Register Globals activado.</p>
+
+<p>El ajuste recomendado es <b>magic_quotes_gpc = On</b> and <b>register_globals = Off</b> en su php.ini</p>
+
+<p>Si no tiene acceso al php.ini, debería poder escribir la siguiente línea en un archivo denominado .htaccess dentro de su directorio Moodle:
+<blockquote>php_value magic_quotes_gpc On</blockquote>
+<blockquote>php_value register_globals Off</blockquote>
+</p>';
+$string['globalswarning'] = '<p><strong>Advertencia de seguridad</strong>: para funcionar adecuadamente, Moodle requiere <br />that que realice ciertos cambios en los ajustes PHP actuales.<p/><p>Usted <em>debe</em> ajustar <code>register_globals=off</code>.<p>Esta opción se ajusta editando el archivo de <code>php.ini</code>, Apache/IIS <br />o <code>.htaccess</code>.</p>';
 $string['help'] = 'Ayuda';
 $string['iconvrecommended'] = 'La instalación de la librería opcional ICONV es muy recomendable para mejorar el rendimiento del sitio, especialmente si su sitio está soportando idiomas no latinos.';
 $string['info'] = 'Información';
 $string['installation'] = 'Instalación';
+$string['invalidemail'] = 'Dirección de correo no válida';
 $string['invalidmd5'] = 'md5 no válido';
+$string['invalidurl'] = 'URL no válida';
 $string['langdownloaderror'] = 'El idioma \"$a\" no pudo ser instalado. El proceso de instalación continuará en inglés.';
 $string['langdownloadok'] = 'El idioma \"$a\" ha sido instalado correctamente. El proceso de instalación continuará en este idioma.';
 $string['language'] = 'Idioma';
 $string['magicquotesruntime'] = 'Magic Quotes Run Time';
 $string['magicquotesruntimeerror'] = 'Debe estar desactivado';
+$string['magicquotesruntimehelp'] = '<p>Magic quotes runtime debe estar desactivado para que Moodle funcione adecuadamente.</p>
+
+<p>Normalmente está desactivado por defecto... Vea el ajuste <b>magic_quotes_runtime</b> en su archivo php.ini.</p>
+
+<p>Si usted no tiene acceso a php.ini, debería poder escribir la siguiente línea en un archivo denominado .htaccess dentro del directorio Moodle:
+<blockquote>php_value magic_quotes_runtime Off</blockquote>
+</p>';
 $string['mbstringrecommended'] = 'La instalación de la librería opcional MBSTRING es muy recomendable para mejorar el rendimiento del sitio, especialmente si su sitio está soportando idiomas no latinos.';
 $string['memorylimit'] = 'Límite de memoria';
 $string['memorylimiterror'] = 'El límite de memoria PHP es demasiado bajo... Puede tener problemas más tarde.';
@@ -163,34 +230,38 @@ $string['memorylimithelp'] = '<p>El límite de memoria PHP en su servidor es act

 <p>Esto puede ocasionar que Moodle tenga problemas de memoria más adelante, especialmente si usted tiene activados muchos módulos y/o muchos usuarios.</p>

-<p>Recomendamos que configure PHP con el límite más alto posible, e.g. 16M.
+<p>Recomendamos que configure PHP con el límite más alto posible, e.g. 40M.
 Hay varias formas de hacer esto:</p>
 <ol>
 <li>Si puede hacerlo, recompile PHP con <i>--enable-memory-limit</i>.
 Esto hace que Moodle fije por sí mismo el límite de memoria.</li>
 <li>Si usted tiene acceso al archivo php.ini, puede cambiar el ajuste <b>memory_limit</b>
-a, digamos, 16M. Si no lo tiene, pida a su administrador que lo haga por usted.</li>
+a, digamos, 40M. Si no lo tiene, pida a su administrador que lo haga por usted.</li>
 <li>En algunos servidores PHP usted puede crear en el directorio Moodle un archivo .htaccess que contenga esta línea:
-<p><blockquote>php_value memory_limit 16M</blockquote></p>
+<p><blockquote>php_value memory_limit 40M</blockquote></p>
 <p>Sin embargo, en algunos servidores esto hace que <b>todas</b> las páginas PHP dejen de funcionar
 (podrá ver los errores cuando mire las páginas) de modo que tendrá que eliminar el archivo .htaccess.</p></li>
 </ol>';
 $string['missingrequiredfield'] = 'Falta algún campo necesario';
 $string['moodledocslink'] = 'Moodle Docs para esta página';
 $string['mssql'] = 'SQL*Server (mssql)';
-$string['mssql_n'] = 'SQL*Server con UTF-8 (mssql_n)';
 $string['mssqlextensionisnotpresentinphp'] = 'PHP no se ha configurado adecuadamente con la extensión MSSQL de modo que pueda comunicarse con el SQL*Server. Por favor, compruebe el archivo php.ini o vuelva a compilar PHP.';
+$string['mssql_n'] = 'SQL*Server con UTF-8 (mssql_n)';
 $string['mysql'] = 'MySQL (mysql)';
 $string['mysql416bypassed'] = 'En cualquier caso, si su sitio únicamente está utilizando idiomas ISO-8859-1 (latin), puede continuar con su versión de MySQL actual (4.1.12 o superior).';
 $string['mysql416required'] = 'MySQL 4.1.16 es la versión mínima requerida para trabajar con Moodle 1.6 y garantizar que toda la información podrá ser convertida a UTF-8 en el futuro.';
 $string['mysqlextensionisnotpresentinphp'] = 'PHP no ha sido adecuadamente configurado con la extensión MySQL de modo que pueda comunicarse con MySQL. Por favor, compruebe el archivo php.ini o recompile PHP.';
+$string['mysqli'] = 'MySQL Mejorado (mysqli)';
+$string['mysqliextensionisnotpresentinphp'] = 'PHP no ha sido configurado adecuadamente con la extensión MySQLi de forma que se pueda comunicar con MySQL. Por favor, compruebe su archivo php.ini o recompile PHP. La extensión MySQLi no está disponible en PHP 4.';
 $string['name'] = 'Nombre';
 $string['next'] = 'Siguiente';
 $string['oci8po'] = 'Oracle (oci8po)';
 $string['ociextensionisnotpresentinphp'] = 'PHP no ha sido adecuadamente configurado con la extensión OCI8 de modo que pueda comunicarse con Oracle. Por favor, compruebe el archivo php.ini o vuelva a compilar PHP.';
-$string['odbc_mssql'] = 'SQL*Server over ODBC (odbc_mssql)';
 $string['odbcextensionisnotpresentinphp'] = 'PHP no ha sido adecuadamente configurado con la extensión ODBC de modo que pueda comunicarse con SQL*Server. Por favor, compruebe el archivo php.ini o vuelva a compilar PHP.';
+$string['odbc_mssql'] = 'SQL*Server over ODBC (odbc_mssql)';
 $string['ok'] = 'OK';
+$string['opensslrecommended'] = 'Instalar la librería opcional OpenSSL es altamente recomendado -- activa la funcionalidad de red de Moodle (\'Moodle Networking\').';
+$string['parentlanguage'] = 'es';
 $string['pass'] = 'Correcto';
 $string['password'] = 'Contraseña';
 $string['pgsqlextensionisnotpresentinphp'] = 'PHP no ha sido adecuadamente configurado con la extensión PGSQL de modo que pueda comunicarse con PostgreSQL. Por favor, compruebe el archivo php.ini o vuelva a compilar PHP.';
@@ -202,16 +273,30 @@ $string['phpversionhelp'] = '<p>Moodle requiere una versión de PHP 4.1.0 o supe
 <p>Debe actualizar PHP o acudir a otro servidor con una versión más reciente de PHP</p>';
 $string['postgres7'] = 'PostgreSQL (postgres7)';
 $string['previous'] = 'Anterior';
+$string['qtyperqpwillberemoved'] = 'Durante la actualización, el tipo de pregunta RQP será eliminada. En el caso de que no estuviera utilizando este tipo de pregunta, no debería tener ningún problema.';
+$string['qtyperqpwillberemovedanyway'] = 'Durante la actualización, el tipo de pregunta RQP será eliminada. Usted tiene algunas preguntas RQP en su base de datos, y tales preguntas no pararán de funcionar a menos que reinstale el código desde http://moodle.org/mod/data/view.php?d=13&amp;rid=797  antes de continuar la actualización.';
+$string['releasenoteslink'] = 'Si desea información sobre esta versión de Moodle, por favor vea <a target=\"_blank\" href=\"$a\">Release Notes</a>';
+$string['remotedownloaderror'] = 'Falló la descarga del componente a su servidor. Se recomienda verificar los ajustes del proxy, extensión PHP cURL.<br /><br />Debe descargar el<a href=\"$a->url\">$a->url</a> archivo manualmente, copiarlo en \"$a->dest\" en su servidor y descomprimirlo allí.';
 $string['remotedownloadnotallowed'] = 'No está permitido descargar los componentes a su servidor (allow_url_fopen está deshabilitado).<br /><br />Debe descargar el archivo <a href=\"$a->url\">$a->url</a> manualmente, y copiarlo a \"$a->dest\"';
 $string['report'] = 'Informe';
 $string['restricted'] = 'Restringido';
 $string['safemode'] = 'Safe Mode';
 $string['safemodeerror'] = 'Moodle puede tener problemas con \'safe mode\' activado';
+$string['safemodehelp'] = '<p>Moodle puede tener varios problemas con \'safe mode\' activado, y probablemente no pueda crear nuevos archivos.</p>
+
+<p>Normalmente el \'safe mode\' sólo es activado por servidores web públicos paranoides, así que lo que usted debe hacer es encontrar otra compañía para su sitio Moodle.</p>
+
+<p>Si lo desea, puede seguir con la instalación, pero experimentará problemas más adelante.</p>';
+$string['serverchecks'] = 'Comprobaciones del Servidor';
 $string['sessionautostart'] = 'Autocomienzo de sesión';
 $string['sessionautostarterror'] = 'Deb e estar desactivado';
+$string['sessionautostarthelp'] = '<p>Moodle requiere apoyo de sesión y no funcionará sin él.</p>
+
+<p>Las sesiones deben estar activadas en el archhivo php.ini para el parámetro session.auto_start.</p>';
 $string['skipdbencodingtest'] = 'Pasar por alto el test de decodificación de la BD';
 $string['status'] = 'Estado';
 $string['thischarset'] = 'UTF-8';
+$string['thisdirection'] = 'ltr';
 $string['thislanguage'] = 'Español - Internacional';
 $string['unicoderecommended'] = 'Se recomienda almacenar todos los datos en Unicode (UTF-8). Las instalaciones nuevas deberían ejecutarse en bases de datos cuyo juego de caracteres por defecto fuera Unicode. Si está realizando una actualización, debería llevar a cabo el proceso de migración UTF-8 (vea al respecto la página de Administración).';
 $string['unicoderequired'] = 'Es necesario que almacene todos sus datos en formato Unicode (UTF-8). Las instalaciones nuevas deberían ejecutarse en bases de datos cuyo juego de caracteres por defecto fuera Unicode. Si está realizando una actualización, debería llevar a cabo el proceso de migración UTF-8 (vea al respecto la página de Administración).';
@@ -236,4 +321,6 @@ $string['wrongsourcebase'] = 'Base de fuente de URL errónea.';
 $string['wrongzipfilename'] = 'Nombre de archivo ZIP erróneo.';
 $string['wwwroot'] = 'Dirección Web';
 $string['wwwrooterror'] = 'La \'Dirección Web\' parece incorrecta. No se pudo encontrar una instalación de Moodle. El valor ha sido cambiado por el original.';
+$string['xmlrpcrecommended'] = 'Instalar la extensión xmlrpc opcional es útil para la funcionalidad de la Red Moodle.';
+$string['ziprequired'] = 'Moodle requiere ahora la extensión Zip PHP. Ya no se usan ni las binarias info-ZIP ni la librería PclZip.';
 ?>
--- a/Show More
+++ b/Show More