Bumped to Moodle 1.8.5

comes foward with bugs related to this, it will need to be changed everywhere else where there is no urlencoding done at this time.

admin/auth_config.php

@@ -9,6 +9,7 @@ require_once $CFG->libdir.'/adminlib.php';
 $adminroot = admin_get_root();
 admin_externalpage_setup('userauthentication', $adminroot);
 $auth = required_param('auth', PARAM_SAFEDIR);
+$CFG->pagepath = 'auth/' . $auth;
 $authplugin = get_auth_plugin($auth);
 $err = array();
 
@@ -50,7 +51,7 @@ if ($frm = data_submitted()) {
     $frm = get_config("auth/$auth");
 }
 
-$user_fields = array("firstname", "lastname", "email", "phone1", "phone2", "department", "address", "city", "country", "description", "idnumber", "lang");
+$user_fields = array("firstname", "lastname", "email", "phone1", "phone2", "institution", "department", "address", "city", "country", "description", "idnumber", "lang");
 
 /// Get the auth title (from core or own auth lang files)
     $authtitle = get_string("auth_{$auth}title", "auth");

admin/blocks.php

@@ -54,7 +54,7 @@
         if (!$block = blocks_get_record($multiple)) {
             error("Block doesn't exist!");
         }
-        $block->multiple = !$block->multiple;
+        $block->multiple = intval(!$block->multiple);
         update_record('block', $block);
     }
 

admin/cron.php

@@ -364,7 +364,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)

admin/environment.xml

@@ -117,6 +117,11 @@
           <ON_CHECK message="tokenizerrecommended" />
         </FEEDBACK>
       </PHP_EXTENSION>
+      <PHP_EXTENSION name="xmlrpc" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="xmlrpcrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
     </PHP_EXTENSIONS>
   </MOODLE>
   <MOODLE version="1.9">
@@ -167,6 +172,11 @@
           <ON_CHECK message="tokenizerrecommended" />
         </FEEDBACK>
       </PHP_EXTENSION>
+      <PHP_EXTENSION name="xmlrpc" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="xmlrpcrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
     </PHP_EXTENSIONS>
     <CUSTOM_CHECKS>
       <CUSTOM_CHECK file="question/upgrade.php" function="question_check_no_rqp_questions" level="optional">
@@ -229,6 +239,11 @@
           <ON_CHECK message="tokenizerrecommended" />
         </FEEDBACK>
       </PHP_EXTENSION>
+      <PHP_EXTENSION name="xmlrpc" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="xmlrpcrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
     </PHP_EXTENSIONS>
     <CUSTOM_CHECKS>
       <CUSTOM_CHECK file="question/upgrade.php" function="question_check_no_rqp_questions" level="optional">

admin/index.php

@@ -547,8 +547,8 @@
         print_box(get_string("upgrade$CFG->upgrade", "admin", "$CFG->wwwroot/$CFG->admin/upgrade$CFG->upgrade.php"));
     }
 
-    if (ini_get_bool('register_globals') && !ini_get_bool('magic_quotes_gpc')) {
-        print_box(get_string('globalsquoteswarning', 'admin'), 'generalbox adminwarning');
+    if (ini_get_bool('register_globals')) {
+        print_box(get_string('globalswarning', 'admin'), 'generalbox adminwarning');
     }
 
     if (is_dataroot_insecure()) {
@@ -590,7 +590,7 @@
     //////////////////////////////////////////////////////////////////////////////////////////////////
     ////  IT IS ILLEGAL AND A VIOLATION OF THE GPL TO HIDE, REMOVE OR MODIFY THIS COPYRIGHT NOTICE ///
     $copyrighttext = '<a href="http://moodle.org/">Moodle</a> '.
-                     '<a href="http://docs.moodle.org/en/Release">'.$CFG->release.'</a> ('.$CFG->version.')<br />'.
+                     '<a href="http://docs.moodle.org/en/Release" title="'.$CFG->version.'">'.$CFG->release.'</a><br />'.
                      'Copyright &copy; 1999 onwards, Martin Dougiamas<br />'.
                      'and <a href="http://docs.moodle.org/en/Credits">many other contributors</a>.<br />'.
                      '<a href="http://docs.moodle.org/en/License">GNU Public License</a>';

admin/mnet/delete.html

@@ -46,7 +46,7 @@ print_heading(get_string('mnetsettings', 'mnet'));
             </td>
         </tr>
     </table>
-</center>
+</div>
 <?php
 print_footer();
 ?>

admin/mnet/mnet_services.php

@@ -48,7 +48,14 @@
             $publish        = (isset($_POST['publish'][$key]) && $_POST['publish'][$key] == 'on')? 1 : 0;
             $subscribe      = (isset($_POST['subscribe'][$key]) && $_POST['subscribe'][$key] == 'on')? 1 : 0;
 
-            if (false == $host2service && ($publish == 1 || $subscribe == 1)) {
+            if ($publish != 1 && $subscribe != 1) {
+                if (false == $host2service) {
+                    // We don't have or need a record - do nothing!
+                } else {
+                    // We don't need the record - delete it
+                    delete_records('mnet_host2service', 'hostid', $_POST['hostid'], 'serviceid', $key);
+                }
+            } elseif (false == $host2service && ($publish == 1 || $subscribe == 1)) {
                 $host2service = new stdClass();
                 $host2service->hostid = $_POST['hostid'];
                 $host2service->serviceid = $key;

admin/mnet/peers.php

@@ -50,6 +50,11 @@ if (($form = data_submitted()) && confirm_sesskey()) {
     if (!empty($form->wwwroot)) {
         // ensure we remove trailing slashes
         $form->wwwroot = preg_replace(':/$:', '', $form->wwwroot);
+        
+        // ensure the wwwroot starts with a http or https prefix
+        if (strtolower(substr($form->wwwroot, 0, 4)) != 'http') {
+            $form->wwwroot = 'http://'.$form->wwwroot;
+        }
     }
 
     if(!function_exists('xmlrpc_encode_request')) {

admin/module.php

@@ -16,7 +16,7 @@
         }
 
         if ($module != '') {
-            require_once("$CFG->dirroot/mod/$module/lib.php");
+            include_once("$CFG->dirroot/mod/$module/lib.php");
             // if the config.html contains a hidden form field giving
             // the module name then the form does not have to prefix all
             // its variable names, we will do it here.
@@ -43,7 +43,7 @@
 
 /// Otherwise print the form.
     $module = required_param('module', PARAM_SAFEDIR);
-    require_once("$CFG->dirroot/mod/$module/lib.php");
+    include_once("$CFG->dirroot/mod/$module/lib.php");
 
     $strmodulename = get_string("modulename", $module);
 

admin/process_email.php

@@ -54,7 +54,7 @@ if ($modid == '0') { // special
 }
 else {
     $modname = get_field("modules","name","id",$modid);
-    require_once('mod/'.$modname.'/lib.php');
+    include_once('mod/'.$modname.'/lib.php');
 }
 $function = $modname.'_process_email';
 

admin/uploaduser.php

@@ -104,8 +104,6 @@ if ($um->preprocess_files() && confirm_sesskey()) {
             "maildisplay" => 1,
             "htmleditor" => 1,
             "autosubscribe" => 1,
-            "idnumber" => 1,
-            "icq" => 1,
             "course1" => 1,
             "course2" => 1,
             "course3" => 1,

admin/user.php

@@ -203,7 +203,7 @@
         }
     }
     
-    $users = get_users_listing($sort, $dir, $page*$perpage, $perpage, $search, $firstinitial, $lastinitial, $remotewhere);
+    $users = get_users_listing($sort, $dir, $page*$perpage, $perpage, $search, $firstinitial, $lastinitial, $remotewhere, false);
     $usercount = get_users(false);
     $usersearchcount = get_users(false, $search, true, "", "", $firstinitial, $lastinitial);
 

backup/backup_check.html

@@ -58,29 +58,56 @@
 
     }
 
-
     //Here we check if backup_users = None. Then, we switch off every module
     //user info, user_files, logs and exercises, workshop and messages backups. A Warning is showed to
     //inform the user.
+    // TODO: Move this logic to one function to be shared by any (manual, scheduled) backup
     if ($backupprefs->backup_users == 2) {
-        if ($allmods = get_records("modules") ) {
+        if ($allmods = get_records('modules') ) {
             foreach ($allmods as $mod) {
+            /// Reset global user_info settings to "no" (0)
                 $modname = $mod->name;
-                $var = "backup_user_info_".$modname;
+                $var = 'backup_user_info_'.$modname;
                 if (isset($backupprefs->$var)) {
                     $backupprefs->$var = 0;
                 }
-                $var = "backup_".$modname;
-                if (isset($backupprefs->$var)) {
-                    if ($modname == "exercise" || $modname == "workshop") {
+            /// Reset each instance userinfo settings to "no" (0)
+                if (isset($backupprefs->mods[$modname])) {
+                /// Set the module userinfo to no (0)
+                    $backupprefs->mods[$modname]->userinfo = 0;
+                /// Set the instances to no (o)
+                    foreach ($backupprefs->mods[$modname]->instances as $key => $instance) {
+                        $backupprefs->mods[$modname]->instances[$key]->userinfo = 0;
+                        $var = 'backup_user_info_' . $modname . '_instance_' . $key;
                         $backupprefs->$var = 0;
                     }
                 }
+            /// If modules are workshop or exercise, disable their backup completely
+                if ($modname == 'exercise' || $modname == 'workshop') {
+                    $var = 'backup_'.$modname;
+                    if (isset($backupprefs->$var)) {
+                        $backupprefs->$var = 0;
+                    /// Reset each instance backup settings to "no" (0)
+                        if (isset($backupprefs->mods[$modname])) {
+                        /// Set the module backup to no (0)
+                            $backupprefs->mods[$modname]->backup = 0;
+                            $var = 'backup_' . $modname . '_instances';
+                            $backupprefs->$var = 0;
+                        /// Set the instances backup to no (o)
+                            foreach ($backupprefs->mods[$modname]->instances as $key => $instance) {
+                                $backupprefs->mods[$modname]->instances[$key]->backup = 0;
+                                $var = 'backup_' . $modname . '_instance_' . $key;
+                                $backupprefs->$var = 0;
+                            }
+                        }
+                    }
+                }
             }
+        }
         $backupprefs->backup_user_files = 0;
         $backupprefs->backup_logs = 0;
         $backupprefs->backup_messages = 0;
-        }
+
         print_simple_box("<font color=\"red\">".get_string("backupnoneusersinfo")."</font>","center", "70%", '', "20", "noticebox");
         echo "<hr />";
     }

backup/backup_scheduled.php

@@ -387,7 +387,7 @@ function schedule_backup_course_configure($course,$starttime = 0) {
                        }
                        //Now stores all the mods preferences into an array into preferences
                        $preferences->mods[$modname]->backup = $$var;
-                       
+
                        //Check include user info
                        $var = "backup_user_info_".$modname;
                        if (!isset($$var)) {
@@ -401,6 +401,7 @@ function schedule_backup_course_configure($course,$starttime = 0) {
                 }
             }
         }
+
         // now set instances
         if ($coursemods = get_course_mods($course->id)) {
             foreach ($coursemods as $mod) {
@@ -415,8 +416,15 @@ function schedule_backup_course_configure($course,$starttime = 0) {
                 }
             }
         }
+
+        // finally, clean all the $preferences->mods[] not having instances. Nothing to backup about them
+        foreach ($preferences->mods as $modname => $mod) {
+            if (!isset($mod->instances)) {
+                unset($preferences->mods[$modname]);
+            }
+        }
     }
-    
+
     //Convert other parameters
     if ($status) {
         $preferences->backup_metacourse = $backup_config->backup_sche_metacourse;
@@ -429,7 +437,7 @@ function schedule_backup_course_configure($course,$starttime = 0) {
         $preferences->backup_destination = $backup_config->backup_sche_destination;
         $preferences->backup_keep = $backup_config->backup_sche_keep;
     }
-    
+
     //Calculate the backup string
     if ($status) {
         schedule_backup_log($starttime,$course->id,"    calculating backup name");
@@ -474,7 +482,7 @@ function schedule_backup_course_configure($course,$starttime = 0) {
         $keep_name .= moodle_strtolower($backup_shortname)."-";
         //And finally, clean everything
         $keep_name = clean_filename($keep_name);
- 
+
         $preferences->backup_name = $backup_name;
         $preferences->keep_name = $keep_name;
     }
@@ -643,10 +651,10 @@ function schedule_backup_course_execute($preferences,$starttime = 0) {
             schedule_backup_log($starttime,$preferences->backup_course,"      categories & questions");
             $status = backup_question_categories($backup_file,$preferences);
         }
-        
+
         //Print logs if selected
         if ($status) {
-            if ($preferences->backup_logs) {  
+            if ($preferences->backup_logs) {
                 schedule_backup_log($starttime,$preferences->backup_course,"      logs");
                 $status = backup_log_info($backup_file,$preferences);
             }
@@ -657,7 +665,13 @@ function schedule_backup_course_execute($preferences,$starttime = 0) {
             schedule_backup_log($starttime,$preferences->backup_course,"      scales");
             $status = backup_scales_info($backup_file,$preferences);
         }
- 
+
+        //Print groupings info
+        if ($status) {
+            schedule_backup_log($starttime,$preferences->backup_course,"      groupings");
+            $status = backup_groupings_info($backup_file,$preferences);
+        }
+
         //Print groups info
         if ($status) {
             schedule_backup_log($starttime,$preferences->backup_course,"      groups");
@@ -682,9 +696,9 @@ function schedule_backup_course_execute($preferences,$starttime = 0) {
             $mods_to_backup = false;
             //Check if we have any mod to backup
             foreach ($preferences->mods as $module) {
-                if ($module->backup) { 
+                if ($module->backup) {
                     $mods_to_backup = true;
-                }    
+                }
             }
             //If we have to backup some module
             if ($mods_to_backup) {
@@ -703,7 +717,13 @@ function schedule_backup_course_execute($preferences,$starttime = 0) {
             }
         }
 
-        //Prints course end 
+        //Backup course format data, if any.
+        if ($status) {
+            schedule_backup_log($starttime,$preferences->backup_course,"      course format data");
+            $status = backup_format_data($backup_file,$preferences);
+        }
+
+        //Prints course end
         if ($status) {
             $status = backup_course_end($backup_file,$preferences);
         }
@@ -713,7 +733,7 @@ function schedule_backup_course_execute($preferences,$starttime = 0) {
             backup_close_xml($backup_file);
         }
     }
-    
+
     //Now, if selected, copy user files
     if ($status) {
         if ($preferences->backup_user_files) {

backup/backuplib.php

@@ -2,82 +2,78 @@
     //This file contains all the function needed in the backup utility
     //except the mod-related funtions that are into every backuplib.php inside
     //every mod directory
- 
-    //Calculate the number of users to backup and put their ids in backup_ids
-    //Return an array of info (name,value)
-    function user_check_backup($course,$backup_unique_code,$backup_users,$backup_messages) {
-        //$backup_users=0-->all
-        //              1-->course (needed + enrolled)
-        //              2-->none
 
-        global $CFG;
-        global $db;
+    /**
+     * This function calculates the users to be added to backup based in the
+     * settings defined at backup. All the resulting user ids are sent to
+     * backup_ids for later usage.
+     * @param int $courseid id of the course to backup
+     * @param int $backup_unique_code unique code of the backup being executed
+     * @param int $backup_unique_code setting specifying what users to export (0=all, 1=needed, 2=none)
+     * @param int $backup_messages flag (true/false) defining if messages must be
+     *                             considered to extract needed users
+     * @return array one array (key, value) sumarizing the result of the function (number of users)
+     */
+    function user_check_backup($courseid,$backup_unique_code,$backup_users,$backup_messages) {
 
-        $context = get_context_instance(CONTEXT_COURSE, $course);
+        $context = get_context_instance(CONTEXT_COURSE, $courseid);
         $count_users = 0;
+        $backupable_users = array();
 
-        //If we've selected none, simply return 0
-        if ($backup_users == 0 or $backup_users == 1) {
-        
-            //Calculate needed users (calling every xxxx_get_participants function + scales users)
-            $needed_users = backup_get_needed_users($course, $backup_messages);
+        if ($backup_users == 0) { /// All users
+            $backupable_users = backup_get_all_users();
 
-            //Calculate enrolled users (students + teachers)
-            $enrolled_users = backup_get_enrolled_users($course);
+        } else if ($backup_users == 1) { /// Needed users
 
-            //Calculate all users (every record in users table)
-            $all_users = backup_get_all_users();
+        /// Calculate needed users (calling every xxxx_get_participants function + scales users)
+            $needed_users = backup_get_needed_users($courseid, $backup_messages);
 
-            //Calculate course users (needed + enrolled)
-            //First, needed
-            $course_users = $needed_users;
-        
-            //Now, enrolled
+        /// Calculate enrolled users (having course:view cap)
+            $enrolled_users = backup_get_enrolled_users($courseid);
+
+        /// Calculate backupable users (needed + enrolled)
+        /// First, needed
+            $backupable_users = $needed_users;
+
+        /// Now, enrolled
             if ($enrolled_users) {
                 foreach ($enrolled_users as $enrolled_user) {
-                    $course_users[$enrolled_user->id]->id = $enrolled_user->id; 
+                    $backupable_users[$enrolled_user->id]->id = $enrolled_user->id;
                 }
             }
-       
-            //Now, depending of parameters, create $backupable_users
-            if ($backup_users == 0) {
-                $backupable_users = $all_users;
-            } else {
-                $backupable_users = $course_users;
-            }
-
-            //If we have backupable users
-            if ($backupable_users) {
-                //Iterate over users putting their roles
-                foreach ($backupable_users as $backupable_user) {
-                    $backupable_user->info = "";
-                                     
-                    //Is needed user (exists in needed_users) 
-                    if (isset($needed_users[$backupable_user->id])) {
-                        $backupable_user->info .= "needed";
-                    } else if (isset($course_users[$backupable_user->id])) {
-                        $backupable_user->info .= "needed"; 
-                    }   // Yu: also needed because they can view course
-                        // might need another variable
-                                        
-                    //Now create the backup_id record
-                    $backupids_rec->backup_code = $backup_unique_code;
-                    $backupids_rec->table_name = "user";
-                    $backupids_rec->old_id = $backupable_user->id;
-                    $backupids_rec->info = $backupable_user->info;
-        
-                    //Insert the record id. backup_users decide it.
-                    //When all users
-                    $status = insert_record('backup_ids', $backupids_rec, false);
-                    $count_users++;
-                }
-                //Do some output     
-                backup_flush(30);
-            }
         }
 
-        //Prepare Info
-        //Gets the user data
+    /// If we have backupable users
+        if ($backupable_users) {
+        /// Iterate over users putting their roles
+            foreach ($backupable_users as $backupable_user) {
+                $backupable_user->info = "";
+
+            /// Is needed user or enrolled user, mark it as needed
+                if (isset($needed_users[$backupable_user->id]) || isset($enrolled_users[$backupable_user->id])) {
+                    $backupable_user->info .= "needed";
+                }   ///  Yu: also needed because they can view course
+                    /// might need another variable
+
+            /// Now create the backup_id record
+                $backupids_rec->backup_code = $backup_unique_code;
+                $backupids_rec->table_name = "user";
+                $backupids_rec->old_id = $backupable_user->id;
+                $backupids_rec->info = $backupable_user->info;
+
+            /// TODO: Change this call inserting to a standard backup_putid() call
+            /// And read data acordingly with backup_getid() when needed.
+            /// TODO: Also analyse it the "needed" info is really needed for anything. Drop if not.
+            /// Insert the user to the backup_ids table. backup_user_info() will use that info
+                $status = insert_record('backup_ids', $backupids_rec, false);
+                $count_users++;
+            }
+        /// Do some output
+            backup_flush(30);
+        }
+
+      /// Prepare Info
+      /// Gets the user data
         $info[0][0] = get_string("users");
         $info[0][1] = $count_users;
 
@@ -667,7 +663,7 @@
             /// write local course overrides here?
             write_role_overrides_xml($bf, $context, 3);
             /// write role_assign code here
-            write_role_assignments_xml($bf, $context, 3);
+            write_role_assignments_xml($bf, $preferences, $context, 3);
             //Print header end
             fwrite ($bf,end_tag("HEADER",2,true));
         } else { 
@@ -918,7 +914,7 @@
                         $context = get_context_instance(CONTEXT_BLOCK, $instance->id);
                         write_role_overrides_xml($bf, $context, 4);
                         /// write role_assign code here
-                        write_role_assignments_xml($bf, $context, 4);
+                        write_role_assignments_xml($bf, $preferences, $context, 4);
                         //End Block
                         fwrite ($bf,end_tag('BLOCK',3,true));
                     }
@@ -1054,9 +1050,9 @@
                // get all the role_capabilities overrides in this mod
                write_role_overrides_xml($bf, $context, 6);
                 /// write role_assign code here
-               write_role_assignments_xml($bf, $context, 6);         
+               write_role_assignments_xml($bf, $preferences, $context, 6);
                 /// write role_assign code here
-               
+
                fwrite ($bf,end_tag("MOD",5,true));
            }
            //check for next
@@ -1151,26 +1147,10 @@
                 /// write assign/override code for context_userid
 
                 $user->isneeded = strpos($user->info,"needed");
-                //Output every user role (with its associated info) 
-                /*
-                $user->isadmin = strpos($user->info,"admin");
-                $user->iscoursecreator = strpos($user->info,"coursecreator");
-                $user->isteacher = strpos($user->info,"teacher");
-                $user->isstudent = strpos($user->info,"student");
-                
-                
-                if ($user->isadmin!==false or 
-                    $user->iscoursecreator!==false or 
-                    $user->isteacher!==false or 
-                    $user->isstudent!==false or
-                    $user->isneeded!==false) {
-                */
+
                 fwrite ($bf,start_tag("ROLES",4,true));
                 if ($user->info != "needed" && $user->info!="") {
-                    //Begin ROLES tag
-                    
                     //PRINT ROLE INFO
-                    //Admins
                     $roles = explode(",", $user->info);
                     foreach ($roles as $role) {
                         if ($role!="" && $role!="needed") {
@@ -1178,66 +1158,10 @@
                             //Print Role info
                             fwrite ($bf,full_tag("TYPE",6,false,$role));
                             //Print ROLE end
-                            fwrite ($bf,end_tag("ROLE",5,true)); 
-                        }  
+                            fwrite ($bf,end_tag("ROLE",5,true));
+                        }
                     }
                 }
-                    /*
-                    if ($user->isadmin!==false) {
-                        //Print ROLE start
-                        fwrite ($bf,start_tag("ROLE",5,true));
-                        //Print Role info
-                        fwrite ($bf,full_tag("TYPE",6,false,"admin"));
-                        //Print ROLE end
-                        fwrite ($bf,end_tag("ROLE",5,true));
-                    }
-                    //CourseCreator
-                    if ($user->iscoursecreator!==false) {
-                        //Print ROLE start 
-                        fwrite ($bf,start_tag("ROLE",5,true)); 
-                        //Print Role info 
-                        fwrite ($bf,full_tag("TYPE",6,false,"coursecreator"));
-                        //Print ROLE end
-                        fwrite ($bf,end_tag("ROLE",5,true));   
-                    }
-                    //Teacher
-                    if ($user->isteacher!==false) {
-                        //Print ROLE start 
-                        fwrite ($bf,start_tag("ROLE",5,true)); 
-                        //Print Role info 
-                        fwrite ($bf,full_tag("TYPE",6,false,"teacher"));
-                        //Get specific info for teachers
-                        $tea = get_record("user_teachers","userid",$user->old_id,"course",$preferences->backup_course);
-                        fwrite ($bf,full_tag("AUTHORITY",6,false,$tea->authority));
-                        fwrite ($bf,full_tag("TEA_ROLE",6,false,$tea->role));
-                        fwrite ($bf,full_tag("EDITALL",6,false,$tea->editall));
-                        fwrite ($bf,full_tag("TIMESTART",6,false,$tea->timestart));
-                        fwrite ($bf,full_tag("TIMEEND",6,false,$tea->timeend));
-                        fwrite ($bf,full_tag("TIMEMODIFIED",6,false,$tea->timemodified));
-                        fwrite ($bf,full_tag("TIMEACCESS",6,false,$tea->timeaccess));
-                        fwrite ($bf,full_tag("ENROL",6,false,$tea->enrol));
-                        //Print ROLE end
-                        fwrite ($bf,end_tag("ROLE",5,true));   
-                    }
-                    //Student
-                    if ($user->isstudent!==false) {
-                        //Print ROLE start 
-                        fwrite ($bf,start_tag("ROLE",5,true)); 
-                        //Print Role info 
-                        fwrite ($bf,full_tag("TYPE",6,false,"student"));
-                        //Get specific info for students
-                        $stu = get_record("user_students","userid",$user->old_id,"course",$preferences->backup_course);
-                        fwrite ($bf,full_tag("TIMESTART",6,false,$stu->timestart));
-                        fwrite ($bf,full_tag("TIMEEND",6,false,$stu->timeend));
-                        fwrite ($bf,full_tag("TIME",6,false,$stu->time));
-                        fwrite ($bf,full_tag("TIMEACCESS",6,false,$stu->timeaccess));
-                        fwrite ($bf,full_tag("ENROL",6,false,$stu->enrol));
-                        //Print ROLE end
-                        fwrite ($bf,end_tag("ROLE",5,true));   
-                    }*/
-                    
-                    
-                    
                     //Needed
                 if ($user->isneeded!==false) {
                     //Print ROLE start
@@ -1270,7 +1194,7 @@
                     
                 write_role_overrides_xml($bf, $context, 4);
                 /// write role_assign code here
-                write_role_assignments_xml($bf, $context, 4);
+                write_role_assignments_xml($bf, $preferences, $context, 4);
               //End User tag
                 fwrite ($bf,end_tag("USER",3,true));
                 //Do some output
@@ -1698,9 +1622,14 @@
         
         $status = true;
 
-        //Get groups_members
-        $groups_members = groups_get_member_records($groupid);
-        
+        //Get groups_members that are being included in backup
+        $groups_members = get_records_sql("SELECT gm.*
+                                           FROM {$CFG->prefix}groups_members gm,
+                                                {$CFG->prefix}backup_ids bi
+                                           WHERE gm.groupid = $groupid
+                                             AND bi.backup_code = $preferences->backup_unique_code
+                                             AND bi.table_name = 'user'");
+
         //Pring groups_members header
         if ($groups_members) {
             //Pring groups_members header
@@ -2303,40 +2232,43 @@
         }
         fwrite ($bf, end_tag("ROLES_OVERRIDES", $startlevel, true));
     }
-    
+
     /* function to print xml for assignment */
-    function write_role_assignments_xml($bf, $context, $startlevel) {
+    function write_role_assignments_xml($bf, $preferences, $context, $startlevel) {
      /// write role_assign code here
         fwrite ($bf, start_tag("ROLES_ASSIGNMENTS", $startlevel, true));
-        
+
         if ($roles = get_roles_with_assignment_on_context($context)) {
-            foreach ($roles as $role) {          
+            foreach ($roles as $role) {
                 fwrite ($bf, start_tag("ROLE", $startlevel+1, true));
                 fwrite ($bf, full_tag("ID", $startlevel+2, false, $role->id));
                 fwrite ($bf, full_tag("NAME", $startlevel+2, false, $role->name));
-                fwrite ($bf, full_tag("SHORTNAME", $startlevel+2, false, $role->shortname)); 
+                fwrite ($bf, full_tag("SHORTNAME", $startlevel+2, false, $role->shortname));
                 fwrite ($bf, start_tag("ASSIGNMENTS", $startlevel+2, true));
                 if ($assignments = get_users_from_role_on_context($role, $context)) {
                     foreach ($assignments as $assignment) {
-                        fwrite ($bf, start_tag("ASSIGNMENT", $startlevel+3, true));
-                        fwrite ($bf, full_tag("USERID", $startlevel+4, false, $assignment->userid));
-                        fwrite ($bf, full_tag("HIDDEN", $startlevel+4, false, $assignment->hidden));
-                        fwrite ($bf, full_tag("TIMESTART", $startlevel+4, false, $assignment->timestart));
-                        fwrite ($bf, full_tag("TIMEEND", $startlevel+4, false, $assignment->timeend));
-                        fwrite ($bf, full_tag("TIMEMODIFIED", $startlevel+4, false, $assignment->timemodified));
-                        if (!isset($assignment->modifierid)) {
-                            $assignment->modifierid = 0;  
+                    /// Role assignments are only sent to backup if the user is one target user
+                        if (backup_getid($preferences->backup_unique_code, 'user', $assignment->userid)) {
+                            fwrite ($bf, start_tag("ASSIGNMENT", $startlevel+3, true));
+                            fwrite ($bf, full_tag("USERID", $startlevel+4, false, $assignment->userid));
+                            fwrite ($bf, full_tag("HIDDEN", $startlevel+4, false, $assignment->hidden));
+                            fwrite ($bf, full_tag("TIMESTART", $startlevel+4, false, $assignment->timestart));
+                            fwrite ($bf, full_tag("TIMEEND", $startlevel+4, false, $assignment->timeend));
+                            fwrite ($bf, full_tag("TIMEMODIFIED", $startlevel+4, false, $assignment->timemodified));
+                            if (!isset($assignment->modifierid)) {
+                                $assignment->modifierid = 0;
+                            }
+                            fwrite ($bf, full_tag("MODIFIERID", $startlevel+4, false, $assignment->modifierid));
+                            fwrite ($bf, full_tag("ENROL", $startlevel+4, false, $assignment->enrol));
+                            fwrite ($bf, full_tag("SORTORDER", $startlevel+4, false, $assignment->sortorder));
+                            fwrite ($bf, end_tag("ASSIGNMENT", $startlevel+3, true));
                         }
-                        fwrite ($bf, full_tag("MODIFIERID", $startlevel+4, false, $assignment->modifierid));
-                        fwrite ($bf, full_tag("ENROL", $startlevel+4, false, $assignment->enrol));
-                        fwrite ($bf, full_tag("SORTORDER", $startlevel+4, false, $assignment->sortorder));
-                        fwrite ($bf, end_tag("ASSIGNMENT", $startlevel+3, true));     
-                    }     
+                    }
                 }
                 fwrite ($bf, end_tag("ASSIGNMENTS", $startlevel+2, true));
-                fwrite ($bf, end_tag("ROLE", $startlevel+1, true));   
-            }  
-        }   
-        fwrite ($bf, end_tag("ROLES_ASSIGNMENTS", $startlevel, true));     
+                fwrite ($bf, end_tag("ROLE", $startlevel+1, true));
+            }
+        }
+        fwrite ($bf, end_tag("ROLES_ASSIGNMENTS", $startlevel, true));
     }
 ?>

backup/restorelib.php

@@ -800,6 +800,11 @@
                         continue;
                     }
                     $getid = backup_getid($restore->backup_unique_code, $parts[1], $instance->pageid);
+
+                    if (empty($getid->new_id)) {
+                        // Failed, perhaps the module was not included in the restore  MDL-13554
+                        continue;
+                    }
                     $instance->pageid = $getid->new_id;
                 }
                 else {
@@ -1508,6 +1513,8 @@
 
             $languages = get_list_of_languages();
 
+        /// Iterate over all users loaded from xml
+            $counter = 0;
             foreach ($info->users as $userid) {
                 $rec = backup_getid($restore->backup_unique_code,"user",$userid);
                 $user = $rec->info;
@@ -1525,6 +1532,18 @@
                     $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];
+                }
 
                 //If language does not exist here - use site default
                 if (!array_key_exists($user->lang, $languages)) {
@@ -1599,7 +1618,8 @@
                     // relink the descriptions
                     $user->description = restore_decode_absolute_links($user->description);
 
-                    if (!empty($CFG->disableuserimages)) {
+                /// Disable pictures based on global setting of existing empty value (old backups can contain wrong empties)
+                    if (!empty($CFG->disableuserimages) || empty($user->picture)) {
                         $user->picture = 0;
                     }
 
@@ -1774,9 +1794,20 @@
                         }
                     }
                 }
-            }
+                //Do some output
+                $counter++;
+                if ($counter % 10 == 0) {
+                    if (!defined('RESTORE_SILENTLY')) {
+                        echo ".";
+                        if ($counter % 200 == 0) {
+                            echo "<br />";
+                        }
+                    }
+                    backup_flush(300);
+                }
+            } /// End of loop over all the users loaded from xml
         }
-        
+
         return $status;
     }
 
@@ -5650,6 +5681,11 @@
             $info = restore_read_xml_info ($xml_file);
             //Reading course_header from file
             $course_header = restore_read_xml_course_header ($xml_file);
+
+            if(!is_object($course_header)){
+                // ensure we fail if there is no course header
+                $course_header = false;
+            }
         }
         
         if (!defined('RESTORE_SILENTLY')) {
@@ -6780,7 +6816,7 @@
         foreach ($overrides as $override) {            
             $override->capability = $override->name;
             $oldmodifier = backup_getid($restore->backup_unique_code,"user",$override->modifierid);
-            $override->modifierid = $oldmodifier->new_id?$oldmodifier->new_id:0; // new modifier id here
+            $override->modifierid = !empty($oldmodifier->new_id)?$oldmodifier->new_id:0; // new modifier id here
             $override->roleid = $role->new_id; // restored new role id
             
             // hack to make the correct contextid for course level imports

blocks/admin_tree/block_admin_tree.php

@@ -41,7 +41,8 @@ class block_admin_tree extends block_base {
             $this->tempcontent .= "   ";
         }
         $this->tempcontent .= '<a href="#" onclick="toggle(\'vh_span'. $this->spancounter .'\');return false">';
-        $this->tempcontent .= '<span id="vh_span' . $this->spancounter . 'indicator"><img src="' . $CFG->wwwroot . '/blocks/admin_tree/open.gif" alt="'.$strfolderopened.'" /></span> ';
+        $this->tempcontent .= '<span id="vh_span' . $this->spancounter . 'indicator"><img src="' . $CFG->pixpath . '/i/open.gif" alt="'.$strfolderopened.'" /></span> ';
+        
         $this->tempcontent .= $visiblename . '</a><br /><span id="vh_span' . $this->spancounter . '">' . "\n";
         $this->currentdepth++;
         $this->spancounter++;
@@ -66,12 +67,12 @@ class block_admin_tree extends block_base {
         if (is_a($content, 'admin_settingpage')) {
             if ($content->check_access() and !$content->is_hidden()) {
                 $class = ($content->name == $this->section) ? 'link current' : 'link';
-                $this->create_item($content->visiblename,$CFG->wwwroot.'/'.$CFG->admin.'/settings.php?section=' . $content->name,$CFG->wwwroot .'/blocks/admin_tree/item.gif', $class);
+                $this->create_item($content->visiblename,$CFG->wwwroot.'/'.$CFG->admin.'/settings.php?section=' . $content->name,$CFG->pixpath .'/i/item.gif', $class);
             }
         } else if (is_a($content, 'admin_externalpage')) {
             if ($content->check_access() and !$content->is_hidden()) {
                 $class = ($content->name == $this->section) ? 'link current' : 'link';
-                $this->create_item($content->visiblename, $content->url, $CFG->wwwroot . '/blocks/admin_tree/item.gif', $class);
+                $this->create_item($content->visiblename, $content->url, $CFG->pixpath . '/i/item.gif', $class);
             }
         } else if (is_a($content, 'admin_category')) {
             if ($content->check_access() and !$content->is_hidden()) {
@@ -144,11 +145,11 @@ class block_admin_tree extends block_base {
             $this->content->text .= 'function toggle(spanid) {' . "\n";
             $this->content->text .= '  if (getspan(spanid).innerHTML == "") {' . "\n";
             $this->content->text .= '    getspan(spanid).innerHTML = vh_content[spanid];' . "\n";
-            $this->content->text .= '    getspan(spanid + "indicator").innerHTML = \'<img src="' . $CFG->wwwroot . '/blocks/admin_tree/open.gif" alt="'.$strfolderopened.'" />\';' . "\n";
+            $this->content->text .= '    getspan(spanid + "indicator").innerHTML = \'<img src="' . $CFG->pixpath . '/i/open.gif" alt="'.$strfolderopened.'" />\';' . "\n";
             $this->content->text .= '  } else {' . "\n";
             $this->content->text .= '    vh_content[spanid] = getspan(spanid).innerHTML;' . "\n";
             $this->content->text .= '    getspan(spanid).innerHTML = "";' . "\n";
-            $this->content->text .= '    getspan(spanid + "indicator").innerHTML = \'<img src="' . $CFG->wwwroot . '/blocks/admin_tree/closed.gif" alt="'.$strfolderclosed.'" />\';' . "\n";
+            $this->content->text .= '    getspan(spanid + "indicator").innerHTML = \'<img src="' . $CFG->pixpath . '/i/closed.gif" alt="'.$strfolderclosed.'" />\';' . "\n";
             $this->content->text .= '  }' . "\n";
             $this->content->text .= '}' . "\n";
 
@@ -156,13 +157,13 @@ class block_admin_tree extends block_base {
             $this->content->text .= '  if (getspan(spanid).innerHTML !== "") {' . "\n";
             $this->content->text .= '    vh_content[spanid] = getspan(spanid).innerHTML;' . "\n";
             $this->content->text .= '    getspan(spanid).innerHTML = "";' . "\n";
-            $this->content->text .= '    getspan(spanid + "indicator").innerHTML = \'<img src="' . $CFG->wwwroot . '/blocks/admin_tree/closed.gif" alt="'.$strfolderclosed.'" />\';' . "\n";
+            $this->content->text .= '    getspan(spanid + "indicator").innerHTML = \'<img src="' . $CFG->pixpath . '/i/closed.gif" alt="'.$strfolderclosed.'" />\';' . "\n";
             $this->content->text .= '  }' . "\n";
             $this->content->text .= '}' . "\n";
 
             $this->content->text .= 'function expand(spanid) {' . "\n";
             $this->content->text .= '  getspan(spanid).innerHTML = vh_content[spanid];' . "\n";
-            $this->content->text .= '  getspan(spanid + "indicator").innerHTML = \'<img src="' . $CFG->wwwroot . '/blocks/admin_tree/open.gif" alt="'.$strfolderopened.'" />\';' . "\n";
+            $this->content->text .= '  getspan(spanid + "indicator").innerHTML = \'<img src="' . $CFG->pixpath . '/i/open.gif" alt="'.$strfolderopened.'" />\';' . "\n";
             $this->content->text .= '}' . "\n";
 
             $this->content->text .= 'function expandall() {' . "\n";

blocks/participants/block_participants.php

@@ -8,7 +8,7 @@ class block_participants extends block_list {
 
     function get_content() {
 
-        global $CFG;
+        global $CFG, $COURSE;
 
         if (empty($this->instance)) {
             $this->content = '';
@@ -20,7 +20,8 @@ class block_participants extends block_list {
             return '';
         }
 
-        if (!$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
+        if (!$currentcontext = get_context_instance(CONTEXT_COURSE, $COURSE->id)) {
             $this->content = '';
             return $this->content;
         }

blocks/search/block_search.php

@@ -1,14 +1,17 @@
 <?php
   
   /* This is the global search shortcut block - a single query can be entered, and
-     the user will be redirected to the query page where they can enter more
-     advanced queries, and view the results of their search. When searching from
-     this block, the broadest possible selection of documents is searched.
-     
-     Author:  Michael Champanis (mchampan)
-     Date:    2006 06 25
-  
-     Todo: make strings -> get_string()  
+  * the user will be redirected to the query page where they can enter more
+  *  advanced queries, and view the results of their search. When searching from
+  *  this block, the broadest possible selection of documents is searched.
+  *  
+  *
+  *  Todo: make strings -> get_string()  
+  * 
+  * @package search
+  * @subpackage search block
+  * @author: Michael Champanis (mchampan), reengineered by Valery Fremaux 
+  * @date: 2006 06 25
   */
      
   class block_search extends block_base {
@@ -16,7 +19,7 @@
     function init() {
       $this->title = get_string('blockname', 'block_search');
       $this->cron = 1;
-      $this->version = 2007081100;
+      $this->version = 2008031500;
     } //init  
     
     // only one instance of this block is required

blocks/search/config_global.html

@@ -55,6 +55,20 @@
             } ?>"/><br/><br/>
         </td>
     </tr>
+    <tr>
+        <td valign="top" align="right">
+            <b><?php print_string('usemoodleroot', 'block_search') ?>:</b>
+        </td>
+        <td valign="top" align="left">
+        <?php 
+            $usemoodleroot = (isset($CFG->block_search_usemoodleroot)) ? 'checked="checked"' : '' ; 
+            $notusemoodleroot = (!isset($CFG->block_search_usemoodleroot)) ? 'checked="checked"' : '' ; 
+        ?>
+          <input id="block_search_usemoodleroot" type="radio" name="block_search_usemoodleroot" <?php echo $usemoodleroot ?> value="1"/> <?php print_string('yes') ?> - 
+          <input id="block_search_usemoodleroot" type="radio" name="block_search_usemoodleroot" <?php echo $notusemoodleroot ?> value="0"/> <?php print_string('no') ?> 
+          <br/><br/>
+        </td>
+    </tr>
     <tr>
         <td valign="top" align="right">
             <b><?php print_string('configpdftotextcmd', 'block_search') ?>:</b>

course/lib.php

@@ -973,7 +973,7 @@ function print_overview($courses) {
     if ($modules = get_records('modules')) {
         foreach ($modules as $mod) {
             if (file_exists(dirname(dirname(__FILE__)).'/mod/'.$mod->name.'/lib.php')) {
-                require_once(dirname(dirname(__FILE__)).'/mod/'.$mod->name.'/lib.php');
+                include_once(dirname(dirname(__FILE__)).'/mod/'.$mod->name.'/lib.php');
                 $fname = $mod->name.'_print_overview';
                 if (function_exists($fname)) {
                     $fname($courses,$htmlarray);
@@ -1490,7 +1490,7 @@ function print_section_add_menus($course, $section, $modnames, $vertical=false,
                 continue;
             }
 
-            require_once("$CFG->dirroot/mod/$modname/lib.php");
+            include_once("$CFG->dirroot/mod/$modname/lib.php");
             $gettypesfunc =  $modname.'_get_types';
             if (function_exists($gettypesfunc)) {
                 $types = $gettypesfunc();
@@ -1942,15 +1942,15 @@ function print_course_search($value="", $return=false, $format="plain") {
     } else if ($format == 'short') {
         $output  = '<form id="'.$id.'" action="'.$CFG->wwwroot.'/course/search.php" method="get">';
         $output .= '<fieldset class="coursesearchbox invisiblefieldset">';
-        $output .= '<label for="coursesearchbox">'.$strsearchcourses.': </label>';
-        $output .= '<input type="text" id="coursesearchbox" size="12" name="search" alt="'.s($strsearchcourses).'" value="'.s($value, true).'" />';
+        $output .= '<label for="shortsearchbox">'.$strsearchcourses.': </label>';
+        $output .= '<input type="text" id="shortsearchbox" size="12" name="search" alt="'.s($strsearchcourses).'" value="'.s($value, true).'" />';
         $output .= '<input type="submit" value="'.get_string('go').'" />';
         $output .= '</fieldset></form>';
     } else if ($format == 'navbar') {
         $output  = '<form id="coursesearchnavbar" action="'.$CFG->wwwroot.'/course/search.php" method="get">';
         $output .= '<fieldset class="coursesearchbox invisiblefieldset">';
-        $output .= '<label for="coursesearchbox">'.$strsearchcourses.': </label>';
-        $output .= '<input type="text" id="coursesearchbox" size="20" name="search" alt="'.s($strsearchcourses).'" value="'.s($value, true).'" />';
+        $output .= '<label for="navsearchbox">'.$strsearchcourses.': </label>';
+        $output .= '<input type="text" id="navsearchbox" size="20" name="search" alt="'.s($strsearchcourses).'" value="'.s($value, true).'" />';
         $output .= '<input type="submit" value="'.get_string('go').'" />';
         $output .= '</fieldset></form>';
     }

course/modedit.php

@@ -269,8 +269,12 @@
         }
 
         rebuild_course_cache($course->id);
-
-        redirect("$CFG->wwwroot/mod/$module->name/view.php?id=$fromform->coursemodule");
+        
+        if (isset($fromform->submitbutton)) { 
+            redirect("$CFG->wwwroot/mod/$module->name/view.php?id=$fromform->coursemodule");
+        } else {
+            redirect("$CFG->wwwroot/course/view.php?id=$course->id");
+        }
         exit;
 
     } else {

course/moodleform_mod.php

@@ -2,7 +2,7 @@
 require_once ($CFG->libdir.'/formslib.php');
 /**
  * This class adds extra methods to form wrapper specific to be used for module
- * add / update forms (mod/{modname}.mod_form.php replaces deprecared mod/{modname}/mod.html
+ * add / update forms (mod/{modname}.mod_form.php replaces deprecated mod/{modname}/mod.html
  *
  */
 class moodleform_mod extends moodleform {
@@ -150,6 +150,39 @@ class moodleform_mod extends moodleform {
         return array('visible'=>$visible);
     }
 
+	/**
+     * Overriding formslib's add_action_buttons() method, to add an extra submit "save changes and return" button.
+     * 
+     * @param bool $cancel
+     * @param string $submitlabel
+     * @param string $submit2label
+     * @return void
+     */ 
+    function add_action_buttons($cancel=true, $submitlabel=null, $submit2label=null) {
+        if (is_null($submitlabel)) {
+            $submitlabel = get_string('savechangesanddisplay');
+        }
+        
+        if (is_null($submit2label)) {
+            $submit2label = get_string('savechangesandreturntocourse');
+        }
+        
+        $mform =& $this->_form;
+        
+        //when two elements we need a group
+        $buttonarray=array();
+        $buttonarray[] = &$mform->createElement('submit', 'submitbutton', $submitlabel);
+        $buttonarray[] = &$mform->createElement('submit', 'submitbutton2', $submit2label);
+        
+        if ($cancel) {
+            $buttonarray[] = &$mform->createElement('cancel');
+        }
+
+        $mform->addGroup($buttonarray, 'buttonar', '', array(' '), false);
+        $mform->setType('buttonar', PARAM_RAW);
+        $mform->closeHeaderBefore('buttonar');
+    }
+
 }
 
-?>
+?>

course/report/participation/index.php

@@ -154,7 +154,7 @@
     $module = get_record('modules','id',$moduleid);
     $modulename = get_string('modulename',$module->name);
 
-    require_once($CFG->dirroot.'/mod/'.$module->name.'/lib.php');
+    include_once($CFG->dirroot.'/mod/'.$module->name.'/lib.php');
 
     $viewfun = $module->name.'_get_view_actions';
     $postfun = $module->name.'_get_post_actions';

course/rest.php

@@ -83,6 +83,7 @@ switch($_SERVER['REQUEST_METHOD']) {
                         move_section($course, $id, $value);
                         break;
                 }
+                rebuild_course_cache($course->id);
                 break;
 
             case 'resource':
@@ -130,6 +131,7 @@ switch($_SERVER['REQUEST_METHOD']) {
                         moveto_module($mod, $section, $beforemod);
                         break;
                 }
+                rebuild_course_cache($course->id);
                 break;
         
             case 'course': 

enrol/authorize/authorizenetlib.php

@@ -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 " .

enrol/authorize/config_form.php

@@ -69,18 +69,6 @@ if (!isset($frm->acceptechecktypes)) {
     </td>
 </tr>
 
-<?php if (substr($CFG->wwwroot, 0, 5) !== 'https') { /* https && loginhttps */ ?>
-<tr valign="top">
-    <td align="right">loginhttps:</td>
-    <td><?php
-          echo (empty($CFG->loginhttps) ? "<span style=\"color:red\"><b>off</b></span>" : "<font color=\"green\">on</font>");
-          $a->url = "$CFG->wwwroot/$CFG->admin/settings.php?section=httpsecurity";
-          echo '<br />'; print_string("logindesc", "enrol_authorize", $a);
-        ?>
-    </td>
-</tr>
-<?php } /* end: https && loginhttps */ ?>
-
 <tr valign="top"><td colspan="2"><h4><?php print_string("adminauthorizesettings", "enrol_authorize") ?></h4></td></tr>
 
 <tr valign="top">
@@ -130,7 +118,7 @@ if (!isset($frm->acceptechecktypes)) {
 <tr valign="top">
     <td align="right">an_authcode:</td>
     <td><?php print_checkbox('an_authcode', '1', !empty($frm->an_authcode)) ?>
-        <?php helpbutton('authcode', '', 'enrol/authorize'); ?><br />
+        <?php helpbutton('authcode', 'authcode', 'enrol/authorize'); ?><br />
         <?php print_string("adminauthcode", "enrol_authorize") ?></td>
 </tr>
 
@@ -148,7 +136,7 @@ if (!isset($frm->acceptechecktypes)) {
     foreach ($allpaymentmethods as $key) {
         if ($key == AN_METHOD_CC) {
             print_checkbox('acceptmethods[]', AN_METHOD_CC, in_array(AN_METHOD_CC, $paymentmethodsenabled), get_string('method'.AN_METHOD_CC,'enrol_authorize'));
-            echo("<ul>"); // blockquote breaks <span> and <br> tags 
+            echo("<ul>"); // blockquote breaks <span> and <br> tags
             $acceptedccs = array_keys(get_list_of_creditcards());
             $allccs = get_list_of_creditcards(true);
             foreach ($allccs as $key => $val) {
@@ -160,7 +148,7 @@ if (!isset($frm->acceptechecktypes)) {
         }
         elseif ($key == AN_METHOD_ECHECK) {
             print_checkbox('acceptmethods[]', AN_METHOD_ECHECK, in_array(AN_METHOD_ECHECK, $paymentmethodsenabled), get_string('method'.AN_METHOD_ECHECK,'enrol_authorize'));
-            echo("<ul>"); // blockquote breaks <span> and <br> tags 
+            echo("<ul>"); // blockquote breaks <span> and <br> tags
             $echecktypesenabled = get_list_of_bank_account_types();
             $allechecktypes = get_list_of_bank_account_types(true);
             foreach ($allechecktypes as $key) {
@@ -175,7 +163,7 @@ if (!isset($frm->acceptechecktypes)) {
 </tr>
 
 <tr valign="top"><td colspan="2"><h4><?php print_string("adminauthorizeccapture", "enrol_authorize") ?>
-                                     <?php helpbutton('orderreview', '', 'enrol/authorize'); ?>
+                                     <?php helpbutton('orderreview', 'orderreview', 'enrol/authorize'); ?>
                                  </h4></td></tr>
 
 <tr valign="top">

enrol/authorize/db/mysql.php

@@ -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 = '" .

enrol/authorize/db/postgres7.php

@@ -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 = '" .

enrol/authorize/enrol.php

@@ -96,7 +96,6 @@ class enrolment_plugin_authorize
 
         if ($course->password) {
             $password = '';
-            $teacher = get_teacher($course->id);
             include($CFG->dirroot.'/enrol/manual/enrol.html');
         }
 
@@ -219,7 +218,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;
@@ -242,7 +241,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);
                 }
@@ -252,7 +251,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);
             }
@@ -414,7 +413,7 @@ class enrolment_plugin_authorize
         global $CFG;
         $mconfig = get_config('enrol/authorize');
 
-        if (! check_openssl_loaded()) {
+        if (!check_openssl_loaded()) {
             notify('PHP must be compiled with SSL support (--with-openssl)');
         }
 
@@ -437,13 +436,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;
@@ -512,7 +512,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;
             }
         }
@@ -524,8 +525,7 @@ class enrolment_plugin_authorize
         set_config('an_sorttype', $sorttype);
 
         // https and openssl library is required
-        if ((substr($CFG->wwwroot, 0, 5) !== 'https' and empty($CFG->loginhttps)) or
-            !check_openssl_loaded()) {
+        if ((substr($CFG->wwwroot, 0, 5) !== 'https' and empty($CFG->loginhttps)) or !check_openssl_loaded()) {
             return false;
         }
 
@@ -581,7 +581,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...");
 
@@ -593,10 +592,7 @@ class enrolment_plugin_authorize
         }
 
         mtrace("    scheduled capture", ": ");
-        if (empty($CFG->an_review) or
-           (!empty($CFG->an_test)) or
-           (intval($CFG->an_capture_day) < 1) or
-           (!check_openssl_loaded())) {
+        if (empty($CFG->an_review) or (!empty($CFG->an_test)) or (intval($CFG->an_capture_day) < 1) or (!check_openssl_loaded())) {
             mtrace("disabled");
             return; // order review disabled or test mode or manual capture or openssl wasn't loaded.
         }
@@ -622,6 +618,7 @@ class enrolment_plugin_authorize
             mtrace("blocked");
             return;
         }
+        set_config('an_lastcron', $timenow, 'enrol/authorize');
 
         mtrace("    $ordercount orders are being processed now", ": ");
 
@@ -648,7 +645,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;
@@ -724,8 +721,7 @@ class enrolment_plugin_authorize
         // get_users_by_capability() does not handling user level resolving
         // After user resolving, get_admin() to get_users_by_capability()
         $adminuser = get_admin();
-        $select = "status IN(".AN_STATUS_UNDERREVIEW.",".AN_STATUS_APPROVEDREVIEW.") " .
-                  "AND (timecreated<'$onepass') AND (timecreated>'$timediff60')";
+        $select = "status IN(".AN_STATUS_UNDERREVIEW.",".AN_STATUS_APPROVEDREVIEW.") AND (timecreated<'$onepass') AND (timecreated>'$timediff60')";
         $count = count_records_select('enrol_authorize', $select);
         if ($count) {
             $a = new stdClass;
@@ -787,7 +783,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;

enrol/authorize/enrol_form.php

@@ -56,7 +56,12 @@ class enrol_authorize_form extends moodleform
                 $monthsmenu[$i] = userdate(gmmktime(12, 0, 0, $i, 15, 2000), "%B");
             }
             $nowdate = getdate();
-            $yearsmenu = array('' => get_string('choose')) + range($nowdate["year"] - 1, $nowdate["year"] + 15);
+            $startyear = $nowdate["year"] - 1;
+            $endyear = $startyear + 20;
+            $yearsmenu = array('' => get_string('choose'));
+            for ($i = $startyear; $i < $endyear; $i++) {
+            	$yearsmenu[$i] = $i;
+            }
             $ccexpiregrp = array();
             $ccexpiregrp[] = &$mform->createElement('select', 'ccexpiremm', '', $monthsmenu);
             $ccexpiregrp[] = &$mform->createElement('select', 'ccexpireyyyy', '', $yearsmenu);

enrol/authorize/index.php

@@ -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);

enrol/authorize/localfuncs.php

@@ -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";

enrol/authorize/locallib.php

@@ -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);
@@ -279,7 +276,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);
                         }
@@ -305,17 +302,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.");
         }
@@ -334,6 +328,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);

enrol/authorize/uploadcsv.php

@@ -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;

enrol/ldap/enrol.php

@@ -75,12 +75,6 @@ function setup_enrolments(&$user) {
                 } else {
                     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) {
-                    // non-visible courses don't show up in the enrolled 
-                    // array, so we should skip them -- 
-                    continue;
-                }
             }
             
             // deal with enrolment in the moodle db

files/index.php

@@ -43,7 +43,7 @@
 
         echo '</td></tr></table>';
 
-        if ($course->id == SITEID) {
+        if ($course->id == SITEID and !$choose) {
                 admin_externalpage_print_footer($adminroot);
         } else {
             print_footer($course);

group/db/dbbasicgrouplib.php

@@ -513,7 +513,7 @@ function groups_members_from_sql() {
 function groups_members_join_sql($groupid=false) {    
     $sql = ' JOIN '.groups_members_from_sql().' ON u.id = gm.userid ';
     if ($groupid) {
-        $sql = "AND gm.groupid = '$groupid' ";
+        $sql .= "AND gm.groupid = '$groupid' ";
     }
     return $sql;
     //return ' INNER JOIN '.$CFG->prefix.'role_assignments ra ON u.id=ra.userid'.

group/edit.php

@@ -17,15 +17,16 @@ require_once('edit_form.php');
 
 /// get url variables
 $courseid    = required_param('courseid', PARAM_INT);
-$id          = optional_param('id', false, PARAM_INT);         
-$groupingid  = optional_param('grouping', false, PARAM_INT);
-$newgrouping = optional_param('newgrouping', false, PARAM_INT);
+$id          = optional_param('id', 0, PARAM_INT);         
+$groupingid  = optional_param('grouping', GROUP_NOT_IN_GROUPING, PARAM_INT);
+$newgrouping = optional_param('newgrouping', GROUP_NOT_IN_GROUPING, PARAM_INT);
 $delete      = optional_param('delete', 0, PARAM_BOOL);
 $confirm     = optional_param('confirm', 0, PARAM_BOOL);
 
 if (empty($CFG->enablegroupings)) {
     // NO GROUPINGS YET!
-    $groupingid = GROUP_NOT_IN_GROUPING;
+    $groupingid  = GROUP_NOT_IN_GROUPING;
+    $newgrouping = GROUP_NOT_IN_GROUPING;
 }
 
 /// Course must be valid 
@@ -33,40 +34,63 @@ if (!$course = get_record('course', 'id', $courseid)) {
     error('Course ID was incorrect');
 }
 
-/// Delete action should not be called without a group id
-if ($delete && !$id) {
-    error(get_string('errorinvalidgroup'));
-}
+$context = get_context_instance(CONTEXT_COURSE, $course->id);
+require_capability('moodle/course:managegroups', $context);
 
-if ($delete && !$confirm) {
-    print_header(get_string('deleteselectedgroup', 'group'), get_string('deleteselectedgroup', 'group'));
-    $optionsyes = array('id'=>$id, 'delete'=>1, 'courseid'=>$courseid, 'sesskey'=>sesskey(), 'confirm'=>1);
-    $optionsno  = array('id'=>$courseid);
-    if (!$group = get_record('groups', 'id', $id)) {
-        error('Group ID was incorrect');
-    } 
-    notice_yesno(get_string('deletegroupconfirm', 'group', $group->name), 'edit.php', 'index.php', $optionsyes, $optionsno, 'post', 'get');
-    print_footer();
-    die;
-}
+$group = false;
 
-/// basic access control checks
 if ($id) {
     if (!$group = get_record('groups', 'id', $id)) {
         error('Group ID was incorrect');
     } 
-    $context = get_context_instance(CONTEXT_COURSE, $course->id);
-    require_capability('moodle/course:managegroups', $context);
-    
-    // If group given but no groupingid, retrieve grouping id
-    if (empty($groupingid)) {
-        $groupings = groups_get_groupings_for_group($id);
-        if (empty($groupings)) {
-            $groupingid = -1;
-        } else {
+    $group->description = clean_text($group->description);
+
+    if (!groups_group_belongs_to_course($group->id, $course->id)) {
+        error('Group not from this course.');
+    }
+
+    $groupings = groups_get_groupings_for_group($id);
+    if (empty($groupings)) {
+        $groupingid = -1;
+    } else {
+        if (!isset($groupings[$groupingid])) {
             $groupingid = $groupings[0];
         }
-    } 
+    }
+}
+
+if ($groupingid != GROUP_NOT_IN_GROUPING and !groups_db_grouping_belongs_to_course($groupingid, $course->id)) {
+    error('Grouping not from this course.');
+}
+
+if ($newgrouping != GROUP_NOT_IN_GROUPING and !groups_db_grouping_belongs_to_course($newgrouping, $course->id)) {
+    error('Grouping not from this course.');
+}
+
+// Process delete action
+if ($delete and $group) {
+    if (!$group) {
+        /// Delete action should not be called without a group id
+        error(get_string('errorinvalidgroup'));
+
+    } else if (!$confirm) {
+        print_header(get_string('deleteselectedgroup', 'group'), get_string('deleteselectedgroup', 'group'));
+        $optionsyes = array('id'=>$group->id, 'delete'=>1, 'courseid'=>$course->id, 'sesskey'=>sesskey(), 'confirm'=>1);
+        $optionsno  = array('id'=>$course->id);
+        notice_yesno(get_string('deletegroupconfirm', 'group', $group->name), 'edit.php', 'index.php', $optionsyes, $optionsno, 'post', 'get');
+        print_footer();
+        die;
+
+    } else {
+        if (!confirm_sesskey()) {
+            error('Sesskey error');
+        }
+        if (groups_delete_group($group->id)) {
+            redirect(groups_home_url($course->id, null, $groupingid, false));
+        } else {
+            print_error('erroreditgroup', 'group', groups_home_url($course->id));
+        }
+    }
 }
 
 /// First create the form
@@ -77,18 +101,6 @@ if (!empty($group)) {
     $editform->set_data($group);
 }
 
-// Process delete action
-if ($delete) {
-    if (!confirm_sesskey()) {
-        error('Sesskey error');
-    }
-    if (groups_delete_group($id)) {
-        redirect(groups_home_url($course->id, null, $groupingid, false));
-    } else {
-        print_error('erroreditgroup', 'group', groups_home_url($course->id));
-    }
-}
-
 $error = null;
 
 if ($editform->is_cancelled()) {

group/lib/basicgrouplib.php

@@ -132,6 +132,7 @@ function groups_get_group_settings($groupid, $courseid=false, $alldata=false) {
  * @return string The path of the image for the group
  */
 function groups_get_group_image_path($groupid) {
+    global $CFG;
     //TODO: groupid=1, /user/pixgroup.php/1/f1.jpg ??
 	return $CFG->wwwroot.'/pixgroup.php/'.$groupid.'/f1.jpg';
 }

help.php

@@ -18,6 +18,7 @@ $file   = optional_param('file', '', PARAM_PATH);
 $text   = optional_param('text', 'No text to display', PARAM_CLEAN);
 $module = optional_param('module', 'moodle', PARAM_ALPHAEXT);
 $forcelang = optional_param('forcelang', '', PARAM_SAFEDIR);
+$skiplocal = optional_param('skiplocal', 0, PARAM_INT);     // shall _local help files be skipped?
 
 // Start the output. TODO: improve the page title.
 print_header(get_string('help'));
@@ -38,17 +39,18 @@ if (!empty($file)) {
         $langs = array($forcelang, 'en_utf8');
     }
     
-    // _local language packs take precedence with both forced language and non-forced language settings
-    $xlangs = array();
-    foreach ($langs as $lang) {
-        if (!empty($lang)) {
-            $xlangs[] = $lang . '_local';
-            $xlangs[] = $lang;
+    if (!$skiplocal) {
+        // _local language packs take precedence with both forced language and non-forced language settings
+        $xlangs = array();
+        foreach ($langs as $lang) {
+            if (!empty($lang)) {
+                $xlangs[] = $lang . '_local';
+                $xlangs[] = $lang;
+            }
         }
+        $langs = $xlangs;
+        unset($xlangs);
     }
-    $langs = $xlangs;
-    unset($xlangs);
-
 
 // Define possible locations for help file similar to locations for language strings
 // Note: Always retain module directory as before

install.php

@@ -128,6 +128,7 @@ $CFG->dataroot = $INSTALL['dataroot'];
 $CFG->admin = $INSTALL['admindirname'];
 $CFG->directorypermissions = 00777;
 $CFG->running_installer = true;
+$CFG->docroot = 'http://docs.moodle.org';
 $COURSE->id = 0;
 
 /// Include some moodle libraries

install/lang/ca_utf8/installer.php

@@ -9,6 +9,7 @@
 /// File generated by cvs://contrib/lang2installer/installer_builder
 /// 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 />
@@ -16,8 +17,17 @@ 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['availablelangs'] = 'Paquets d\'idioma disponibles';
+$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['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';
@@ -28,6 +38,7 @@ $string['cannotsavezipfile'] = 'No s\'ha pogut desar el fitxer zip';
 $string['cannotunzipfile'] = 'No s\'ha pogut descomprimir el fitxer';
 $string['caution'] = 'Alerta';
 $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.';
@@ -36,12 +47,16 @@ $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['curlrecommended'] = 'Es recomana instal·lar la biblioteca opcional Curl a fi d\'habilitar la funcionalitat de Moodle en Xarxa.';
 $string['customcheck'] = 'Altres comprovacions';
 $string['database'] = 'Base de dades';
@@ -59,6 +74,9 @@ $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['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 crear abans i cal tenir un nom d\'usuari i una contrasenya per accedir-hi.<br />
 <br /> <br />
 <b>Tipus:</b> mysql o postgres7<br />
@@ -67,6 +85,7 @@ $string['databasesettings'] = 'Ara cal configurar la base de dades on s\'emmagat
 <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 crear 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 />
@@ -116,6 +135,9 @@ $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['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.';
@@ -149,13 +171,16 @@ 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['doyouagree'] = 'Heu llegit aquestes condicions i les enteneu?';
+$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';
@@ -167,6 +192,7 @@ $string['environmentrequireversion'] = 'esteu executant la versió $a->current i
 $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';
@@ -194,16 +220,33 @@ $string['globalsquoteshelp'] = '<p>No s\'aconsella tenir inhabilitat Magic Quote
 <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>
@@ -260,7 +303,8 @@ $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'] = 'Consulteu la informació sobre aquesta versió de Moodle en les <a target=\"_new\" href=\"$a\">Notes de llançament</a>';
+$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';
@@ -271,20 +315,72 @@ $string['safemodehelp'] = '<p>Moodle pot tenir diversos problemes amb el mode se
 <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['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>:';
@@ -294,9 +390,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ó:';
 ?>

install/lang/cs_utf8/installer.php

@@ -244,7 +244,7 @@ $string['odbc_mssql'] = 'SQL*Server přes ODBC (odbc_mssql)';
 $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['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.';

install/lang/da_utf8/installer.php

@@ -35,7 +35,7 @@ $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.';
@@ -109,6 +109,7 @@ $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['dbconnectionerror'] = 'Den angive database kunne ikke kontaktes. Kontroller eller ret venligst databaseinformationerne.';
@@ -146,7 +147,7 @@ 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\".';
@@ -199,6 +200,7 @@ $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';
@@ -228,7 +230,7 @@ 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.';
@@ -276,8 +278,8 @@ $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.
@@ -287,8 +289,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.';

install/lang/de_utf8/installer.php

@@ -9,6 +9,7 @@
 /// File generated by cvs://contrib/lang2installer/installer_builder
 /// 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 /> 
@@ -17,8 +18,17 @@ $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['availablelangs'] = 'Verfügbare Sprachpakete';
+$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['cannotconnecttodb'] = 'Verbindung zur Datenbank gescheitert';
 $string['cannotcreatelangdir'] = 'Verzeichnis \"lang\" kann nicht angelegt werden.';
 $string['cannotcreatetempdir'] = 'Temporäres Verzeichnis kann nicht angelegt werden.';
 $string['cannotdownloadcomponents'] = 'Komponenten können nicht heruntergeladen werden.';
@@ -29,20 +39,25 @@ $string['cannotsavezipfile'] = 'Die ZIP-Datei konnte nicht gespeichert werden';
 $string['cannotunzipfile'] = 'Die Datei konnte nicht entpackt werden.';
 $string['caution'] = 'Warnung';
 $string['check'] = 'Prüfen';
-$string['chooselanguage'] = 'Eine Sprache wählen';
-$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['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['configurationcomplete'] = 'Die Konfiguration ist abgeschlossen.';
-$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['creatingconfigfile'] = 'Konfiguarationsdatei wird erstellt ...';
 $string['curlrecommended'] = 'Die Installation der optionalen Bibliothek Curl wird empfohlen, um die Moodle-Netzwerk-Funktionalität einzuschalten.';
 $string['customcheck'] = 'Weitere Überprüfungen';
 $string['database'] = 'Datenbank';
@@ -62,6 +77,9 @@ $string['databasecreationsettingssub'] = '<b>Typ:</b> \"mysql\" vom Installer fe
 <b>User:</b> \"root\" vom Installer festgelegt<br />
 <b>Password:</b> Ihr Datenbankpasswort<br />
 <b>Tables 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 />
@@ -70,6 +88,7 @@ $string['databasesettings'] = 'Jetzt wird die Datenbank erstellt, in der die mei
 <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, der für alle Tabellen genutzt wird';
+$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 />
@@ -119,17 +138,20 @@ $string['databasesettingssub_postgres7'] = '<b>Typ:</b> PostgreSQL<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)';
-$string['dataroot'] = 'Datenverzeichnis';
+$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['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['dbhost'] = 'Server';
 $string['dbpass'] = 'Passwort';
-$string['dbprefix'] = 'Prefix für alle Tabellen';
-$string['dbtype'] = 'Datenbankart';
+$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>
@@ -155,13 +177,16 @@ 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'] = 'Prü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['doyouagree'] = 'Haben Sie diese Bedingungen gelesen, verstanden und stimmen ihnen zu?';
+$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.';
@@ -173,9 +198,10 @@ $string['environmentrequireversion'] = 'Version $a->needed ist erforderlich - ak
 $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['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.';
@@ -193,16 +219,33 @@ $string['globalsquoteshelp'] = '<p>Die Kombination von deaktivierten Magic Quote
 <blockquote>php_value magic_quotes_gpc On</blockquote>
 <blockquote>php_value register_globals Off</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['invalidemail'] = 'Ungültige E-Mail-Adresse';
+$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>
@@ -254,7 +297,8 @@ $string['postgres7'] = 'PostgreSQL (postgres7)';
 $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'] = 'Weitere Informationen über diese Version finden Sie online: <a target=\"_blank\" href=\"$a\">Versionsinformation</a>';
+$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['restricted'] = 'Eingeschränkt';
@@ -263,30 +307,86 @@ $string['safemodeerror'] = 'Die Nutzung von Moodle im Safe Mode kann zu Schwieri
 $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['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 :';
 ?>

install/lang/en_utf8/installer.php

@@ -228,6 +228,7 @@ $string['globalsquoteshelp'] = '<p>Combination of disabled Magic Quotes GPC and
    <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';
@@ -344,4 +345,5 @@ $string['wrongsourcebase'] = 'Wrong source URL base.';
 $string['wrongzipfilename'] = 'Wrong ZIP filename.';
 $string['wwwroot'] = 'Web address';
 $string['wwwrooterror'] = 'The \'Web Address\' does not appear to be valid - this Moodle installation doesn\'t appear to be there. The value below has been reset.';
+$string['xmlrpcrecommended'] = 'Installing the optional xmlrpc extension is useful for Moodle Networking functionality.';
 ?>

install/lang/es_utf8/installer.php

@@ -119,6 +119,7 @@ $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['dbconnectionerror'] = 'Error de conexión con la base de datos. Por favor, compruebe los ajustes de la base de datos.';
@@ -201,6 +202,7 @@ $string['globalsquoteshelp'] = '<p>No se recomienda la combinación simultánea
 <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';
@@ -273,6 +275,7 @@ $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';

install/lang/et_utf8/installer.php

@@ -22,17 +22,19 @@ $string['cannotsavemd5file']='Ei saa salvestada md5 faili.';
 $string['cannotsavezipfile']='Ei saa salvestada ZIP faili.';
 $string['cannotunzipfile']='Ei saa lahti pakkida faili.';
 $string['caution']='Hoiatus';
-$string['check'] = 'Kontrolli';
+$string['check']='Kontrolli';
 $string['chooselanguage']='Vali keel';
 $string['chooselanguagehead']='Keele valik';
-$string['closewindow'] = 'Sule aken';
+$string['chooselanguagesub']='Palun vali keel, mida kasutatakse AINULT installeerimise käigus. Hiljem saab valida õpikeskkonna ja kasutajate keelt.';
+$string['closewindow']='Sule aken';
 $string['compatibilitysettings']='Kontrollin teie PHP sätteid ...';
 $string['compatibilitysettingshead']='PHP seadete kontrollimine...';
+$string['compatibilitysettingssub']='Sinu server peab läbima kõik need testid, et Moodle jookseks korralikult';
 $string['configfilenotwritten']='Installeerimisskript ei suutnud automaatselt tekitada config.php faili, mis sisaldaks sinu valitud seadistusi. Põhjus võib olla selles, et sinu Moodle kataloog ei ole kirjutatav. Sa võid käsitsi kopeerida järgneva koodi config.php nimelisse faili, mis asub Moodle juurkataloogis.';
 $string['configfilewritten']='config.php on edukalt loodud';
 $string['configurationcomplete']='Seadistamine lõpetatud';
 $string['configurationcompletehead']='Konfigureerimine lõpetatud';
-$string['continue'] = 'Jätka';
+$string['continue']='Jätka';
 $string['curlrecommended']='Fakultatiivse Curl teegi installeerimine on väga soovitatav, millega võimaldatakse Moodle võrgunduse funktsionaalsus.';
 $string['customcheck']='Muud kontrollid';
 $string['database']='Andmebaas';
@@ -104,7 +106,7 @@ $string['databasesettingssub_postgres7']='<b>Tüüp:</b> PostgreSQL<br />
 $string['dataroot']='Andmete kataloog';
 $string['datarooterror']='Sinu määratud andmete kataloogi ei suudetud leida ega luua. Paranda tee või loo ise käsitsi see kataloog.';
 $string['dbconnectionerror']='Me ei suutnud sinu määratud andmebaasi ühendada. Palun kontrolli oma andmebaasi seadistust.';
-$string['dbcreationerror']='Andmebaasi loomise viga. Ei suudetud luua andmebaasi nime olemasolevate seadistustega.  ';
+$string['dbcreationerror']='Andmebaasi loomise viga. Ei suudetud luua andmebaasi nime olemasolevate seadistustega.';
 $string['dbhost']='Hosti server';
 $string['dbpass']='Parool';
 $string['dbprefix']='Tabeli eesliide';
@@ -119,13 +121,15 @@ Tee kindlaks, et suured/väiketähed oleksid õiged.</p>
 <p><b>Andmete kataloog:</b>
 Sul on vaja kohta, kuhu Moodle salvestab üles laetud failid. See kataloog peaks olema loetav JA KIRJUTATAV veebiserveri kasutaja poolt (tavaliselt \'nobody\' või \'apache\'), kuid ei tohiks olla otse veebi kaudu ligipääsetav.
 </p>';
+$string['directorysettingshead']='Palun kinnita Moodle installatsiooni asukohta';
 $string['dirroot']='Moodle kataloog';
 $string['dirrooterror']='Moodle kataloogi seadistus näib olevat vigane -  me ei suuda sealt leida Moodle installatsiooni. Allpool olev väärtus on nullitud.';
 $string['download']='Lae alla';
 $string['downloadedfilecheckfailed']='Alla laetud faili kontroll ebaõnnestus.';
 $string['downloadlanguagebutton']='Tõmba alla &quot;$a&quot; keelepakett';
 $string['downloadlanguagehead']='Tõmba alla keelepakett';
-$string['doyouagree'] = 'Kas olete lugenud ja mõistnud kõiki tingimusi?';
+$string['downloadlanguagesub']='Sul on praegu võimalus tõmmata alla keelepakk ja jätkata installeerimist vastavas keeles.<br /><br />Kui Sa oled mitte võimeline alla tõmbama keelepakki, siis installeerimine jätkub inglise keeles. (Niipea, kui installeerimine on lõppenud, on Sul võimalus alla tõmmata täiendavaid keelepakke.)';
+$string['doyouagree']='Kas olete lugenud ja mõistnud kõiki tingimusi?';
 $string['environmenterrortodo']='Sa pead lahendama kõik keskkonna probleemid (vead), mis leiti ülal, et hakata installeerima vastavat Moodle versiooni!';
 $string['environmenthead']='Keskkonna kontrollimine...';
 $string['environmentrecommendcustomcheck']='kui see test ebaõnnestub, siis see võib saada potentsiaalseks probleemiks';
@@ -133,7 +137,8 @@ $string['environmentrecommendinstall']='on soovitatav, et oleks installeeritud j
 $string['environmentrequirecustomcheck']='see test peab olema edukalt läbitud';
 $string['environmentrequireinstall']='on nõutud, et oleks installeeritud ja võimaldatud';
 $string['environmentrequireversion']='versioon $a->needed on nõutud, Sinul on jooksmas versioon $a->current';
-$string['error'] = 'Viga';
+$string['environmentsub']='Me kontrollime, kas mitmesugused süsteemi komponendid vastavad nõudmistele.';
+$string['error']='Viga';
 $string['fail']='Fail';
 $string['fileuploads']='Failide üleslaadimine';
 $string['fileuploadserror']='See peaks olema sisse lülitatud';
@@ -141,21 +146,23 @@ $string['fileuploadshelp']='<p>Failide üleslaadimine näib sinu serveris olevat
 <p>Moodle\'it saab ikka installeerida, kui selle võimaluseta ei saa sa kursuse faile või uute kasutajate andmeid üles laadida</p>
 <p>Failide üleslaadimise sisse lülitamiseks pead sa (või sinusüsteemiadministraator) muutma main php.ini faili oma süsteemis ja seadma <b>file_uploads</b> väärtuseks \'1\'.</p>';
 $string['gdversion']='GD versioon';
-$string['gdversionerror']='GD teek peaks olema võimeline töötlema ja looma pilte. ';
+$string['gdversionerror']='GD teek peaks olema võimeline töötlema ja looma pilte.';
 $string['gdversionhelp']='<p>Sinu serveril ei paista GD installeeritud olevat.</p>
 <p>GD on andmeteek, mis on vajalik PHP jaoks, et Moodle\'il oleks võimalik pilte (kasutajate ikoonid, logide graafikud) töödelda ja luua. Moodle töötab ikka ka GD puudumisel, aga need võimalused ei ole siis sinu jaoks kättesaadavad.</p>
 <p>GD lisamiseks PHP\'le Unixi operatsioonisüsteemis tuleb kompileerida PHP-d, kasutates --with-gd parameetrit.</p>
 <p>Windowsis saad sa tavaliselt muuta php.ini faili ja kommenteerida sisse libdg.dll\'le vastava rea.</p>';
+$string['globalsquotes']='Ebaturvaline globaalmuutujate häsitlemine';
+$string['globalsquoteserror']='Paranda oma PHP seadeid: mitte võimalda \"register_globals\" ja/või võimalda \"magic_quotes_gpc\".';
 $string['globalsquoteshelp']='<p>Kombinatsioon mitte lubatud Magic Quotes GPC ja võimaldatud Register Globals samaaegsest seadistusest ei ole soovitatav.</p><p>Soovituslik seadistus on <b>magic_quotes_gpc = On</b> and <b>register_globals = Off</b> Sinu php.ini failis</p><p>Kui Sul ei ole ligipääsu php.ini failile, siis peaksid paneme alljärgnevad read Moodle kataloogis olevasse faili .htaccess:<blockquote>php_value magic_quotes_gpc On</blockquote><blockquote>php_value register_globals Off</blockquote></p>';
-$string['help'] = 'Abi';
+$string['help']='Abi';
 $string['iconvrecommended']='Fakultatiivse ICONV teegi installeerimine on tungivalt soovitatav tõstmaks õpikeskkonna jõudlust, eriti kui õpikeskkond toetab mitte ladinatähistikuga keeli (näiteks eesti keelt).';
-$string['info'] = 'Informatsioon';
+$string['info']='Informatsioon';
 $string['installation']='Installeerimine';
-$string['invalidemail'] = 'Vigane e-posti aadress';
-$string['invalidmd5']='Vigane md5';
+$string['invalidemail']='Vigane e-posti aadress';
+$string['invalidmd5']='Vigane md5'; // ORPHANED
 $string['langdownloaderror']='Kahjuks keelt \"$a\" ei paigaldatud. Paigaldamine jätkub inglise keeles.';
 $string['langdownloadok']='Keel \"$a\" paigaldati edukalt. Paigaldamisprotsess jätkub selles keeles.';
-$string['language'] = 'Keel';
+$string['language']='Keel';
 $string['magicquotesruntime']='Magic Quotes talitlusaeg';
 $string['magicquotesruntimeerror']='See peaks olema välja lülitatud';
 $string['magicquotesruntimehelp']='<p>Magic quotes talitlusaeg peaks olema välja lülitatud, et Moodle saaks korralikult funktsioneerida.</p>
@@ -177,22 +184,22 @@ See lubab Moodle\'il ise mälu limiiti määrata.</li>
 <p>Kuigi mõnedes serverites tõkestab see <b>kõigi</b> PHP lehekülgede tööd (sa näed veateateid, kui vaatad lehti), nii et pead eemaldama .htaccess faili.</p></li>
 </ol>';
 $string['missingrequiredfield']='Mõned nõutud väljad on puudu';
-$string['moodledocslink'] = 'Moodle manuaalid käesoleva lehe kohta';
+$string['moodledocslink']='Moodle manuaalid käesoleva lehe kohta';
 $string['mssql']='SQL*Server (mssql)';
 $string['mssql_n']='SQL*Server UTF-8 toetusega (mssql_n)';
 $string['mssqlextensionisnotpresentinphp']='PHP laiendus MSSQL ei ole korralikult seadistatud, mistõttu ei saa ühenduda SQL*Server\'iga. Palun kontrolli oma php.ini faili või kompileeri PHP uuesti.';
 $string['mysql']='MySQL (mysql)';
 $string['mysqlextensionisnotpresentinphp']='PHP ei ole MySQL laiendiga õigesti konfigureeritud, seega ei saa ta MySQL\'ga suhelda. Palun kontrolli oma php.ini faili või kompileeri PHP uuesti.';
-$string['name'] = 'Nimi';
-$string['next'] = 'Järgmine';
+$string['name']='Nimi';
+$string['next']='Järgmine';
 $string['oci8po']='Oracle (oci8po)';
 $string['ociextensionisnotpresentinphp']='PHP laiendus OCI8 ei ole korralikult seadistatud, mistõttu ei saa ühenduda Oracle\'ga. Palun kontrolli oma php.ini faili või kompileeri PHP uuesti.';
 $string['odbc_mssql']='SQL*Server üle ODBC (odbc_mssql)';
 $string['odbcextensionisnotpresentinphp']='PHP laiendus ODBC ei ole korralikult seadistatud, mistõttu ei saa ühenduda SQL*Server\'iga. Palun kontrolli oma php.ini faili või kompileeri PHP uuesti.';
-$string['ok'] = 'OK';
+$string['ok']='OK';
 $string['opensslrecommended']='Fakultatiivse OpenSSL teegi installeerimine on väga soovitatav, millega võimaldatakse Moodle võrgunduse funktsionaalsus.';
 $string['pass']='Korras';
-$string['password'] = 'Salasõna';
+$string['password']='Salasõna';
 $string['pgsqlextensionisnotpresentinphp']='PHP laiendus PGSQL ei ole korralikult seadistatud, mistõttu ei saa ühenduda PostgreSQL\'iga. Palun kontrolli oma php.ini faili või kompileeri PHP uuesti.';
 $string['php50restricted']='PHP 5.0.x omab mitmeid probleeme. Palun uuenda 5.1.x või lase tagasi 4.3.x or 4.4.x PHP versioonile';
 $string['phpversion']='PHP versioon';
@@ -201,10 +208,11 @@ $string['phpversionhelp']='<p>Moodle vajab vähemalt PHP versiooni 4.1.0</p>
 <p>Sinu jooksev versioon on $a</p>
 <p>Sa pead oma PHP-d uuendama või kolima hosti, kus on uuem PHP versioon!</p>';
 $string['postgres7']='PostgreSQL (postgres7)';
-$string['previous'] = 'Eelmine';
-$string['remotedownloadnotallowed']='Komponentide alla tõmbamine ei ole Sinu serverisse lubatud (sest allow_url_fopen keelatud).<br /><br />Sa pead tõmbama alla faili <a href=\"$a->url\">$a->URL</a> käsitsti, kopeerima \"$a->dest\" oma serveris ja sinna lahti pakkima.';
-$string['report'] = 'Ülevaade';
-$string['restricted'] = 'Piiratud';
+$string['previous']='Eelmine';
+$string['releasenoteslink']='Antud Moodle versiooni kohta informatsiooni palun vaata leheküljelt <a target=\"_new\" href=\"$a\">Väljalaske märkmed</a>';
+$string['remotedownloadnotallowed']='Komponentide alla tõmbamine ei ole Sinu serverisse lubatud (sest allow_url_fopen keelatud).<br /><br />Sa pead tõmbama alla faili <a href=\"$a->url\">$a->url</a> käsitsti, kopeerima \"$a->dest\" oma serveris ja sinna lahti pakkima.';
+$string['report']='Ülevaade';
+$string['restricted']='Piiratud';
 $string['safemode']='Ohutu režiim';
 $string['safemodeerror']='Moodle\'il võib ohutus režiimis komplikatsioone tekkida';
 $string['safemodehelp']='<p>Moodle võib tekkida mitmesuguseid probleeme, kui ohutu režiim on sisse lülitatud, näiteks ei luba ta tõenäoliselt luua uusi faile.</p>
@@ -216,17 +224,19 @@ $string['sessionautostarterror']='See peaks olema välja lülitatud';
 $string['sessionautostarthelp']='<p>Moodle vajab sessiooni tuge ja ei tööta ilma selleta.</p>
 <p>Sessioone saab sisse lülitada php.ini failist, otsi sealt session.auto_start parameetrit.</p>';
 $string['skipdbencodingtest']='Jäta vahele andmebaasi kodeeringu test';
-$string['status'] = 'Staatus';
+$string['status']='Staatus';
 $string['thischarset']='UTF-8';
 $string['thisdirection']='ltr';
 $string['thislanguage']='Eesti';
 $string['unicoderecommended']='Soovitatav on kõikide andmete salvestamine UTF-8\'s (unicode). Uued paigaldamised peaksid olema tehtud andmebaasi, mille vaikimisi kodeering on Unicode. Kui uuendada, siis peaksid teostama UTF-8\'sse üleviimise protsessi (vaata Admin lehte).';
-$string['user'] = 'Kasutaja';
-$string['welcomep10']='\$a->installername (\$a->installerversion)';
+$string['user']='Kasutaja';
+$string['welcomep10']='$a->installername ($a->installerversion)';
+$string['welcomep20']='Sa näed seda lehte, sest oled edukalt installeerinud ja käivitanud <strong>$a->packname $a->packversion</strong> paketi Sinu arvutis. Õnnitleme!';
+$string['welcomep40']='Pakett sisaldab ka <strong>Moodle $a->moodlerelease ($a->moodleversion)</strong>.';
 $string['welcomep70']='Vajuta \"Järgmine\" nuppu all jätkamaks <strong>Moodle</strong> paigaldamisega.';
-$string['wrongdestpath']='Vale sihtkoha rada.';
+$string['wrongdestpath']='Vale sihtkoha rada.'; // ORPHANED
 $string['wrongsourcebase']='Vale allika URL\'i baas.';
-$string['wrongzipfilename']='Vale ZIP failinimi.';
+$string['wrongzipfilename']='Vale ZIP failinimi.'; // ORPHANED
 $string['wwwroot']='Veebiaadress';
 $string['wwwrooterror']='Veebiaadress näib vigane - Moodle installatsiooni ei paista seal olevat.';
 ?>

install/lang/eu_utf8/installer.php

@@ -9,13 +9,13 @@
 /// File generated by cvs://contrib/lang2installer/installer_builder
 /// using strings defined in stringnames.txt (same dir)
 
-$string['admindirerror'] = 'Adminerako zehaztu den direktorioa ez da zuzena';
+$string['admindirerror'] = 'Kudeaketarako zehaztu den direktorioa ez da zuzena';
 $string['admindirname'] = 'Admin direktorioa';
 $string['admindirsetting'] = '<p>Oso web zerbitzari gutxik erabiltzen dute /admin kontrol-panel edo antzekora era sartzeko URL berezi gisa. Zoritxorrez, hau ez dator bat Moodlen lehenetsitako administrazio-orrien kokapenarekin. Nahi izanez gero, zure instalazioko admin direktorioaren izena alda dezakezu, hemen izen berria idatziz. Adibidez: <blockquote> moodleadmin</blockquote>.
-Horrela Moodleko admin loturak berrezarriko dira.</p>';
+Horrela Moodle-ko admin loturak berrezarriko dira.</p>';
 $string['admindirsettinghead'] = 'Admin direktorioa aukeratu...';
 $string['admindirsettingsub'] = '<p>Oso web zerbitzari gutxik erabiltzen dute /admin kontrol-panel edo antzekora era sartzeko URL berezi gisa. Zoritxorrez, hau ez dator bat Moodlen lehenetsitako administrazio-orrien kokapenarekin. Nahi izanez gero, zure instalazioko admin direktorioaren izena alda dezakezu, hemen izen berria idatziz. Adibidez: <blockquote> moodleadmin</blockquote>.
-Horrela Moodleko admin loturak berrezarriko dira.</p>';
+Horrela Moodle-ko admin loturak berrezarriko dira.</p>';
 $string['availablelangs'] = 'Hizkuntza eskuragarriak';
 $string['bypassed'] = 'Saihestua';
 $string['cannotcreatelangdir'] = 'Lang direktorioa ezin da sortu.';
@@ -36,15 +36,15 @@ $string['compatibilitysettings'] = 'PHP ezarpenak konprobatzen...';
 $string['compatibilitysettingshead'] = 'PHPren zure ezarpenak konprobatzen...';
 $string['compatibilitysettingssub'] = 'Zure zerbitzariak baldintza hauek guztiak bete beharko ditu Moodle bertan egokiro funtzionatzeko.';
 $string['componentisuptodate'] = 'Osagaia eguneratu da.';
-$string['configfilenotwritten'] = 'Instalazioaren scriptak ezin izan du aukeratutako zehaztapen guztiak beteko dituen config.php fitxategia automatikoki sortu. Mesedez, kode hau config.php izeneko fitxategi batean kopiatu eta Moodleren sustraiko direktorioan itsatsi.';
+$string['configfilenotwritten'] = 'Instalazioaren scriptak ezin izan du aukeratutako zehaztapen guztiak beteko dituen config.php fitxategia automatikoki sortu. Mesedez, kode hau config.php izeneko fitxategi batean kopiatu eta Moodle-ren sustraiko direktorioan itsatsi.';
 $string['configfilewritten'] = 'config.php arrakastaz sortu da';
 $string['configurationcomplete'] = 'Ezarpen osatua';
 $string['configurationcompletehead'] = 'Ezarpen osatua';
-$string['configurationcompletesub'] = 'Moodlek ezarpen-fitxategia sortu du';
+$string['configurationcompletesub'] = 'Moodle-k ezarpen-fitxategia sortu du';
 $string['continue'] = 'Jarraitu';
 $string['customcheck'] = 'Beste konprobazio batzuk';
 $string['database'] = 'Datu-basea';
-$string['databasecreationsettings'] = 'Orain Moodleren datu gehienak bilduko dituen datu-basearen ezarpenak zehaztu behar dituzu. Instalatzaileak, beherago zehaztutako ezarpenen arabera, datu-basea sortuko du.<br />
+$string['databasecreationsettings'] = 'Orain Moodle-ren datu gehienak bilduko dituen datu-basearen ezarpenak zehaztu behar dituzu. Instalatzaileak, beherago zehaztutako ezarpenen arabera, datu-basea sortuko du.<br />
 <br /> <br />
 <b>Mota:</b> lehenetsitako balorea \"mysql\" da<br />
 <b>Zerbitzaria:</b> lehenetsitako balorea \"localhost\"da<br />
@@ -52,14 +52,14 @@ $string['databasecreationsettings'] = 'Orain Moodleren datu gehienak bilduko dit
 <b>Erabiltzailea:</b> lehenetsitako balorea  \"root\" da<br />
 <b>Pasahitza:</b> datu-basearen pasahitza<br />
 <b>Taulen aurrizkia:</b> taula guztietarako aukerazko aurrizkia';
-$string['databasecreationsettingshead'] = 'Orain Moodleren datu gehienak bilduko dituen datu-basearen ezarpenak zehaztu behar dituzu. Instalatzaileak, beherago zehaztutako ezarpenen arabera, datu-basea sortuko du.';
+$string['databasecreationsettingshead'] = 'Orain Moodle-ren datu gehienak bilduko dituen datu-basearen ezarpenak zehaztu behar dituzu. Instalatzaileak, beherago zehaztutako ezarpenen arabera, datu-basea sortuko du.';
 $string['databasecreationsettingssub'] = '<b>Mota:</b> lehenetsitako balorea \"mysql\" da<br />
 <b>Zerbitzaria:</b> lehenetsitako balorea \"localhost\" da<br />
 <b>Izena:</b>datu-basearen izena, ad., moodle<br />
 <b>Erabiltzailea:</b> lehenetsitako balorea  \"root\" da<br />
 <b>Pasahitza:</b> datu-basearen pasahitza<br />
 <b>Taulen aurrizkia:</b> taula guztietarako aukerazko aurrizkia';
-$string['databasesettings'] = 'Orain Moodleren datu gehienak bilduko dituen datu-basearen ezarpenak zehaztu behar dituzu. Datu-base hori aldez aurretik sortu behar zen eta erabiltzaile-izena eta sarbide-pasahitza izan beharko lituzke.<br />
+$string['databasesettings'] = 'Orain Moodle-ren datu gehienak bilduko dituen datu-basearen ezarpenak zehaztu behar dituzu. Datu-base hori aldez aurretik sortu behar zen eta erabiltzaile-izena eta sarbide-pasahitza izan beharko lituzke.<br />
 <br /> <br />
 <b>Mota:</b> mysql edo postgres7<br />
 <b>Zerbitzaria:</b> ad., localhost edo db.isp.com<br />
@@ -67,7 +67,7 @@ $string['databasesettings'] = 'Orain Moodleren datu gehienak bilduko dituen datu
 <b>Erabiltzailea:</b> datu-basearen erabiltzaile-izena<br />
 <b>Pasahitza:</b> datu-basearen pasahitza<br />
 <b>Taulen aurrizkia:</b> taula-izen guztietan erabiliko den aurrizkia';
-$string['databasesettingshead'] = 'Orain Moodleren datu gehienak bilduko dituen datu-basearen ezarpenak zehaztu behar dituzu. Datu-base hori aldez aurretik sortu behar zen eta erabiltzaile-izena eta sarbide-pasahitza izan beharko lituzke.';
+$string['databasesettingshead'] = 'Orain Moodle-ren datu gehienak bilduko dituen datu-basearen ezarpenak zehaztu behar dituzu. Datu-base hori aldez aurretik sortu behar zen eta erabiltzaile-izena eta sarbide-pasahitza izan beharko lituzke.';
 $string['databasesettingssub'] = '<b>Mota:</b> mysql edo postgres7<br />
 <b>Zerbitzaria:</b> p.ej.: localhost edo db.zuredomeinua.com<br />
 <b>Erabiltzailea:</b> datu-basearen erabiltzaile-jabea<br />
@@ -88,7 +88,7 @@ Moodleri non dagoen kokaturik esan behar diozu. Moodle instalatu den interneteko
 Kokapen honetarako bide osoa zehaztu.
 Maiuskulak eta minuskulak ongi daudela ziurtatu.</p>
 <p><b>Datuak:</b>
-Moodlek igotako fitxategiak gordeko ditueneko tokia behar duzu. Direktorio horretan web zerbatzariko erabiltzaileek irakurri eta IDATZI ahal izango dute (normalean \'nobody\' edo \'apache\'), baina ez da komenigarria webetik zuzenean sartu ahal izatea.</p>';
+Moodle-k igotako fitxategiak gordeko ditueneko tokia behar duzu. Direktorio horretan web zerbatzariko erabiltzaileek irakurri eta IDATZI ahal izango dute (normalean \'nobody\' edo \'apache\'), baina ez da komenigarria webetik zuzenean sartu ahal izatea.</p>';
 $string['directorysettingshead'] = 'Zure instalazioaren kokapen hauek baieztatu, mesedez';
 $string['directorysettingssub'] = '<b>Web helbidea:</b>
 Moodlera sartzeko web helbide osoa zehaztu.
@@ -97,15 +97,15 @@ zure ikasleek normalean erabiliko dutena idatzi.
 Azken barra ez jarri.
 <br />
 <br />
-<b>Moodleren direktorioa:</b>
+<b>Moodle-ren direktorioa:</b>
 Kokapen honetarako bide osoa zehaztu.
 Maiuskulak eta minuskulak ongi daudela ziurtatu.<br /><br />
 <b>Datuen direktorioa:</b>
-Moodlek igotako fitxategiak gordeko ditueneko tokia behar duzu.
+Moodle-k igotako fitxategiak gordeko ditueneko tokia behar duzu.
 Direktorio horretan web zerbatzariko erabiltzaileek irakurri eta IDATZI ahal izango dute (normalean \'nobody\' edo \'apache\'),
 baina ez da komenigarria webetik zuzenean sartu ahal izatea.';
-$string['dirroot'] = 'Moodleren direktorioa';
-$string['dirrooterror'] = '\'Moodleren direktorioa\' zuzena ez dela dirudi. Ezin izan da Moodleren instalaziorik aurkitu. Jatorrizko balorea berrezarri da.';
+$string['dirroot'] = 'Moodle-ren direktorioa';
+$string['dirrooterror'] = '\'Moodle-ren direktorioa\' zuzena ez dela dirudi. Ezin izan da Moodle-ren instalaziorik aurkitu. Jatorrizko balorea berrezarri da.';
 $string['download'] = 'Jaitsi';
 $string['downloadedfilecheckfailed'] = 'Jaitsitako fitxategiaren konprobazioak huts egin du.';
 $string['downloadlanguagebutton'] = '\"$a\" hizkuntza-paketea jaitsi';
@@ -134,7 +134,7 @@ $string['gdversion'] = 'GD bertsioa';
 $string['gdversionerror'] = 'GD liburutegiak bertan egon behar luke irudiak sortu eta prozesatzeko';
 $string['gdversionhelp'] = '<p>Zure zerbitzariak GDa instalaturik ez daukala dirudi.</p>
 
-<p>GD Moodlek irudiak (erabiltzaileen ikurrak, esaterako) prozesatzeko beharrezko duen PHP liburutegia da, baita irudi berriak sortzeko ere (ad., logoak). Moodlek GD gabe lan egin dezake, baina aipatutako baliabideak ez dituzu izango.</p>
+<p>GD Moodle-k irudiak (erabiltzaileen ikurrak, esaterako) prozesatzeko beharrezko duen PHP liburutegia da, baita irudi berriak sortzeko ere (ad., logoak). Moodle-k GD gabe lan egin dezake, baina aipatutako baliabideak ez dituzu izango.</p>
 
 <p>UNIX ingurunean GD PHPri eransteko, PHP konpilatu --with-gd parametroa erabiliz.</p>
 
@@ -145,7 +145,7 @@ $string['globalsquoteshelp'] = '<p>Ez da aholkatzen Magic Quotes GPC indargabetz
 
 <p>Aholkatzen den ezarpena zera da: <b>magic_quotes_gpc = On</b> eta <b>register_globals = Off</b> zure php.ini fitxategian</p>
 
-<p>php.ini fitxategira sarbiderik ez baduzu, Moodleren direktorioaren barruko .htaccess izeneko fitxategian lerro hau idatzi beharko duzu:
+<p>php.ini fitxategira sarbiderik ez baduzu, Moodle-ren direktorioaren barruko .htaccess izeneko fitxategian lerro hau idatzi beharko duzu:
 <blockquote>php_value magic_quotes_gpc On</blockquote>
 <blockquote>php_value register_globals Off</blockquote>
 </p>';
@@ -160,11 +160,11 @@ $string['langdownloadok'] = '\"$a\" hizkuntza zuzen instalatu da. Instalazio-pro
 $string['language'] = 'Hizkuntza';
 $string['magicquotesruntime'] = 'Magic Quotes Run Time';
 $string['magicquotesruntimeerror'] = 'Aktibatuta egon behar du';
-$string['magicquotesruntimehelp'] = '<p>Magic quotes runtime desaktibatu behar da Moodlek ongi funtzionatzeko.</p>
+$string['magicquotesruntimehelp'] = '<p>Magic quotes runtime desaktibatu behar da Moodle-k ongi funtzionatzeko.</p>
 
 <p>Desaktibazioa lehenetsita egoten da... Zure php.ini fitxategiko <b>magic_quotes_runtime</b> ezarpena ikusi.</p>
 
-<p>php.ini fitxategira sarbiderik ez baduzu, Moodleren direktorioaren barruko .htaccess izeneko fitxategian lerro hau idatzi beharko duzu:
+<p>php.ini fitxategira sarbiderik ez baduzu, Moodle-ren direktorioaren barruko .htaccess izeneko fitxategian lerro hau idatzi beharko duzu:
 <blockquote>php_value magic_quotes_runtime Off</blockquote>
 </p>';
 $string['mbstringrecommended'] = 'MBSTRING aukerako libreria instalatzea gomendagarria da  oso gunearen errendimendua hobetzeko, batez ere zure guneak latindarrak ez diren hizkuntzak erabiltzen baditu.';
@@ -178,10 +178,10 @@ $string['memorylimithelp'] = '<p>Zure zerbitzarian PHP memoria-muga $a da.</p>
 Hori egiteko modu asko daude:</p>
 <ol>
 <li>Ahal baduzu, PHP <i>--enable-memory-limit</i>-ekin berriz konpilatu.
-Horrek Moodlek berak memoria-muga ezartzea ahalbidetzen du.</li>
+Horrek Moodle-k berak memoria-muga ezartzea ahalbidetzen du.</li>
 <li>php.ini fitxategirako sarbidea baduzu,<b>memory_limit</b> ezarpena alda dezakezu
 40Mra, adibidez. Sarbiderik ez baduzu, zure administratzaileari egin dezala eska diezaiokezu.</li>
-<li>PHP zerbitzari batzuetan Moodleren direktorioan beheko lerro hau daukan .htaccess fitxategia sor dezakezu:
+<li>PHP zerbitzari batzuetan Moodle-ren direktorioan beheko lerro hau daukan .htaccess fitxategia sor dezakezu:
 <p><blockquote>php_value memory_limit 40M</blockquote></p>
 <p>Hala ere, zerbitzari batzuetan horrek PHP orri <b>GUZTIEK</b> ez funtzionatzea ekar dezake
 (orriak ikustean erroreak ere ikusiko dituzu). Kasu horretan, .htaccess fitxategia ezabatu beharko duzu.</p></li>
@@ -196,13 +196,13 @@ $string['name'] = 'Izena';
 $string['next'] = 'Hurrengoa';
 $string['oci8po'] = 'Oracle (oci8po)';
 $string['ok'] = 'Ongi';
-$string['parentlanguage'] = 'es>>';
+$string['parentlanguage'] = 'eu>>';
 $string['pass'] = 'Zuzena';
 $string['password'] = 'Pasahitza';
 $string['php50restricted'] = 'PHP 5.0.x-k hainbat arazo ezagun ditu; mesedez, eguneratu 5.1.x bertsiora edo erabili 4.3.x edo 4.4.x bertsioak.';
 $string['phpversion'] = 'PHP bertsioa';
 $string['phpversionerror'] = 'PHP bertsioak 4.1.0 edo geroagokoa izan behar du';
-$string['phpversionhelp'] = '<p>Moodlek PHP 4.1.0 edo geroagoko bertsioa behar du.</p>
+$string['phpversionhelp'] = '<p>Moodle-k PHP 4.1.0 edo geroagoko bertsioa behar du.</p>
 <p>Zure bertsioa: $a</p>
 <p>PHP eguneratu edo PHP bertsio berriagoa duen zerbitzari batera jo</p>';
 $string['previous'] = 'Aurrekoa';
@@ -211,15 +211,15 @@ $string['remotedownloadnotallowed'] = 'Osagaiak ezin dira zure zerbitzarira jait
 $string['report'] = 'Txostena';
 $string['restricted'] = 'Baimena behar da';
 $string['safemode'] = 'Modu segurua';
-$string['safemodeerror'] = 'Moodlek arazoak izan ditzake \'modu segurua\' ezarriz gero';
-$string['safemodehelp'] = '<p>Moodlek arazo ezberdinak izan ditzake \'modu segurua\' ezarriz gero, eta baliteke fitxategi berriak ezin sortu izana.</p>
+$string['safemodeerror'] = 'Moodle-k arazoak izan ditzake \'modu segurua\' ezarriz gero';
+$string['safemodehelp'] = '<p>Moodle-k arazo ezberdinak izan ditzake \'modu segurua\' ezarriz gero, eta baliteke fitxategi berriak ezin sortu izana.</p>
 
 <p>Normalean \'modu segurua\' web zerbitzari publiko paranoideek soilik aktibatzen dute. Hori dela eta, zure Moodle webgunerako beste enpresa bilatu beharko duzu.</p>
 
 <p>Nahi izanez gero, zure instalazioarekin jarrai dezakezu, baina aurrerago arazoak izango dituzu.</p>';
 $string['sessionautostart'] = 'Saioaren hasiera automatikoa';
 $string['sessionautostarterror'] = 'Indargabetuta egon behar du';
-$string['sessionautostarthelp'] = '<p>Moodlek saioko laguntza behar du eta horren ezean ez du funtzionatuko.</p>
+$string['sessionautostarthelp'] = '<p>Moodle-k saioko laguntza behar du eta horren ezean ez du funtzionatuko.</p>
 
 <p>Saioak php.ini fitxategian aktibatu behar dira session.auto_start parametroari dagokionez.</p>';
 $string['skipdbencodingtest'] = 'Datu-basearen dekodifikazio-testa ez kontuan hartu';
@@ -249,5 +249,5 @@ $string['wrongdestpath'] = 'Bide desegokia.';
 $string['wrongsourcebase'] = 'URL iturriaren oinarri akastuna.';
 $string['wrongzipfilename'] = 'ZIP fitxategiko izen desegokia.';
 $string['wwwroot'] = 'Web helbidea';
-$string['wwwrooterror'] = '\'Web helbidea\' zuzena ez dela dirudi. Ezin izan da Moodleren instalazioa aurkitu. Jatorrizko balorea berrezarri da.';
+$string['wwwrooterror'] = '\'Web helbidea\' zuzena ez dela dirudi. Ezin izan da Moodle-ren instalazioa aurkitu. Jatorrizko balorea berrezarri da.';
 ?>

install/lang/fr_utf8/installer.php

@@ -187,6 +187,7 @@ $string['gdversionhelp'] = '<p>Il semble que la librairie GD n\'est pas install
 $string['globalsquotes'] = 'Traitement non sûr des variables globales';
 $string['globalsquoteserror'] = 'Veuillez corriger vos réglages PHP&nbsp;: désactivez «&nbsp;register_globals&nbsp;» et/ou activez «&nbsp;magic_quotes_gpc&nbsp;»';
 $string['globalsquoteshelp'] = '<p>Pour des raisons de sécurité, la combinaison de la désactivation de l\'option «&nbsp;Magic Quotes GPC&nbsp;» et de l\'activation de l\'option «&nbsp;Register Globals&nbsp;» n\'est pas recommandée.</p> <p>Le réglage recommandé est <b>magic_quotes_gpc = On</b> et <b>register_globals = Off</b> dans votre fichier «&nbsp;php.ini&nbsp;».</p> <p>Si vous n\'avez pas accès au fichier «&nbsp;php.ini&nbsp;», il vous est peut-être possible de placer les deux lignes suivantes dans un fichier dénommé «&nbsp;.htaccess&nbsp;» placé dans votre dossier Moodle. <blockquote>php_value magic_quotes_gpc On</blockquote> <blockquote>php_value register_globals Off</blockquote></p>';
+$string['globalswarning'] = '<p><strong>Notification de sécurité</strong>&nbsp;: pour fonctionner correctement, Moodle nécessite <br />certaines modifications de vos réglages PHP actuels.<p/><p>Vous <em>devez</em> effectuer le réglage <code>register_globals=off</code>.<p>Ce réglage s\'effectue en modifiant le fichier <code>php.ini</code>, la configuration <br />de Apache/IIS ou le fichier <code>.htaccess</code>.</p>';
 $string['help'] = 'Aide';
 $string['iconvrecommended'] = 'Bien que la bibliothèque ICONV soit facultative, il est vivement recommandé de l\'installer sur le serveur pour de meilleures performance, notamment si votre site supporte des caractères non latins.';
 $string['info'] = 'Information';
@@ -252,13 +253,13 @@ $string['pgsqlextensionisnotpresentinphp'] = 'La configuration de l\'extension P
 $string['php50restricted'] = 'Les versions 5.0.x de PHP ont plusieurs problèmes connus. Veuillez mettre à jour PHP à la version 5.1.x ou revenir à une version 4.3.x ou 4.4.x';
 $string['phpversion'] = 'Version de PHP';
 $string['phpversionerror'] = 'La version du programme PHP doit être au moins 4.3.0 ou 5.1.0 (5.0.x a bon nombre de problèmes).';
-$string['phpversionhelp'] = '<p>Moodle nécessite au minimum la version 4.3.0 ou 5.1.0 (5.0.x a bon nombre de problèmes).</p><p>Vous utilisez actuellement la version $a.</p><p>Pour que Moodle fonctionne, vous devez mettre à jour PHP ou aller chez un hébergeur ayant une version récente de PHP.<br/>(Si vous avez une version 5.0.x, vous pouvez aussi re-passer à la version 4.4.x)</p>';
+$string['phpversionhelp'] = '<p>Moodle nécessite au minimum la version 4.3.0 ou 5.1.0 (5.0.x a bon nombre de problèmes).</p><p>Vous utilisez actuellement la version $a.</p><p>Pour que Moodle fonctionne, vous devez mettre à jour PHP ou aller chez un hébergeur ayant une version récente de PHP.<br />(Si vous avez une version 5.0.x, vous pouvez aussi re-passer à la version 4.4.x)</p>';
 $string['postgres7'] = 'PostgreSQL (postgres7)';
 $string['previous'] = 'Précédent';
 $string['qtyperqpwillberemoved'] = 'Au cours de cette mise à jour, le type de question RQP sera supprimé. Vous n\'utilisiez pas ce type de question, et ne souffrirez donc d\'aucun problème.';
 $string['qtyperqpwillberemovedanyway'] = 'Au cours de cette mise à jour, le type de question RQP sera supprimé. Votre base de données comporte des questions RQP, qui ne fonctionneront plus, à moins que vous ne réinstalliez le code disponible sur http://moodle.org/mod/data/view.php?d=13&amp;rid=797 avant de continuer la mise à jour.';
 $string['releasenoteslink'] = 'Pour des informations sur cette version de Moodle, veuillez lire les notes de version à $a';
-$string['remotedownloaderror'] = 'Le téléchargement de composants sur votre serveur a échoué. Veuillez vérifier less réglages de proxy. L\'extension cURL de PHP est vivement recommandée.<br /><br />Vous devez télécharger manuellement le fichier <a href=\"$a->url\">$a->url</a>, le copier sur votre serveur à l\'emplacement «&nbsp;$a->dest&nbsp;» et le décompresser à cet endroit.';
+$string['remotedownloaderror'] = 'Le téléchargement de composants sur votre serveur a échoué. Veuillez vérifier les réglages de proxy. L\'extension cURL de PHP est vivement recommandée.<br /><br />Vous devez télécharger manuellement le fichier <a href=\"$a->url\">$a->url</a>, le copier sur votre serveur à l\'emplacement «&nbsp;$a->dest&nbsp;» et le décompresser à cet endroit.';
 $string['remotedownloadnotallowed'] = 'Le téléchargement de composants sur votre serveur n\'est pas autorisé (l\'option allow_url_fopen est désactivée).<br /><br />Vous devez télécharger manuellement le fichier <a href=\"$a->url\">$a->url</a>, le copier vers «&nbsp;$a->dest&nbsp;» dans votre serveur et le décompresser.';
 $string['report'] = 'Rapport';
 $string['restricted'] = 'Interdit';
@@ -342,5 +343,6 @@ $string['wrongsourcebase'] = 'Adresse URL de base de la source incorrect.';
 $string['wrongzipfilename'] = 'Nom de fichier ZIP incorrect.';
 $string['wwwroot'] = 'Adresse web';
 $string['wwwrooterror'] = 'L\'adresse web indiquée semble incorrecte&nbsp;: aucune installation de Moodle ne se trouve à cette adresse.';
+$string['xmlrpcrecommended'] = 'L\'installation de l\'extension xmlrpc optionnelle est requise pour l\'utilisation du Réseau Moodle.';
 $string['yourchoice'] = 'Votre choix :';
 ?>

install/lang/gl_utf8/installer.php

@@ -11,12 +11,12 @@
 
 $string['admindirerror'] = 'O directorio de administración especificado é errado';
 $string['admindirname'] = 'Directorio de administración';
-$string['admindirsetting'] = 'Algúns servidores utilizan /admin como un URL especial para acceder 
-un panel de control ou algo semellante. Desafortunadamente isto crea   conflitos co enderezo estándar das páxinas de administración de Moodle. Pode resolver este problema renomeando o directorio admin da súa instalación e introducindo aquí o nome novo que utilizou. Por exemplo: <br /> <br /><b>moodleadmin</b><br /> <br />
+$string['admindirsetting'] = 'Algúns servidores utilizan /admin como un URL especial para acceder a  
+un panel de control ou algo semellante. Desafortunadamente isto crea conflitos co enderezo estándar das páxinas de administración de Moodle. Pode resolver este problema renomeando o directorio admin da súa instalación e introducindo aquí o nome novo que utilizou. Por exemplo: <br /> <br /><b>moodleadmin</b><br /> <br />
     Isto resolverá o acceso ás páxinas de administración do Moodle.';
 $string['admindirsettinghead'] = 'Configurando o directorio de administración ...';
-$string['admindirsettingsub'] = 'Algúns servidores utilizan /admin como un URL especial para acceder 
-un panel de control ou algo semellante. Desafortunadamente isto crea   conflitos co enderezo estándar das páxinas de administración de Moodle. Pode resolver este problema renomeando o directorio admin da súa instalación e introducindo aquí o nome novo que utilizou. Por exemplo: <br /> <br /><b>moodleadmin</b><br /> <br />
+$string['admindirsettingsub'] = 'Algúns servidores utilizan /admin como un URL especial para acceder a 
+un panel de control ou algo semellante. Desafortunadamente isto crea conflitos co enderezo estándar das páxinas de administración de Moodle. Pode resolver este problema renomeando o directorio admin da súa instalación e introducindo aquí o nome novo que utilizou. Por exemplo: <br /> <br /><b>moodleadmin</b><br /> <br />
     Isto resolverá o acceso ás páxinas de administración do Moodle.';
 $string['availablelangs'] = 'Paquetes de idioma dispoñibles';
 $string['bypassed'] = 'Pasados';
@@ -24,7 +24,7 @@ $string['cannotcreatelangdir'] = 'Non pode crear directorio de idioma';
 $string['cannotcreatetempdir'] = 'Non pode crear directorio de tempo';
 $string['cannotdownloadcomponents'] = 'Non pode descargar compoñentes.';
 $string['cannotdownloadzipfile'] = 'Non pode descargar ficheiros ZIP.';
-$string['cannotfindcomponent'] = 'Non pode encontar compoñentes';
+$string['cannotfindcomponent'] = 'Non pode encontrar compoñentes';
 $string['cannotsavemd5file'] = 'Non pode gardar o ficheiro md5.';
 $string['cannotsavezipfile'] = 'Non pode gardar un ficheiro ZIP.';
 $string['cannotunzipfile'] = 'Non pode descomprimir o ficheiro.';
@@ -38,29 +38,30 @@ $string['compatibilitysettings'] = 'Verificando a configuración de PHP ...';
 $string['compatibilitysettingshead'] = 'Verificando a configuración de PHP ...';
 $string['compatibilitysettingssub'] = 'O servidor debería pasar todas estas probas para facer con que o Moodle se execute correctamente';
 $string['componentisuptodate'] = 'O compoñente está actualizado.';
-$string['configfilenotwritten'] = 'O script de instalación non conseguiu crear automaticamente o ficheiro config.php contendo a configuración escollida, probablemente porque o directorio Moodle non é editable. Pode copiar manualmente o seguinte código nun ficheiro nomeado como config.php dentro do directorio raíz de Moodle.';
+$string['configfilenotwritten'] = 'O script de instalación non conseguiu crear automaticamente o ficheiro config.php que contén a configuración escollida, probablemente porque o directorio Moodle non é editable. Pode copiar manualmente o seguinte código nun ficheiro nomeado como config.php dentro do directorio raíz de Moodle.';
 $string['configfilewritten'] = 'config.php foi creado correctamente';
 $string['configurationcomplete'] = 'Configuración concluída';
 $string['configurationcompletehead'] = 'Configuración concluída';
 $string['configurationcompletesub'] = 'Moodle realizou unha tentativa de gardar a súa configuración nun ficheiro da raíz da instalación de Moodle.';
 $string['continue'] = 'Continuar';
 $string['curlrecommended'] = 'É altamente recomendado instalar a biblioteca Curl opcional para activar a funcionalidade de conexión de redes de Moodle.';
+$string['customcheck'] = 'Outras comprobacións';
 $string['database'] = 'Base de datos';
-$string['databasecreationsettings'] = 'Agora precisa configurar as definicións da base de datos en que a maior parte dos datos do Moodle irán ser gardados. Esta base de datos será creada automaticamente polo instalador coas definicións especificadas a seguir.<br />
+$string['databasecreationsettings'] = 'Agora precisa configurar as definicións da base de datos en que a maior parte dos datos do Moodle irán  gardados. Esta base de datos será creada automaticamente polo instalador coas definicións especificadas a seguir.<br />
     <br /> <br />
        <b>Tipo:</b> seleccionado polo instalador como \"mysql\"<br />
        <b>Servidor:</b> seleccionado polo instalador como\"localhost\" <br />
        <b>Nome:</b> nome da base de datos, por exemplo moodle<br />
        <b>Usuario:</b> seleccionado polo instalador como \"root\"<br />
        <b>Contrasinal:</b> contrasinal da súa base de datos<br />
-       <b>Prefixo das táboas:</b> prefixo opcional para todas os nomes das táboas';
-$string['databasecreationsettingshead'] = 'Agora precisa configurar as definicións da base de datos en que a maior parte dos datos do Moodle irán ser gardados. Esta base de datos será creada automaticamente polo instalador coas definicións especificadas a seguir.';
+       <b>Prefixo das táboas:</b> prefixo opcional para todos os nomes das táboas';
+$string['databasecreationsettingshead'] = 'Agora precisa configurar as definicións da base de datos en que a maior parte dos datos do Moodle irán  gardados. Esta base de datos será creada automaticamente polo instalador coas definicións especificadas a seguir.';
 $string['databasecreationsettingssub'] = '<b>Tipo:</b> seleccionado polo instalador como \"mysql\"<br /><b>Servidor:</b> seleccionado polo instalador como\"localhost\" <br />
        <b>Nome:</b> nome da base de datos, por exemplo moodle<br />
        <b>Usuario:</b> seleccionado polo instalador como \"root\"<br />
        <b>Contrasinal:</b> contrasinal da súa base de datos<br />
-       <b>Prefixo das táboas:</b> prefixo opcional para todas os nomes das táboas';
-$string['databasesettings'] = 'Agora precisa configurar as definicións da base de datos en que a maior parte dos datos do Moodle irán ser gardados. Esta base de datos foi creada, así como un nome de usuario e un contrasinal para acceder a ela.<br />
+       <b>Prefixo das táboas:</b> prefixo opcional para todos os nomes das táboas';
+$string['databasesettings'] = 'Agora precisa configurar as definicións da base de datos en que a maior parte dos datos do Moodle irán  gardados. Esta base de datos foi creada, así como un nome de usuario e un contrasinal para acceder a ela.<br />
     <br /> <br />
        <b>Tipo:</b> mysql ou postgres7<br />
        <b>Servidor:</b> Por exemplo localhost ou db.isp.com<br />
@@ -68,7 +69,7 @@ $string['databasesettings'] = 'Agora precisa configurar as definicións da base
        <b>Usuario:</b> nome de usuario da base datos <br />
        <b>Contrasinal:</b> contrasinal da base de datos<br />
        <b>Prefixo das táboas:</b> prefixo opcional para utilizar para todos os nomes das táboas';
-$string['databasesettingshead'] = 'Agora precisa configurar as definicións da base de datos en que a maior parte dos datos do Moodle irán ser gardados. Esta base de datos foi creada, así como un nome de usuario e un contrasinal para acceder a ela.';
+$string['databasesettingshead'] = 'Agora precisa configurar as definicións da base de datos en que a maior parte dos datos do Moodle irán gardados. Esta base de datos foi creada, así como un nome de usuario e un contrasinal para acceder a ela.';
 $string['databasesettingssub'] = '<b>Tipo:</b> mysql ou postgres7<br />
        <b>Servidor:</b> Por exemplo localhost ou db.isp.com<br />
        <b>Nome:</b> nome da base de datos, por exemplo moodle<br />
@@ -112,14 +113,14 @@ $string['databasesettingssub_postgres7'] = '<b>Tipo:</b> PostgreSQL<br />
        <b>Contrasinal:</b> contrasinal da base de datos<br />
        <b>Prefixo das táboas:</b> prefixo para utilizar para todos os nomes da base de datos (obrigatorio)';
 $string['dataroot'] = 'Directorio de datos';
-$string['datarooterror'] = 'O Directorio de datos que especifiou non se conseguiu localizar ou crear.  Corrixa o camiño ou cree o directorio manualmente.';
-$string['dbconnectionerror'] = 'Non se conseguiu realizar a conexión coa base de datos especificada. Verifique as suas definicións de base de datos.';
+$string['datarooterror'] = 'O Directorio de datos que especificou non se conseguiu localizar ou crear.  Corrixa o camiño ou cree o directorio manualmente.';
+$string['dbconnectionerror'] = 'Non se conseguiu realizar a conexión coa base de datos especificada. Verifique as súas definicións de base de datos.';
 $string['dbcreationerror'] = 'Erro ao crear a base de datos. Non foi posible crear o nome da base de datos coas definicións fornecidas';
 $string['dbhost'] = 'Servidor';
 $string['dbpass'] = 'Contrasinal';
 $string['dbprefix'] = 'Prefixo das táboas';
 $string['dbtype'] = 'Tipo';
-$string['dbwrongencoding'] = 'A base de datos seleccionada está a ser executada con unha codificación non recomendada ($a). En vez diso, sería mellor utilizar unha codificación Unicode (UTF-8). Pode ignorar esta proba seleccionando \"Ignorar proba de codificación da BD\" aquí debaixo, mais poderá ter problemas no futuro.';
+$string['dbwrongencoding'] = 'A base de datos seleccionada está a ser executada cunha codificación non recomendada ($a). En vez diso, sería mellor utilizar unha codificación Unicode (UTF-8). Pode ignorar esta proba seleccionando \"Ignorar proba de codificación da BD\" aquí debaixo, mais poderá ter problemas no futuro.';
 $string['dbwronghostserver'] = 'Debe seguir as regras \"Servidor\" como foi explicado anteriormente.';
 $string['dbwrongnlslang'] = 'A variable de ambiente NLS_LANG do seu servidor web debe utilizar conxunto de caracteres AL32UTF8. Vexa a documentación PHP acerca de como configurar OCI8 adecuadamente.';
 $string['dbwrongprefix'] = 'Debe seguir as regras \"Tables Prefix\" como foi explicado anteriormente.';
@@ -158,12 +159,14 @@ $string['downloadlanguagenotneeded'] = 'Debe continuar o proceso de instalación
 $string['downloadlanguagesub'] = 'Agora ten a posibilidade de descargar un paquete de idioma e continuar o proceso de instalación nesa lingua.<br /><br />Se non consegue descargar o paquete de idioma, o proceso de instalación continuará en inglés. (Unha vez finalizado o proceso de instalación terá oportunidade de descargar e instalar paquetes de idioma adicionais.)';
 $string['doyouagree'] = 'Leu e comprendeu estas condicións?';
 $string['environmenterrortodo'] = 'Debe resolver todos os problemas ambientais (erros) que encontrou antes de proceder a instalar esta versión de Moodle!';
-$string['environmenthead'] = 'Verificando o seu ambiente ...';
+$string['environmenthead'] = 'Verificando o seu ámbito ...';
+$string['environmentrecommendcustomcheck'] = 'Se esta comprobación falla significa que hai un problema potencial.';
 $string['environmentrecommendinstall'] = 'está recomendado para ser instalado/activado';
 $string['environmentrecommendversion'] = 'Recoméndase a versión $a->needed e está a executar a $a->current';
+$string['environmentrequirecustomcheck'] = 'Esta proba debe pasar';
 $string['environmentrequireinstall'] = 'é solicitada para ser instalada/activada.';
 $string['environmentrequireversion'] = 'Solicítase a versión $a->needed e está a executar a $a->current';
-$string['environmentsub'] = 'Estamos a comprobar se os diferentes compoñentes do seu sistema compren os requisitos de sistema';
+$string['environmentsub'] = 'Estamos a comprobar se os diferentes compoñentes do seu sistema cumpren os requisitos de sistema';
 $string['environmentxmlerror'] = 'Erro ao ler datos de ambiente ($a->error_code)';
 $string['error'] = 'Erro';
 $string['fail'] = 'Fallo';
@@ -178,7 +181,7 @@ $string['gdversion'] = 'Versión GD';
 $string['gdversionerror'] = 'A biblioteca GD debe estar presente para procesar e crear imaxes';
 $string['gdversionhelp'] = '<p>Parece que o seu servidor non ten instalada a GD.</p>
 
-<p>GD é unha biblioteca requerida por PHP para permitir que o Moodle procese imaxes    (como poden ser as iconas de perfil de usuario) e cree imaxes (como as gráficas de log).  Moodle continuará a funcionar sen a biblioteca GD. Estas funcionalidades non están dispoñibles actualmente.</p>
+<p>GD é unha biblioteca requirida por PHP para permitir que o Moodle procese imaxes (como poden ser as iconas de perfil de usuario) e cree imaxes (como as gráficas de log).  Moodle continuará a funcionar sen a biblioteca GD. Estas funcionalidades non están dispoñibles actualmente.</p>
 
 <p>Para engadir GD a PHP en Unix, compile PHP utilizando o parámetro --with-gd .</p>
 
@@ -213,12 +216,12 @@ $string['magicquotesruntimehelp'] = '<p>Magic quotes runtime debería ser desact
 </p>';
 $string['mbstringrecommended'] = 'A instalación da biblioteca opcional MBSTRING é altamente recomendada na medida en que vai perfeccionar a realización do sitio, particularmente se o seu sitio soporta idiomas non latinos.';
 $string['memorylimit'] = 'Límite de memoria';
-$string['memorylimiterror'] = 'O límite de memoria para PHP estableceuse demasiado baixo... vai ter problemas máis tarde.';
+$string['memorylimiterror'] = 'O límite de memoria para PHP estableceuse demasiado baixo... Vai ter problemas máis tarde.';
 $string['memorylimithelp'] = '<p>O límite de memoria para PHP do seu servidor está actualmente establecido en $a.</p>
 
-<p>Isto fara con que Moodle teña problemas de memoria máis tarde, especialmente se ten un número de módulos significativo e/ou un gran número de usuarios.</p>
+<p>Isto fará que Moodle teña problemas de memoria máis tarde, especialmente se ten un número de módulos significativo e/ou un gran número de usuarios.</p>
 
-<p>Recomendamos que configure PHP con un límite maior se é posible, como por exemplo 16M.  
+<p>Recomendamos que configure PHP cun límite maior se é posible, como por exemplo 16M.  
    Existen varias formas que pode tentar para facer esta modificación:</p>
 <ol>
 <li>Se pode, recompile PHP con <i>--enable-memory-limit</i>.  
@@ -235,7 +238,7 @@ $string['mssql_n'] = 'SQL*Server con soporte para UTF-8 (mssql_n)';
 $string['mssqlextensionisnotpresentinphp'] = 'PHP non foi configurado apropiadamente coa extensión MSSQL polo cal non consegue comunicar co SQL*Server. Verifique o seu ficheiro php.ini ou recompile o PHP.';
 $string['mysql'] = 'MySQL (mysql)';
 $string['mysql416bypassed'] = 'Porén, se o seu sitio SÓ está a utilizar idiomas iso-8859-1 (latín), pode continuar a utilizar o actual MySQL 4.1.12 xa instalado (ou superior).';
-$string['mysql416required'] = 'O MySQL 4.1.16 é a versión mínima requerida para Moodle 1.6 para que garanta que todos os datos se poidan converter para UTF-8 no futuro.';
+$string['mysql416required'] = 'O MySQL 4.1.16 é a versión mínima requirida para Moodle 1.6 para que garanta que todos os datos se poidan converter para UTF-8 no futuro.';
 $string['mysqlextensionisnotpresentinphp'] = 'PHP non foi configurado apropiadamente coa extensión MySQL polo cal non consegue comunicar con MySQL. Verifique o seu ficheiro php.ini ou recompile o PHP.';
 $string['name'] = 'Nome';
 $string['next'] = 'Seguinte';
@@ -248,7 +251,7 @@ $string['opensslrecommended'] = 'A instalación da biblioteca OpenSSL é altamen
 $string['parentlanguage'] = 'pt_utf8';
 $string['pass'] = 'Pasar';
 $string['password'] = 'Contrasinal';
-$string['pgsqlextensionisnotpresentinphp'] = 'PHP non foi configurado apropiadamente coa extensión PGSQL polo cal non consegue comuniar con PostgreSQL. Verifique o seu ficheiro php.ini ou recompile o PHP.';
+$string['pgsqlextensionisnotpresentinphp'] = 'PHP non foi configurado apropiadamente coa extensión PGSQL polo cal non consegue comunicar con PostgreSQL. Verifique o seu ficheiro php.ini ou recompile o PHP.';
 $string['php50restricted'] = 'O PHP contén problemas coñecidos, por favor actualíceo para a versión 5.1 ou desactualíceo para a versión 4.3.x ou 4.4.x';
 $string['phpversion'] = 'Versión PHP';
 $string['phpversionerror'] = 'A versión de PHP debe ser como mínimo 4.3.0 ou 5.1.0 (5.0.x ten problemas coñecidos).';
@@ -261,7 +264,7 @@ $string['previous'] = 'Anterior';
 $string['releasenoteslink'] = 'Para ter información sobre esta versión de Moodle, vexa, en liña, <a target=\"_new\" href=\"$a\">Notas publicadas</a>';
 $string['remotedownloadnotallowed'] = 'O seu servidor non permite a descarga de compoñentes  (allow_url_fopen está desactivada).<br /><br />Debe descargar <a href=\"$a->url\">$a->url</a> o ficheiro manualmente, copialo para \"$a->dest\" no seu servidor e descomprimilo.';
 $string['report'] = 'Informe';
-$string['restricted'] = 'Restrito';
+$string['restricted'] = 'Restrinxido';
 $string['safemode'] = 'Modo seguro';
 $string['safemodeerror'] = 'Moodle poderá ter problemas co modo seguro activado';
 $string['safemodehelp'] = '<p>Moodle poderá ter unha variedade de problemas co modo seguro activo; un dos peores problemas é que probablemente
@@ -270,6 +273,7 @@ $string['safemodehelp'] = '<p>Moodle poderá ter unha variedade de problemas co
 <p>Xeralmente o modo seguro só é activado por algúns administradores paranoicos de sitios web públicos, así que o máis probable é que teña que buscar outra entidade para aloxar o seu sitio Moodle.</p>
    
 <p>Se o desexa pode tentar avanzar na instalación mais estea preparado para posibles problemas máis tarde.</p>';
+$string['serverchecks'] = 'Comprobacións do servidor';
 $string['sessionautostart'] = 'Inicio de sesión automático';
 $string['sessionautostarterror'] = 'Isto debería estar desactivado';
 $string['sessionautostarthelp'] = '<p>Moodle precisa do soporte para sesións e non funcionará sen el.</p>
@@ -281,15 +285,15 @@ $string['thischarset'] = 'UTF-8';
 $string['thisdirection'] = 'ltr';
 $string['thislanguage'] = 'Galego';
 $string['unicoderecommended'] = 'É recomendable que almacene o seus datos en Unicode (UTF-8). As novas instalacións débense efectuar nas bases de datos que teñan os seus caracteres definidos como Unicode por defecto. Se está actualizando, debe efectuar o proceso de migración UTF-8 (vexa a páxina de Administradores).';
-$string['unicoderequired'] = 'É solicitado que almacene todos os seus datos nun formato Unicode(UTF-8). As novas instalacións deben efectuarse nas bases de datos que teñan os seus caracteres definidos como Unicode por defecto. Se está actualizando, debe efectuar o proceso de migración UTF-8 (vexa a páxina de Administradores).';
+$string['unicoderequired'] = 'Cómpre que almacene todos os seus datos nun formato Unicode(UTF-8). As novas instalacións deben efectuarse nas bases de datos que teñan os seus caracteres definidos como Unicode por defecto. Se está actualizando, debe efectuar o proceso de migración UTF-8 (vexa a páxina de Administradores).';
 $string['user'] = 'Usuario';
 $string['welcomep10'] = '$a->installername ($a->installerversion)';
 $string['welcomep20'] = 'Está a ver esta páxina porque conseguiu instalar e iniciar o  paquete <strong>$a->packname $a->packversion</strong> no seu computador. Parabéns!';
 $string['welcomep30'] = 'Esta versión do <strong>$a->installername</strong> inclúe as aplicacións 
-    para crear o ambiente en que <strong>Moodle</strong> pode funcionar, nomeadamente:';
+    para crear o ámbito en que <strong>Moodle</strong> pode funcionar, nomeadamente:';
 $string['welcomep40'] = 'O paquete tamén inclúe <strong>Moodle $a->moodlerelease ($a->moodleversion)</strong>.';
-$string['welcomep50'] = 'A utilización de todas as aplicacións deste paquete rexese polas respectivas licenzas. O paquete <strong>$a->installername</strong> completo é     <a href=\"http://www.opensource.org/docs/definition_plain.html\"> código aberto</a>  ditribuído nos termos da licenza <a href=\"http://www.gnu.org/copyleft/gpl.html\">GPL</a>.';
-$string['welcomep60'] = 'As páxinas seguintes irán conducilo por algúns pasos fáciles   de seguir para configurar o <strong>Moodle</strong> no computador. Pode aceptar a configuración por defecto ou, opcionalmente, utilizar outras mais adecuadas ás súas necesidades.';
+$string['welcomep50'] = 'A utilización de todas as aplicacións deste paquete réxese polas respectivas licenzas. O paquete <strong>$a->installername</strong> completo é     <a href=\"http://www.opensource.org/docs/definition_plain.html\"> código aberto</a>  distribuído nos termos da licenza <a href=\"http://www.gnu.org/copyleft/gpl.html\">GPL</a>.';
+$string['welcomep60'] = 'As páxinas seguintes irán conducilo por algúns pasos fáciles   de seguir para configurar o <strong>Moodle</strong> no computador. Pode aceptar a configuración por defecto ou, opcionalmente, utilizar outras máis adecuadas ás súas necesidades.';
 $string['welcomep70'] = 'Prema o botón \"Seguinte\" debaixo para continuar coa configuración de <strong>Moodle</strong>.';
 $string['wrongdestpath'] = 'Camiño de destino errado.';
 $string['wrongsourcebase'] = 'URL da fonte errado.';

install/lang/he_utf8/installer.php

@@ -149,7 +149,7 @@ $string['dirroot'] = 'ספריית ה-Moodle';
 $string['dirrooterror'] = 'הגדרת ספריית ה-Moodle כנראה איננה נכונה - איננו מוצאים את התקנת Moodle כאן. הערך כאן אותחל.';
 $string['download'] = 'הורדה';
 $string['downloadedfilecheckfailed'] = 'נכשלה בדיקת הקובץ המורד.';
-$string['downloadlanguagebutton'] = 'הורד את ה-"$a" חבילת שפה';
+$string['downloadlanguagebutton'] = 'הורד את חבילת השפה ה-"$a"';
 $string['downloadlanguagehead'] = 'הורד חבילת שפה';
 $string['downloadlanguagenotneeded'] = 'אתה יכול להמשיך את תהליך ההתקנה ע\"י שימוש ב-\"$a\" שפת ברירת המחדל';
 $string['downloadlanguagesub'] = 'כעת יש באפשרותך להוריד חבילת שפה ולהמשיך את תהליך ההתקנה עם שפה זו.
@@ -165,7 +165,7 @@ $string['environmentrequirecustomcheck'] = 'חובה שמבדק זה יצליח'
 $string['environmentrequireinstall'] = 'נדרש להתקין/לאפשר זאת';
 $string['environmentrequireversion'] = 'גירסת $a->needed נדרשת ואתה מריץ $a->current';
 $string['environmentsub'] = 'אנו בודקים את רכיבים השונים';
-$string['environmentxmlerror'] = 'שגיאה בקריאת נתוני סביבה $a->error_cod';
+$string['environmentxmlerror'] = 'שגיאה בקריאת נתוני סביבה $a->error_code';
 $string['error'] = 'טעות';
 $string['fail'] = 'כישלון';
 $string['fileuploads'] = 'העלאת קבצים';
@@ -179,7 +179,7 @@ $string['gdversionhelp'] = '<p> כנראה שלשרת שלך אין GD מותק
 GD היא ספרייה אשר נדרשת ע\"י PHP לאפשר ל-Moodle להפעיל תמונות או צורות (כמו צלמיות פרופיל המשתמש) וליצור תמונות חדשות (כמו גרפים של יומני המעקב). Moodle עדיין יעבוד ללא GD - כך שמאפיינים אלו לא יהיו זמינות לך.</p>
 <p> בכדי להוסיף את GD ל-PHP תחת unix, בצע קומפילציה ל-PHP ע\"י שימוש בפרמטר ה --with.
 </p>
-<p> תחת Windows תוכל בפשטות לערוך את קובץ ה-php.ini ולהסיר את הערה תחץ הפרמטר של php_gd2.dll. </p>';
+<p> תחת Windows תוכל בפשטות לערוך את קובץ ה-php.ini ולהסיר את הערה תחת הפרמטר של php_gd2.dll. </p>';
 $string['globalsquotes'] = 'טיפול לא בטוח של משתנים גלובלים';
 $string['globalsquoteserror'] = 'תקן את הגדרות ה-PHP שלך: נטרל את register_globals  ו/או אפשר את magic_quotes_gpc';
 $string['globalsquoteshelp'] = '<p>צירוף נטרול של Magic Quotes GPC ואיפשור Register Globals בו זמנית לא מומלץ.</p>
@@ -197,6 +197,7 @@ register_globals = Off
 <blockquote>php_value magic_quotes_gpc On</blockquote>
 <blockquote>php_value register_globals Off</blockquote>
 </p>';
+$string['globalswarning'] = 'p><strong>התראת אבטחה</strong>: בכדי להפעיל בצורה תקינה Moodle מצריך <br />שינויים בהגדרות ה-PHP שלך<p/><p>עליך<em> להגדיר</em>  <code>register_globals=off</code>.<p> הגדרה זו מצריכה עריכת קובץ קונפיגורציה <code>php.ini</code>, Apache/IIS <br /> או <code>.htaccess</code> file.</p>';
 $string['help'] = 'עזרה';
 $string['iconvrecommended'] = 'התקנת ספריית ICONV האופציונלית מומלצת ביותר על-מנת לשפר את ביצועי האתר, במיוחד אם האתר נתמך בשפות לא-לטיניות.';
 $string['info'] = 'מידע';
@@ -267,7 +268,7 @@ $string['phpversionerror'] = 'גירסת PHP חייבת להיות לפחות 4.
 $string['phpversionhelp'] = '<p>גירסת PHP חייבת להיות לפחות 4.3.0 או 5.1.0 (בגירסאות 5.0.x קיימות מספר בעיות ידועות) </p>
 <p> במערכת שלך פועלת כרגע גירסת $a </p>
 <p> אתה חייב לשדרג את גירסת ה-PHP שלך או לעבור למחשב מארח עם עם גירסת PHP חדשה! <br/>
-(במקרים של גרסת 5.0.x תוכל גם לרדת בגרסה ל- 4.4.x)
+(במקרים של גרסת 5.0.x תוכל גם לרדת בגירסה ל- 4.4.x)
 </p>';
 $string['postgres7'] = 'PostgreSQL (postgres7';
 $string['previous'] = 'קודם';

install/lang/hi_utf8/installer.php

@@ -9,14 +9,23 @@
 /// File generated by cvs://contrib/lang2installer/installer_builder
 /// using strings defined in stringnames.txt (same dir)
 
+$string['bypassed'] = 'बाइपॅस्ड';
+$string['check'] = 'जाँच';
 $string['closewindow'] = 'इस विन्डो को बन्द कीजिए';
 $string['continue'] = 'जारी रखें';
 $string['database'] = 'डेटाबेस';
 $string['doyouagree'] = 'क्या आपने इन शर्तों को पढ़कर समझ लिया है?';
+$string['error'] = 'गलती';
+$string['help'] = 'सहायता';
+$string['info'] = 'सूचना';
 $string['language'] = 'भाषा';
+$string['moodledocslink'] = 'यह पेज के लिए Moodle डॉक्युमेंटेशन';
 $string['name'] = 'नाम';
 $string['next'] = 'अगला';
+$string['ok'] = 'ठीक';
 $string['password'] = 'पासवर्ड';
+$string['report'] = 'रिपोर्ट';
+$string['status'] = 'दर्जा';
 $string['thischarset'] = 'UTF-8';
 $string['thisdirection'] = 'ltr';
 $string['thislanguage'] = 'िहन्दी';

install/lang/id_utf8/installer.php

@@ -9,18 +9,23 @@
 /// File generated by cvs://contrib/lang2installer/installer_builder
 /// using strings defined in stringnames.txt (same dir)
 
+$string['bypassed'] = 'Bypass';
+$string['check'] = 'Periksa';
 $string['closewindow'] = 'Tutup';
 $string['continue'] = 'lanjut';
 $string['doyouagree'] = 'Apakah Anda telah membaca peraturan ini dan mengerti isinya?';
 $string['error'] = 'Kesalahan';
 $string['help'] = 'Bantuan';
+$string['info'] = 'Informasi';
 $string['invalidemail'] = 'Kesalahan pada alamat email';
 $string['language'] = 'Bahasa';
+$string['moodledocslink'] = 'Dokumen Moodle untuk halaman ini';
 $string['name'] = 'Nama';
 $string['next'] = 'Selanjutnya';
 $string['ok'] = 'OK';
 $string['password'] = 'Password';
 $string['previous'] = 'Sebelumnya';
+$string['report'] = 'Laporan';
 $string['status'] = 'Status';
 $string['thischarset'] = 'UTF-8';
 $string['thisdirection'] = 'ltr';

install/lang/it_utf8/installer.php

@@ -21,11 +21,11 @@ $string['bypassed'] = 'Aggirato';
 $string['cannotcreatelangdir'] = 'Non è possibile creare la cartella delle lingue.';
 $string['cannotcreatetempdir'] = 'Non è possibile creare la cartella temporanea.';
 $string['cannotdownloadcomponents'] = 'Non è possibile scaricare componenti.';
-$string['cannotdownloadzipfile'] = 'Non è possibile scaricare il file compresso.';
+$string['cannotdownloadzipfile'] = 'Non è possibile scaricare file ZIP.';
 $string['cannotfindcomponent'] = 'Non è possibile trovare il componente.';
 $string['cannotsavemd5file'] = 'Non è possibile salvare il file md5.';
-$string['cannotsavezipfile'] = 'Non è possibile salvare il file compresso.';
-$string['cannotunzipfile'] = 'Non è possibile scompattare il file.';
+$string['cannotsavezipfile'] = 'Non è possibile salvare file ZIP.';
+$string['cannotunzipfile'] = 'Non è possibile decomprimere il file.';
 $string['caution'] = 'Attenzione';
 $string['check'] = 'Controlla';
 $string['chooselanguage'] = 'Scegli la lingua';
@@ -35,7 +35,7 @@ $string['closewindow'] = 'Chiudi questa finestra';
 $string['compatibilitysettings'] = 'Controllo impostazioni PHP...';
 $string['compatibilitysettingshead'] = 'Controllo impostazioni PHP...';
 $string['compatibilitysettingssub'] = 'Il vostro server deve passare tutti questi test per permettere a Moodle di funzionare correttamente';
-$string['componentisuptodate'] = 'Componente aggiornato.';
+$string['componentisuptodate'] = 'Il componente è aggiornato.';
 $string['configfilenotwritten'] = 'Il sistema di installazione non è in grado di creare il file config.php contenente le vostre impostazioni, probabilmente perchè la directory di Moodle non è scrivibile. È possibile copiare manualmente il codice seguente in un file chiamato config.php nella directory principale di Moodle.';
 $string['configfilewritten'] = 'Il config.php è stato creato correttamente';
 $string['configurationcomplete'] = 'Configurazione completata';
@@ -79,7 +79,7 @@ $string['directorysettingshead'] = 'Si prega di confermare i posizionamenti di q
 $string['dirroot'] = 'Directory di Moodle';
 $string['dirrooterror'] = 'L\'impostazione \'Directory di Moodle\' sembra essere scorretta - non è possibile trovare un\'installazione di Moodle nel percorso specificato. Il valore sotto è stato ripristinato.';
 $string['download'] = 'Download';
-$string['downloadedfilecheckfailed'] = 'Controllo file scaricato fallito.';
+$string['downloadedfilecheckfailed'] = 'Il controllo del file scaricato non è andato a buon fine.';
 $string['downloadlanguagebutton'] = 'Scarica il language pack "$a"';
 $string['downloadlanguagehead'] = 'Scarica language pack';
 $string['downloadlanguagenotneeded'] = 'È possibile continuare l\'installazione utilizzando il language pack standard, \"$a\"';
@@ -109,12 +109,14 @@ $string['gdversionhelp'] = '<p>Sul vostro server sembra non essere installato il
 <p>Su Windows normalmente è possibile modificare il file php.ini e togliere il commento dalla linea che contiene php_gd2.dll.</p>';
 $string['globalsquotes'] = 'Gestione insicura dei Globals';
 $string['globalsquoteserror'] = 'Correggere le impostazioni PHP: disabilitare register_globals e/o abilitare magic_quotes_gpc';
+$string['globalswarning'] = '<p><strong>Avvertimento per la sicurezza</strong>: per funzionare correttamente, Moodle richiede <br />alcune modifiche alle attuali impostazioni del PHP.<p/><p><em>Bisogna</em> impostare <code>register_globals=off</code>.<p>Questa impostazione può essere modificata editando il vostro <code>php.ini</code>, la configurazione Apache/IIS <br />o il file <code>.htaccess</code>.</p>';
 $string['help'] = 'Aiuto';
 $string['iconvrecommended'] = 'Installare la libreria opzionale ICONV è caldamente consigliato per migliorare le prestazioni del sito, in particolare se il vostro sito supporta lingue non latine.';
 $string['info'] = 'Informazioni';
 $string['installation'] = 'Installazione';
 $string['invalidemail'] = 'Indirizzo email non valido';
 $string['invalidmd5'] = 'MD5 non valido';
+$string['invalidurl'] = 'La URL non è valida';
 $string['language'] = 'Lingua';
 $string['magicquotesruntime'] = 'Magic Quotes Run Time';
 $string['magicquotesruntimeerror'] = 'Questo deve essere impostato a off';
@@ -181,8 +183,9 @@ $string['unicoderequired'] = 'E\' richiesto che tutti i dati vengano memorizzati
 $string['user'] = 'Utente';
 $string['welcomep10'] = '$a->installername ($a->installerversion)';
 $string['wrongdestpath'] = 'Percorso della destinazione errato.';
-$string['wrongsourcebase'] = 'Indirizzo (URL) base sorgente errato.';
-$string['wrongzipfilename'] = 'Nome file compresso errato.';
+$string['wrongsourcebase'] = 'Indirizzo (URL) base errato.';
+$string['wrongzipfilename'] = 'Il nome del file ZIP è sbagliato.';
 $string['wwwroot'] = 'Indirizzo web';
 $string['wwwrooterror'] = 'L\'indirizzo web sembra non essere valido - questa installazione di Moodle non sembra essere li. Il valore è stato reimpostato';
+$string['xmlrpcrecommended'] = 'L\'installazione della estensione opzionale xmlrpc è utile per le funzionalità del Moodle Networking.';
 ?>

install/lang/ja_utf8/installer.php

@@ -181,7 +181,7 @@ $string['downloadlanguagebutton'] = '「 $a 」言語パックをダウンロー
 $string['downloadlanguagehead'] = '言語パックのダウンロード';
 $string['downloadlanguagenotneeded'] = 'デフォルトの言語パック「 $a 」でインストール処理を続けることができます。';
 $string['downloadlanguagepack'] = '言語パックをダウンロードしますか? (yes/no) :';
-$string['downloadlanguagesub'] = 'あなたは、この言語パックをダウンロードして、インストール処理を継続することができます。<br /><br />言語パックのダウンロードを無効にしている場合、インストール処理は英語で継続されます。 (インストール処理が完了した後、他の言語パックをダウンロードして、インストールすることができます。)';
+$string['downloadlanguagesub'] = 'あなたは、言語パックをダウンロードして、この言語でインストールを継続することができます。<br /><br />もし、あなたが言語パックをダウンロードできない場合、インストールは英語で継続されます。 (インストールの完了後、さらに言語パックをダウンロードして、インストールすることができます。)';
 $string['downloadsuccess'] = '言語パックが正常にダウンロードされました。';
 $string['doyouagree'] = '同意しますか ? (yes/no):';
 $string['environmenterrortodo'] = 'このバージョンのMoodleをインストールする前に、発見された動作環境の問題 (エラー) を解消してください!';
@@ -200,13 +200,13 @@ $string['fail'] = '失敗';
 $string['fileuploads'] = 'ファイルアップロード';
 $string['fileuploadserror'] = 'これは有効にしてください。';
 $string['fileuploadshelp'] = '<p>あなたのサーバでは、ファイルのアップロードができないようです。</p>
-<p>Moodleのインストールは可能ですが、ファイルのアップロードができない場合は、コースファイルやユーザプロフィールのイメージをアップロードすることができません。</p>
+<p>Moodleのインストールは可能ですが、ファイルのアップロードができない場合は、コースファイルやユーザプロファイルのイメージをアップロードすることができません。</p>
 <p>ファイルアップロードを可能にするには、あなた (またはシステム管理者) があなたのシステムのメインphp.iniファイルを編集して、<b>file_uploads</b> を \'1\'にする必要があります。</p>';
 $string['gdversion'] = 'GDバージョン';
 $string['gdversionerror'] = 'イメージの処理および作成を行うにはGDライブラリが必要です。';
 $string['gdversionhelp'] = '<p>あなたのサーバには、GDがインストールされていないようです。</p>
 
-<p>GDは、Moodleがイメージ (ユーザプロフィールアイコン等) を処理したり、新しいイメージ (ロググラフ等) を作成するためにPHPが必要とするライブラリです。Moodleは、GDなしでも動作します -  イメージ処理等が使用できないだけです。</p>
+<p>GDは、Moodleがイメージ (ユーザプロファイルアイコン等) を処理したり、新しいイメージ (ロググラフ等) を作成するためにPHPが必要とするライブラリです。Moodleは、GDなしでも動作します -  イメージ処理等が使用できないだけです。</p>
 
 <p>Unix環境下で、GDをPHPにインストールするには、PHPを --with-gd パラメータでコンパイルしてください。</p>
 
@@ -221,6 +221,7 @@ $string['globalsquoteshelp'] = '<p>Magic Quotes GPCの無効化およびRegister
 <blockquote>php_value magic_quotes_gpc On</blockquote>
 <blockquote>php_value register_globals Off</blockquote>
 </p>';
+$string['globalswarning'] = '<p><strong>セキュリティ警告</strong>: Moodleを適切に動作させるため、<br />現在のPHP設定を変更する必要があります。<p/><p><code>register_globals=off</code>  の<em>設定を行って</em>ください。<p>この設定は、<code>php.ini</code>、Apache/IIS <br />設定、または <code>.htaccess</code> ファイルの編集により管理することができます。</p>';
 $string['help'] = 'ヘルプ';
 $string['iconvrecommended'] = 'より良いパフォーマンスを得るため、ICONVライブラリのインストールおよび稼動を強くお勧めします。あなたのサイトがラテン文字以外をサポートしている場合、特にお勧めします。';
 $string['info'] = '情報';
@@ -330,8 +331,8 @@ $string['tableprefix'] = 'テーブル接頭辞 :';
 $string['thischarset'] = 'UTF-8';
 $string['thisdirection'] = 'ltr';
 $string['thislanguage'] = '日本語';
-$string['unicoderecommended'] = 'あなたのすべてのデータをユニコードフォーマット (UTF-8) で保存することをお勧めします。Moodleの新しいインストールは、ユニコードがデフォルトキャラクタにセットされたデータベースに実行される必要があります。アップグレードの場合、UTF-8移行プロセスを実行してださい (詳細は管理ページをご覧ください)。';
-$string['unicoderequired'] = 'あなたのすべてのデータをユニコードフォーマット (UTF-8) で保存することが必須です。Moodleの新しいインストールは、ユニコードがデフォルトキャラクタにセットされたデータベースに実行される必要があります。アップグレードの場合、UTF-8移行プロセスを実行してださい (詳細は管理ページをご覧ください)。';
+$string['unicoderecommended'] = 'あなたのすべてのデータをユニコードフォーマット (UTF-8) で保存することをお勧めします。Moodleの新しいインストールは、ユニコードをデフォルトキャラクタにセットしたデータベースで実行してください。アップグレードの場合、UTF-8移行プロセスを実行してださい (詳細は管理ページをご覧ください)。';
+$string['unicoderequired'] = 'あなたのすべてのデータをユニコードフォーマット (UTF-8) で保存することが必須です。Moodleの新しいインストールは、ユニコードをデフォルトキャラクタにセットしたデータベースで実行してください。アップグレードの場合、UTF-8移行プロセスを実行してださい (詳細は管理ページをご覧ください)。';
 $string['upgradingactivitymodule'] = '活動モジュールのアップグレード';
 $string['upgradingbackupdb'] = 'バックアップデータのアップブレード';
 $string['upgradingblocksdb'] = 'ブロックデータベースのアップグレード';
@@ -390,5 +391,6 @@ $string['wrongsourcebase'] = 'ソースURIベースが正しくありません
 $string['wrongzipfilename'] = 'ZIPファイル名が正しくありません。';
 $string['wwwroot'] = 'ウェブアドレス';
 $string['wwwrooterror'] = '「ウェブアドレス」が正しくありません - インストール済みMoodleはそこに表示されません。下記の値はリセットされました。';
+$string['xmlrpcrecommended'] = '任意のxmlrpc拡張モジュールのインストールは、Moodleネットワーキング機能に有用です。';
 $string['yourchoice'] = 'あなたの選択 :';
 ?>

install/lang/ko_utf8/installer.php

@@ -9,6 +9,7 @@
 /// File generated by cvs://contrib/lang2installer/installer_builder
 /// using strings defined in stringnames.txt (same dir)
 
+$string['aborting'] = '설치 취소';
 $string['admindirerror'] = '지정한 관리 디렉토리가 적절치 않습니다';
 $string['admindirname'] = '관리 디렉토리';
 $string['admindirsetting'] = '간혹 웹호스트 업체는 당신이 관리 구획에 접근할 수 있도록하기 위해 특별한 URL을 사용하거나 관리합니다. 어떤 경우 이 위치가 무들 관리페이지와 충돌할 수도 있습니다. 이 경우 이것을 바꿔서 지정할 수 있는데, 설치과정에서 적어넣었던 관리 디렉토리를  새로 바꿔 적어 넣으면 됩니다.
@@ -41,7 +42,7 @@ $string['checkingphpsettings'] = '/n/n PHP설정 점검 /n/n';
 $string['chooselanguage'] = '언어를 선택하시오';
 $string['chooselanguagehead'] = '언어를 선택하시오';
 $string['chooselanguagesub'] = '설치를 위한 언어를 선택하시오. 설치를 마치고 난 후에도 사이트와 사용자들을 위한 언어팩을 가져와서 다시 바꿀 수 있습니다.';
-$string['closewindow'] = '이 창을 닫기';
+$string['closewindow'] = '창 닫기';
 $string['compatibilitysettings'] = 'PHP 설정을 검사하는 중 ..';
 $string['compatibilitysettingshead'] = 'PHP 설정을 검사하는 중 ..';
 $string['compatibilitysettingssub'] = '당신의 서버는 무들이 잘 작동되기 위한 필요한 모든 테스트를 통과해야 합니다.';
@@ -183,7 +184,7 @@ $string['downloadlanguagepack'] = '/n/n 언어팩을 내려받으시겠습니까
 $string['downloadlanguagesub'] = '이제 언어팩 선택을 하셨기 때문에 추후에는 선택한 언어로 설치를 계속할 수 있습니다.<br /><br />만일 해당 언어팩을 내려받지 못한다면, 영문으로 설치가 계속될 것입니다.(일단 영문으로 프로그램을 깐 후, 다시 또 다른 언어팩을 선택하여 설정할 수 있는 기회가 있습니다)';
 $string['downloadsuccess'] = '언어팩 내려받기 성공';
 $string['doyouagree'] = '동의하십니까? (yes/no) :';
-$string['environmenterrortodo'] = '이 무들버전을 설치하기 전에 앞에서 발견된 모든 환경설정 문제(오류)들을 해결해야 합니다!';
+$string['environmenterrortodo'] = '이 무들버전을 설치하기 전에 앞에서 발견된 모든 환경설정 문제(오류)를 해결해야 합니다!';
 $string['environmenthead'] = '구동환경을 점검합니다...';
 $string['environmentrecommendcustomcheck'] = '만일 이 검사에 실패한다면 잠재적인 문제를 지니고 있는 것입니다.';
 $string['environmentrecommendinstall'] = '설치하거나 활성화할 것을 권고합니다.';
@@ -218,6 +219,7 @@ $string['globalsquoteshelp'] = '<p>magic_quotes_gpc = Off 과 register_globals =
 <blockquote>php_value magic_quotes_gpc On</blockquote>
 <blockquote>php_value register_globals Off</blockquote>
 </p>';
+$string['globalswarning'] = '<p><strong>보안 경고</strong>  : 무들이 바르게 작동하기 위해서는, 현재의 일부 PHP설정을 바꿔야 합니다.<p/><p><em>반드시</em>  <code>register_globals=off</code>로 설정해야 합니다.<br /> 이는 <code>php.ini</code>나 Apache/IIS의  <code>.htaccess</code> 파일의 변수를 조정하면 됩니다.</p>';
 $string['help'] = '도움';
 $string['iconvrecommended'] = '당신의 사이트가 라틴언어계열이 아닌 언어를 지원하는 경우, 사이트의 성능을 향상시키기 위해서는 ICONV라이브러리를 설치할 것을 권장합니다.';
 $string['info'] = '정보';
@@ -226,7 +228,7 @@ $string['inputwebadress'] = '웹 주소 :';
 $string['inputwebdirectory'] = '무들 경로 :';
 $string['installation'] = '설치';
 $string['installationiscomplete'] = '설치 완료! /n';
-$string['invalidargumenthelp'] = '오류 : 잘못된 인수 사용예 : $php cliupgrade.php OPTIONS 좀 더 자세한 내용을 알고 싶으면 --help 옵션을 사용하세요 /n';
+$string['invalidargumenthelp'] = '오류 : 잘못된 인수< /br> 사용예 : $php cliupgrade.php OPTIONS< /br> 좀 더 자세한 내용을 알고 싶으면 --help 옵션을 사용하세요.';
 $string['invalidemail'] = '잘못된 이메일주소';
 $string['invalidhost'] = '잘못된 호스트';
 $string['invalidint'] = '오류 : 정수값이 아닙니다 /n';
@@ -278,7 +280,7 @@ $string['mysqlextensionisnotpresentinphp'] = 'MySQL확장자를 이용해 서버
 $string['mysqli'] = '향상된 MySQL (mysqli)';
 $string['mysqliextensionisnotpresentinphp'] = 'PHP가 MySQLi확장자를 이용해 서버와 연동할 수 있도록 적절하게 설정되지 못해서 MySQL로 통신하게 되었습니다. php.ini 파일을 점검해 보거나 PHP를 다시 컴파일 하십시오.  MySQLi 확장자는 PHP 4에는 사용할 수 없습니다.';
 $string['name'] = '이름';
-$string['next'] = '다음으로';
+$string['next'] = '다음';
 $string['oci8po'] = 'Oracle (oci8po)';
 $string['ociextensionisnotpresentinphp'] = 'OCI8 익스텐션으로 PHP가 오라클서버와 통신하도록 적절히 설정되지 않았습니다. php.ini 파일을 점검하거나 PHP를 다시 컴파일 하십시오.';
 $string['odbc_mssql'] = 'ODBC를 통한 SQL*Server (odbc_mssql)';
@@ -330,8 +332,8 @@ $string['unicoderecommended'] = '모든 자료를 유니코드(UTF-8)로 저장
 $string['unicoderequired'] = '모든 자료가 유니코드(UTF-8)로 저장되야 합니다. 새 설정은 기본 문자코드가 유니코드로 저장되어 있다고 가정하고 작동이 됩니다. 만일 업그레이드 중이라면 반드시 UTF-8 변환과정을 수행하여야만 합니다.(관리화면 참조)';
 $string['upgradingactivitymodule'] = '활동 모듈 갱신';
 $string['upgradingbackupdb'] = '백업 데이터베이스 갱신';
-$string['upgradingblocksdb'] = '블록 데이터베이스 갱신';
-$string['upgradingblocksplugin'] = '블록 플러그인 갱신';
+$string['upgradingblocksdb'] = '블럭 데이터베이스 갱신';
+$string['upgradingblocksplugin'] = '블럭 플러그인 갱신';
 $string['upgradingcompleted'] = '갱신 완료 /n';
 $string['upgradingcourseformatplugin'] = '강좌 포맷 플러그인 갱신';
 $string['upgradingenrolplugin'] = '출석 플러그인 갱신';
@@ -370,7 +372,7 @@ $php cliupgrade.php OPTIONS /n
 --help 본 도움말 출력 /n
 사용예시:
 $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 /n';
-$string['user'] = '사용자';
+$string['user'] = '이용자';
 $string['versionerror'] = '판오류로 인한 사용자 취소';
 $string['welcomep10'] = '$a->installername ($a->installerversion)';
 $string['welcomep20'] = '당신의 컴퓨터에 <strong>$a->packname $a->packversion</strong> 패키지를 성공적으로 설치한 것을 축하합니다!';
@@ -387,5 +389,6 @@ $string['wrongsourcebase'] = '잘못된 소스 URL  베이스';
 $string['wrongzipfilename'] = '잘못된 ZIP 파일명';
 $string['wwwroot'] = '웹 주소';
 $string['wwwrooterror'] = '이 웹 주소는 유효한 것 같지 않습니다 - 무들 설치 프로그램이 거기에 없습니다.';
+$string['xmlrpcrecommended'] = '추가적인 xmlrpc 확장 설치는 무들 네트웍이 제대로 작동하는 데 쓸모가 있습니다.';
 $string['yourchoice'] = '/n 선택 :';
 ?>

install/lang/la_utf8/installer.php

@@ -0,0 +1,24 @@
+<?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['check'] = 'comprobāre';
+$string['continue'] = 'perservā';
+$string['doyouagree'] = 'lēgistine hās condicionēs intellēgistique illōs?';
+$string['help'] = 'auxilium';
+$string['language'] = 'lingua';
+$string['name'] = 'nōmen';
+$string['next'] = 'proximus';
+$string['parentlanguage'] = 'en_utf8';
+$string['thischarset'] = 'UTF-8';
+$string['thisdirection'] = 'ltr';
+$string['thislanguage'] = 'Latin';
+$string['user'] = 'usor';
+?>

install/lang/lv_utf8/installer.php

@@ -9,21 +9,342 @@
 /// File generated by cvs://contrib/lang2installer/installer_builder
 /// using strings defined in stringnames.txt (same dir)
 
+$string['admindirerror'] = 'Norādītais administratora direktorijs ir nepareizs';
+$string['admindirname'] = 'Administratora direktorijs';
+$string['admindirsetting'] = 'Lai piekļūtu vadības panelim vai citai programmai, /admin kā īpašs URL 
+    tiek izmantots tikai dažos tīmekļa resursdatoros.  Diemžēl tas konfliktē ar Moodle 
+    administratoru lapu parastajām atrašanās vietām.  To var labot, 
+    sistēmā pārdēvējot administratora direktoriju un šeit norādot 
+    jauno nosaukumu.  Piemēram: <br /> <br /><b>moodleadmin</b><br /> <br />
+    Šādi sistēmā Moodle tiks izlabotas administratoru saites.';
+$string['admindirsettinghead'] = 'Administratora direktorija iestatīšana...';
+$string['admindirsettingsub'] = 'Lai piekļūtu vadības panelim vai citai programmai, /admin kā īpašs URL 
+    tiek izmantots tikai dažos tīmekļa resursdatoros.  Diemžēl tas konfliktē ar Moodle 
+    administratoru lapu parastajām atrašanās vietām.  To var labot, 
+    sistēmā pārdēvējot administratora direktoriju un šeit norādot 
+    jauno nosaukumu.  Piemēram: <br /> <br /><b>moodleadmin</b><br /> <br />
+    Šādi sistēmā Moodle tiks izlabotas administratoru saites.';
+$string['availablelangs'] = 'Pieejamās valodu pakotnes';
+$string['bypassed'] = 'Apiets';
+$string['cannotcreatelangdir'] = 'Nevar izveidot valodas direktoriju.';
+$string['cannotcreatetempdir'] = 'Nevar izveidot pagaidu direktoriju.';
+$string['cannotdownloadcomponents'] = 'Nevar lejupielādēt komponentus.';
+$string['cannotdownloadzipfile'] = 'Nevar lejupielādēt ZIP failu.';
+$string['cannotfindcomponent'] = 'Nevar atrast komponentu.';
+$string['cannotsavemd5file'] = 'Nevar saglabāt md5 failu.';
+$string['cannotsavezipfile'] = 'Nevar saglabāt ZIP failu.';
+$string['cannotunzipfile'] = 'Nevar tilpatspiest failu.';
+$string['caution'] = 'Brīdinājums.';
+$string['check'] = 'Pārbaudīt';
+$string['chooselanguage'] = 'Izvēlēties valodu';
+$string['chooselanguagehead'] = 'Valodas izvēle';
+$string['chooselanguagesub'] = 'Lūdzu, izvēlieties valodu, kas tiks lietota TIKAI instalēšanas laikā. Vietni un lietotājiem pieejamās valodas vēlāk varēsit izvēlēties citā ekrānā.';
 $string['closewindow'] = 'Aizvērt šo logu';
+$string['compatibilitysettings'] = 'Notiek jūsu PHP iestatījumu pārbaude...';
+$string['compatibilitysettingshead'] = 'PHP iestatījumu pārbaude...';
+$string['compatibilitysettingssub'] = 'Lai sistēma Moodle varētu darboties pareizi, jūsu serverim ir veiksmīgi jānokārto visas šīs pārbaudes';
+$string['componentisuptodate'] = 'Komponents atbilst visjaunākajai versijai.';
+$string['configfilenotwritten'] = 'Instalēšanas skripts nevarēja automātiski izveidot failu config.php, kurā tiek iekļauti visi jūsu izraudzītie iestatījumi, jo Moodle direktorijā, iespējams, nevar ierakstīt failus. Tālāk norādīto kodu varat manuāli iekopēt Moodle saknes direktorijā esošajā failā config.php.';
+$string['configfilewritten'] = 'Fails config.php ir sekmīgi izveidots';
+$string['configurationcomplete'] = 'Konfigurēšana pabeigta';
+$string['configurationcompletehead'] = 'Konfigurēšana pabeigta';
+$string['configurationcompletesub'] = 'Sistēma Moodle mēģināja saglabāt jūsu konfigurāciju failā, kas atrodas jūsu Moodle instalācijas saknes direktorijā.';
 $string['continue'] = 'Turpināt';
-$string['doyouagree'] = 'Vai izlasījāt nosacījumus un sapratāt tos?';
+$string['curlrecommended'] = 'Lai iespējotu Moodle tīklošanas funkcionalitāti, ļoti ieteicams instalēt neobligāto Curl bibliotēku.';
+$string['customcheck'] = 'Citas pārbaudes';
+$string['database'] = 'Datubāze';
+$string['databasecreationsettings'] = 'Tagad ir jāveic tās datubāzes iestatījumu konfigurēšana, kurā tiks
+    saglabāta lielākā daļa Moodle datu.  Instalēšanas programma automātiski izveidos šo datubāzi,
+    izmantojot tālāk norādītos iestatījumus.<br />
+    <br /><br />
+       <b>Tips:</b> instalēšanas programmas noteiktais ir “mysql”
+       <b>Resursdators:</b> instalēšanas programmas noteiktais ir “localhost”
+       <b>Nosaukums:</b> datubāzes nosaukums, piemēram, Moodle<br />
+       <b>Lietotājs:</b> instalēšanas programmas noteiktais ir “root”
+       <b>Parole:</b> datubāzes piekļuves parole<br />
+       <b>Tabulas prefikss:</b> brīvi izraudzīts prefikss izmantošanai visu tabulu nosaukumos';
+$string['databasecreationsettingshead'] = 'Tagad ir jāveic tās datubāzes iestatījumu konfigurēšana, kurā tiks
+    saglabāta lielākā daļa Moodle datu.  Instalēšanas programma automātiski izveidos šo datubāzi,
+    izmantojot tālāk norādītos iestatījumus.';
+$string['databasecreationsettingssub'] = '<b>Tips:</b> instalēšanas programmas noteiktais ir “mysql”
+       <b>Resursdators:</b> instalēšanas programmas noteiktais ir “localhost”
+       <b>Nosaukums:</b> datubāzes nosaukums, piemēram, Moodle<br />
+       <b>Lietotājs:</b> instalēšanas programmas noteiktais ir “root”
+       <b>Parole:</b> datubāzes piekļuves parole<br />
+       <b>Tabulas prefikss:</b> brīvi izraudzīts prefikss izmantošanai visu tabulu nosaukumos';
+$string['databasesettings'] = 'Tagad ir jāveic tās datubāzes konfigurēšana, kurā tiks
+    saglabāta lielākā daļa Moodle datu.  Šai datubāzei ir jābūt jau izveidotai,
+    kā arī jābūt izveidotam datubāzes piekļuves lietotājvārdam un parolei.<br />
+    <br /><br />
+       <b>Tips:</b> mysql vai postgres7<br />
+       <b>Resursdators:</b> piemēram, localhost vai db.isp.com<br />
+       <b>Nosaukums:</b> datubāzes nosaukums, piemēram, Moodle<br />
+       <b>Lietotājs:</b> datubāzes izmantotāja lietotājvārds<br />
+       <b>Parole:</b> datubāzes piekļuves parole<br />
+       <b>Tabulas prefikss:</b> brīvi izraudzīts prefikss izmantošanai visu tabulu nosaukumos';
+$string['databasesettingshead'] = 'Tagad ir jāveic tās datubāzes konfigurēšana, kurā tiks
+    saglabāta lielākā daļa Moodle datu.  Šai datubāzei ir jābūt jau izveidotai,
+    kā arī jābūt izveidotam datubāzes piekļuves lietotājvārdam un parolei.';
+$string['databasesettingssub'] = '<b>Tips:</b> mysql vai postgres7<br />
+       <b>Resursdators:</b> piemēram, localhost vai db.isp.com<br />
+       <b>Nosaukums:</b> datubāzes nosaukums, piemēram, Moodle<br />
+       <b>Lietotājs:</b> datubāzes izmantotāja lietotājvārds<br />
+       <b>Parole:</b> datubāzes piekļuves parole<br />
+       <b>Tabulas prefikss:</b> brīvi izraudzīts prefikss izmantošanai visu tabulu nosaukumos';
+$string['databasesettingssub_mssql'] = '<b>Tips:</b> SQL*Server (ne UTF-8) <b><font color=\"red\">eksperimentāls! (Nav paredzēts izmantošanai darbam.)</font></b><br />
+       <b>Resursdators:</b> piemēram, localhost vai db.isp.com<br />
+       <b>Nosaukums:</b> datubāzes nosaukums, piemēram, Moodle<br />
+       <b>Lietotājs:</b> datubāzes izmantotāja lietotājvārds<br />
+       <b>Parole:</b> datubāzes piekļuves parole<br />
+       <b>Tabulas prefikss:</b> prefikss izmantošanai visu tabulu nosaukumos (obligāts)';
+$string['databasesettingssub_mssql_n'] = '<b>Tips:</b> SQL*Server (ar iespējotu UTF-8)<br />
+       <b>Resursdators:</b> piemēram, localhost vai db.isp.com<br />
+       <b>Nosaukums:</b> datubāzes nosaukums, piemēram, Moodle<br />
+       <b>Lietotājs:</b> datubāzes izmantotāja lietotājvārds<br />
+       <b>Parole:</b> datubāzes piekļuves parole<br />
+       <b>Tabulas prefikss:</b> prefikss izmantošanai visu tabulu nosaukumos (obligāts)';
+$string['databasesettingssub_mysql'] = '<b>Tips:</b> MySQL<br />
+       <b>Resursdators:</b> piemēram, localhost vai db.isp.com<br />
+       <b>Nosaukums:</b> datubāzes nosaukums, piemēram, Moodle<br />
+       <b>Lietotājs:</b> datubāzes izmantotāja lietotājvārds<br />
+       <b>Parole:</b> datubāzes piekļuves parole<br />
+       <b>Tabulas prefikss:</b> prefikss izmantošanai visu tabulu nosaukumos (nav obligāts)';
+$string['databasesettingssub_oci8po'] = '<b>Tips:</b> Oracle<br />
+       <b>Resursdators:</b> nav izmantots, jāatstāj tukšs<br />
+       <b>Nosaukums:</b> savienojumam tnsnames.ora piešķirtais nosaukums<br />
+       <b>Lietotājs:</b> datubāzes izmantotāja lietotājvārds<br />
+       <b>Parole:</b> datubāzes piekļuves parole<br />
+       <b>Tabulas prefikss:</b> prefikss izmantošanai visu tabulu nosaukumos (obligāts, maks. 20 rakstzīmes)';
+$string['databasesettingssub_odbc_mssql'] = '<b>Tips:</b> SQL*Server (over ODBC) <b><font color=\"red\">eksperimentāls! (Nav paredzēts izmantošanai darbam.)</font></b><br />
+       <b>Resursdators:</b> DSN piešķirtais nosaukums ODBC vadības panelī<br />
+       <b>Nosaukums:</b> datubāzes nosaukums, piemēram, Moodle<br />
+       <b>Lietotājs:</b> datubāzes izmantotāja lietotājvārds<br />
+       <b>Parole:</b> datubāzes piekļuves parole<br />
+       <b>Tabulas prefikss:</b> prefikss izmantošanai visu tabulu nosaukumos (obligāts)';
+$string['databasesettingssub_postgres7'] = '<b>Tips:</b> PostgreSQL<br />
+       <b>Resursdators:</b> piemēram, localhost vai db.isp.com<br />
+       <b>Nosaukums:</b> datubāzes nosaukums, piemēram, Moodle<br />
+       <b>Lietotājs:</b> datubāzes izmantotāja lietotājvārds<br />
+       <b>Parole:</b> datubāzes piekļuves parole<br />
+       <b>Tabulas prefikss:</b> prefikss izmantošanai visu tabulu nosaukumos (obligāts)';
+$string['dataroot'] = 'Datu direktorijs';
+$string['datarooterror'] = 'Norādīto vienumu “Datu direktorijs” nevar atrast vai izveidot.  Vai nu labojiet ceļa nosaukumu, vai arī šo direktoriju izveidojiet manuāli.';
+$string['dbconnectionerror'] = 'Nevar izveidot savienojumu ar norādīto datubāzi. Lūdzu, pārbaudiet datubāzes iestatījumus.';
+$string['dbcreationerror'] = 'Datubāzes izveides kļūda. Nevar izveidot piešķirto datubāzes nosaukumu, izmantojot norādītos iestatījumus';
+$string['dbhost'] = 'Resursu serveris';
+$string['dbpass'] = 'Parole';
+$string['dbprefix'] = 'Tabulu prefikss';
+$string['dbtype'] = 'Tips';
+$string['dbwrongencoding'] = 'Atlasītajā datubāzē tiek izmantots kāds no neieteicamajiem kodējumiem ($a). Šī kodējuma vietā labāk izmantot datubāzi ar vienotu kodējumu unikodā (UTF-8). Jebkurā gadījumā šo pārbaudi var apiet, tālāk atzīmējot izvēles rūtiņu “Izlaist datubāzes kodējuma pārbaudi”, tomēr tas vēlāk var izraisīt darbības problēmas.';
+$string['dbwronghostserver'] = 'Jāievēro sadaļā “Resursdators” minētie noteikumi.';
+$string['dbwrongnlslang'] = 'Vides mainīgajam NLS_LANG tīmekļa serverī jāizmanto rakstzīmju kopa AL32UTF8. Lai iegūtu informāciju par pareizu OCI8 konfigurēšanu, skatiet PHP dokumentāciju.';
+$string['dbwrongprefix'] = 'Jāievēro sadaļā “Resursdators” minētie noteikumi.';
+$string['directorysettings'] = '<p>Lūdzu, apstipriniet šīs Moodle instalācijas atrašanās vietu.</p>
+
+<p><b>Tīmekļa adrese:</b>
+norādiet pilnu tīmekļa adresi, kurā tiks veikta piekļuve sistēmai Moodle.  
+Ja jūsu tīmekļa vietnei var piekļūt, izmantojot vairākus URL, izvēlieties 
+piemērotāko, kuru lietos jūsu mācību iestādes studenti.  Nelietojiet 
+noslēdzošo slīpsvītru.</p>
+
+<p><b>Moodle direktorijs:</b>
+norādiet pilnu direktorija ceļu uz šo instalāciju.
+Pārbaudiet lielo un mazo burtu lietojumu.</p>
+
+<p><b>Datu direktorijs:</b>
+ir jānorāda vieta, kurā sistēma Moodle var saglabāt augšupielādētos failus.  Šajā
+direktorijā tīmekļa servera lietotājam (parasti “nobody” vai “apache”) jābūt atļaujai lasīt UN IERAKSTĪT failus, 
+tomēr viņš nedrīkst šim direktorijam piekļūt 
+tieši no tīmekļa.</p>';
+$string['directorysettingshead'] = 'Lūdzu, apstipriniet šī Moodle instalācijas atrašanās vietas';
+$string['directorysettingssub'] = '<b>Tīmekļa adrese:</b>
+norādiet pilnu tīmekļa adresi, kurā tiks veikta piekļuve sistēmai Moodle.  
+Ja jūsu tīmekļa vietnei var piekļūt, izmantojot vairākus URL, izvēlieties 
+piemērotāko, kuru lietos jūsu mācību iestādes studenti.  Nelietojiet 
+noslēdzošo slīpsvītru.
+<br />
+<br />
+<b>Moodle direktorijs:</b>
+norādiet pilnu direktorija ceļu uz šo instalāciju.
+Pārbaudiet lielo un mazo burtu lietojumu.
+<br />
+<br />
+<b>Datu direktorijs:</b>
+ir jānorāda vieta, kurā sistēma Moodle var saglabāt augšupielādētos failus.  Šajā
+direktorijā tīmekļa servera lietotājam (parasti “nobody” vai “apache”) jābūt atļaujai lasīt UN IERAKSTĪT failus, 
+tomēr viņš nedrīkst šim direktorijam piekļūt 
+tieši no tīmekļa.';
+$string['dirroot'] = 'Moodle direktorijs';
+$string['dirrooterror'] = 'Šķiet, ka vienuma “Moodle direktorijs” iestatījums nav pareizs — šajā vietā nevar atrast Moodle instalāciju. Tālāk norādītā vērtība ir atiestatīta.';
+$string['download'] = 'Lejupielādēt';
+$string['downloadedfilecheckfailed'] = 'Lejupielādētā faila pārbaudes rezultāts nesekmīgs.';
+$string['downloadlanguagebutton'] = 'Lejupielādēt &quot;$a&quot; valodas pakotni';
+$string['downloadlanguagehead'] = 'Valodas pakotnes lejupielāde';
+$string['downloadlanguagenotneeded'] = 'Varat turpināt instalēšanu, izmantojot noklusējuma (“{$a}”) valodas pakotni.';
+$string['downloadlanguagesub'] = 'Tagad jums ir iespēja lejupielādēt konkrētas valodas pakotni un turpināt instalēšanu šajā valodā.<br /><br />Ja nevarat lejupielādēt valodas pakotni, instalēšana tiks turpināta angļu valodā. (Pēc instalēšanas pabeigšanas varēsit lejupielādēt un instalēt arī citu valodu pakotnes.)';
+$string['doyouagree'] = 'Vai esat izlasījis šos nosacījumus un tos izpratis?';
+$string['environmenterrortodo'] = 'Pirms turpināt instalēt šo Moodle versiju, novērsiet visas atrastās vides problēmas (kļūdas)!';
+$string['environmenthead'] = 'Vides pārbaude...';
+$string['environmentrecommendcustomcheck'] = 'ja šis tests neizpildās korekti, tas norāda uz potenciālu problēmu';
+$string['environmentrecommendinstall'] = 'ieteicams instalēt/iespējot';
+$string['environmentrecommendversion'] = 'ieteicama versija $a->needed, bet jūs izmantojat versiju $a->current';
+$string['environmentrequirecustomcheck'] = 'šim testam ir jāizpildās';
+$string['environmentrequireinstall'] = 'nepieciešams instalēt/iespējot';
+$string['environmentrequireversion'] = 'nepieciešama versija $a->needed, bet jūs izmantojat versiju $a->current';
+$string['environmentsub'] = 'Tiek veikta pārbaude, vai dažādi jūsu sistēmas komponenti atbilst sistēmas prasībām.';
+$string['environmentxmlerror'] = 'Lasot vides datus, radās kļūda ($a->error_code)';
 $string['error'] = 'Kļūda';
+$string['fail'] = 'Neveiksme';
+$string['fileuploads'] = 'Failu augšupielāde';
+$string['fileuploadserror'] = 'Šai funkcijai jābūt aktivizētai';
+$string['fileuploadshelp'] = '<p>Šķiet, ka failu augšupielāde jūsu serverī ir atspējota.</p>
+
+<p>Sistēmu Moodle joprojām var instalēt, tomēr bez šīs iespējas nevarēsit 
+   augšupielādēt kursu failus vai jauno lietotāju profilu attēlus.</p>
+
+<p>Lai iespējotu failu augšupielādi, jums (vai sistēmas administratoram) 
+   ir jārediģē sistēmas galvenais fails php.ini un 
+   parametra <b>file_uploads</b> iestatījums jānomaina uz “1”.</p>';
+$string['gdversion'] = 'GD versija';
+$string['gdversionerror'] = 'Lai varētu apstrādāt un izveidot attēlus, ir jābūt instalētai GD bibliotēkai.';
+$string['gdversionhelp'] = '<p>Šķiet, ka jūsu serverī nav instalēta GD.</p>
+
+<p>GD ir bibliotēka, kas ir nepieciešama PHP, lai sistēmā Moodle varētu apstrādāt attēlus 
+   (piemēram, lietotāju profilu ikonas) un izveidot jaunus attēlus (piemēram, 
+   reģistrācijas datu diagrammas).  Sistēma Moodle turpinās darboties arī bez GD — tikai šie līdzekļi 
+   jums nebūs pieejami.</p>
+
+<p>Lai sistēmā Unix bibliotēku GD pievienotu PHP, kompilējiet PHP, izmantojot parametru --with-gd.</p>
+
+<p>Sistēmā Windows parasti var rediģēt failu php.ini, kā arī noņemt komentāra statusu rindai ar atsauci uz failu php_gd2.dll.</p>';
+$string['globalsquotes'] = 'Riskanta vispārīgo iestatījumu apstrādes metode';
+$string['globalsquoteserror'] = 'PHP iestatījumu labošana: atspējojiet register_globals un/vai iespējojiet magic_quotes_gpc';
+$string['globalsquoteshelp'] = '<p>Nav ieteicams atspējot funkciju Magic Quotes GPC un vienlaikus iespējot funkciju Register Globals.</p>
+
+Failā php.ini ieteicams norādīt iestatījumu <b>magic_quotes_gpc = On</b> un <b>register_globals = Off</b>
+
+Ja jums nav piekļuves failam php.ini, Moodle direktorija failā .htaccess, iespējams, varat ierakstīt 
+   šādu rindu:
+   <blockquote>php_value magic_quotes_gpc On</blockquote>
+   <blockquote>php_value register_globals Off</blockquote>
+</p>';
+$string['globalswarning'] = '<p><strong>Drošības brīdinājums</strong>: lai Moodle darbotos korekti, nepieciešams, <br />lai jūs veiktu noteiktas izmaiņas jūsu pašreizējos PHP iestatījumos.<p/><p>Jums ir <em>obligāti</em> jāiestata <code>register_globals=off</code>.<p>Šis iestatījums ir maināms, rediģējot vai nu Apache/IIS servera <br />konfigurācijas failu <code>php.ini</code>, vai arī <code>.htaccess</code> failu.</p>';
 $string['help'] = 'Palīdzība';
+$string['iconvrecommended'] = 'Ļoti ieteicama neobligātās ICONV bibliotēkas instalēšana, lai uzlabotu vietnes veiktspēju, īpaši, ja vietne atbalsta valodas, kuru pamatā nav latīņu alfabēta.';
+$string['info'] = 'Informācija';
+$string['installation'] = 'Instalēšana';
 $string['invalidemail'] = 'Nederīga e-pasta adrese';
+$string['invalidmd5'] = 'Nederīgs md5';
+$string['langdownloaderror'] = '“{$a}” valodas pakotne diemžēl netika instalēta. Instalēšana tiks turpināta angļu valodā.';
+$string['langdownloadok'] = '“{$a}” valodas pakotne tika sekmīgi instalēta. Instalēšana tiks turpināta šajā valodā.';
 $string['language'] = 'Valoda';
+$string['magicquotesruntime'] = 'Magic Quotes Run Time';
+$string['magicquotesruntimeerror'] = 'Šai funkcijai jābūt deaktivizētai';
+$string['magicquotesruntimehelp'] = '<p>Lai sistēma Moodle darbotos pareizi, funkcijai Magic Quotes Runtime jābūt izslēgtai.</p>
+
+<p>Pēc noklusējuma tā parasti ir izslēgta — skatiet parametra <b>magic_quotes_runtime</b> iestatījumu failā php.ini.</p>
+
+Ja jums nav piekļuves failam php.ini, Moodle direktorija failā .htaccess, iespējams, varat ierakstīt 
+   šādu rindu:
+   <blockquote>php_value magic_quotes_runtime Off</blockquote>
+</p>';
+$string['mbstringrecommended'] = 'Ļoti ieteicama neobligātās MBSTRING bibliotēkas instalēšana, lai uzlabotu vietnes veiktspēju, īpaši, ja vietne atbalsta valodas, kuru pamatā nav latīņu alfabēta.';
+$string['memorylimit'] = 'Atmiņas apjoma ierobežojums';
+$string['memorylimiterror'] = 'PHP atmiņas apjoms ir diezgan ierobežots — tas vēlāk var izraisīt problēmas.';
+$string['memorylimithelp'] = '<p>Pašlaik iestatītais PHP atmiņas apjoma ierobežojums jūsu serverī ir $a.</p>
+
+<p>Sistēmā Moodle tas vēlāk var izraisīt atmiņas izmantošanas problēmas, it īpaši tad, 
+   ja būsit iespējojis lielu skaitu moduļu un/vai lietotāju.</p>
+
+<p>Ieteicams konfigurēt PHP ar pēc iespējas lielāku atmiņas apjomu, piemēram, 40 MB.  
+   Ir vairāki veidi, kā to var izdarīt, piemēram:</p>
+<ol>
+<li>Ja iespējams, atkārtoti kompilējiet PHP, izmantojot <i>--enable-memory-limit</i>.  
+    Šādā gadījumā sistēma Moodle atmiņas apjoma ierobežojumu varēs iestatīt automātiski.</li>
+<li>Ja jums ir piekļuve php.ini failam, varat mainīt tajā esošo parametra <b>memory_limit</b> 
+    iestatījumu, piemēram, uz 40 MB.  Ja jums nav piekļuves šim failam, palūdziet 
+    to izdarīt administratoram.</li>
+<li>Dažos PHP serveros Moodle direktorijā var izveidot failu .htaccess, kurā 
+    ir šāda rinda:
+    <p><blockquote>php_value memory_limit 40M</blockquote></p>
+    <p>Tomēr dažos serveros tas neļaus darboties <b>nevienai</b> PHP lapai 
+    (atverot šīs lapas, tiks parādīti kļūdas ziņojumi), un fails .htaccess būs jānoņem.</p></li>
+</ol>';
+$string['missingrequiredfield'] = 'Trūkst kāda nepieciešamā lauka';
+$string['moodledocslink'] = 'Šai lapai paredzētie Moodle dokumenti';
+$string['mssql'] = 'SQL*Server (mssql)';
+$string['mssql_n'] = 'SQL*Server ar UTF-8 atbalstu (mssql_n)';
+$string['mssqlextensionisnotpresentinphp'] = 'PHP ar paplašinājumu MSSQL nav pareizi konfigurēta un nevar sazināties ar SQL*Server.  Lūdzu, pārbaudiet php.ini failu vai atkārtoti kompilējiet PHP.';
+$string['mysql'] = 'MySQL (mysql)';
+$string['mysql416bypassed'] = 'Tomēr, ja jūsu vietnē tiek lietotas TIKAI iso-8859-1 (latīņu) valodas, varat joprojām izmantot savu pašlaik instalēto MySQL 4.1.12 (vai jaunāku versiju).';
+$string['mysql416required'] = 'MySQL 4.1.16 ir minimālā versija, kas nepieciešama sistēmai Moodle 1.6, lai nākotnē garantētu iespēju visus datus pārvērst par UTF-8 datiem.';
+$string['mysqlextensionisnotpresentinphp'] = 'PHP ar paplašinājumu MySQL nav pareizi konfigurēta un nevar sazināties ar MySQL.  Lūdzu, pārbaudiet php.ini failu vai atkārtoti kompilējiet PHP.';
 $string['name'] = 'Nosaukums';
-$string['next'] = 'Tālāk';
-$string['ok'] = 'OK';
+$string['next'] = 'Nākamais';
+$string['oci8po'] = 'Oracle (oci8po)';
+$string['ociextensionisnotpresentinphp'] = 'PHP ar paplašinājumu OCI8 nav pareizi konfigurēta un nevar sazināties ar Oracle.  Lūdzu, pārbaudiet php.ini failu vai atkārtoti kompilējiet PHP.';
+$string['odbc_mssql'] = 'SQL*Server over ODBC (odbc_mssql)';
+$string['odbcextensionisnotpresentinphp'] = 'PHP ar paplašinājumu ODBC nav pareizi konfigurēta un nevar sazināties ar SQL*Server.  Lūdzu, pārbaudiet php.ini failu vai atkārtoti kompilējiet PHP.';
+$string['ok'] = 'Labi';
+$string['opensslrecommended'] = 'Lai iespējotu Moodle tīklošanas funkcionalitāti, ļoti ieteicams instalēt neobligāto OpenSSL bibliotēku.';
+$string['parentlanguage'] = '<< TULKOTĀJI: Ja jūsu valodai ir vecākvaloda, kura būtu jālieto gadījumā, kad valodu resursi jūsu valodas pakotnē iztrūkst, lūdzu norādiet šīs valodas kodu šeit. Ja jūs to atstājat tukšu, tiek lietota angļu valoda. Piemērs: nl >>';
+$string['pass'] = 'Nokārtots';
 $string['password'] = 'Parole';
+$string['pgsqlextensionisnotpresentinphp'] = 'PHP ar paplašinājumu PGSQL nav pareizi konfigurēta un nevar sazināties ar PostgreSQL.  Lūdzu, pārbaudiet php.ini failu vai atkārtoti kompilējiet PHP.';
+$string['php50restricted'] = 'PHP versijā 5.0.x ir vairākas zināmas problēmas, lūdzu, jauniniet uz versiju 5.1.x vai pazeminiet uz versiju 4.3.x vai 4.4.x';
+$string['phpversion'] = 'PHP versija';
+$string['phpversionerror'] = 'PHP versijai jābūt vismaz 4.3.0 vai 5.1.0 (versijai 5.0.x piemīt vairākas zināmas problēmas).';
+$string['phpversionhelp'] = '<p>Sistēmā Moodle jāizmanto PHP, kuras versija ir vismaz 4.3.0 vai 5.1.0 (versijai 5.0.x piemīt vairākas zināmas problēmas).</p>
+<p>Jūs pašlaik lietojat versiju $a</p>
+<p>Ir jājaunina PHP vai jāpāriet uz resursdatoru, kurā tiek izmantota jaunāka PHP versija.</p>
+(Ja PHP versija ir 5.0.x, var arī atkāpties uz versiju 4.4.x)</p>';
+$string['postgres7'] = 'PostgreSQL (postgres7)';
 $string['previous'] = 'Iepriekšējais';
+$string['releasenoteslink'] = 'Lai iegūtu informāciju par šo sistēmas Moodle versiju, skatiet tiešsaistes <a target=\"_new\" href=\"$a\">Piezīmes par laidienu</a>';
+$string['remotedownloadnotallowed'] = 'Komponentu lejupielāde jūsu serverī nav atļauta (iestatījums allow_url_fopen ir atspējots).<br /><br />Lejupielādējiet šo <a href=\"$a->url\">$a->url</a> failu manuāli, kopējiet to sava servera atrašanās vietā “{$a->dest}” un veiciet tā tilpatspiešanu.';
+$string['report'] = 'Atskaite';
+$string['restricted'] = 'Ierobežots';
+$string['safemode'] = 'Drošais režīms';
+$string['safemodeerror'] = 'Ja ir ieslēgts drošais režīms, sistēmā Moodle tas var izraisīt darbības problēmas';
+$string['safemodehelp'] = '<p>Ja ir ieslēgts drošais režīms, sistēmā Moodle tas var izraisīt vairākas problēmas, piemēram, 
+   iespējams, nebūs atļauts izveidot jaunus failus.</p>
+   
+<p>Drošais režīms parasti tiek iespējots publiskos tīmekļa resursdatoros, kas tiek pārspīlēti sargāti, tādēļ 
+   savai Moodle vietnei jums, iespējams, tikai jāatrod cits tīmekļa resursu pakalpojumu uzņēmums.</p>
+   
+<p>Ja vēlaties, varat turpināt instalēšanu, tomēr jārēķinās, ka vēlāk var tikt izraisītas dažas problēmas.</p>';
+$string['serverchecks'] = 'Servera pārbaudes';
+$string['sessionautostart'] = 'Automātiska sesijas startēšana';
+$string['sessionautostarterror'] = 'Šai funkcijai jābūt deaktivizētai';
+$string['sessionautostarthelp'] = '<p>Sistēmā Moodle ir nepieciešams sesijas atbalsts, un sistēma bez šī atbalsta nedarbosies.</p>
+
+<p>Sesijas var iespējot failā php.ini — atrodiet parametru session.auto_start.</p>';
+$string['skipdbencodingtest'] = 'Izlaist datubāzes kodējuma pārbaudi';
 $string['status'] = 'Statuss';
 $string['thischarset'] = 'UTF-8';
 $string['thisdirection'] = 'ltr';
 $string['thislanguage'] = 'Latviešu';
+$string['unicoderecommended'] = 'Ieteicama visu jūsu datu glabāšana unikoda (UTF-8) formātā. Jaunas instalācijas ir jāveic datubāzēs, kurās ir iestatīta unikoda noklusējuma rakstzīmju kopa. Ja veicat jaunināšanu, jāveic UTF-8 migrācija (skatiet administratora lapu).';
+$string['unicoderequired'] = 'Visi jūsu dati ir jāglabā unikoda formātā (UTF-8). Jaunas instalācijas ir jāveic datubāzēs, kurās ir iestatīta unikoda noklusējuma rakstzīmju kopa. Ja veicat jaunināšanu, jāveic UTF-8 migrācija (skatiet administratora lapu).';
 $string['user'] = 'Lietotājs';
+$string['welcomep10'] = '$a->installername ($a->installerversion)';
+$string['welcomep20'] = 'Jūs redzat šo lapu, jo esat veiksmīgi instalējis un 
+    palaidis savā datorā pakotni <strong>$a->packname $a->packversion</strong>. Apsveicam!';
+$string['welcomep30'] = 'Šajā <strong>$a->installername</strong> laidienā ir iekļautas lietojumprogrammas, 
+    kas paredzētas, lai izveidotu vidi, kurā darbosies sistēma <strong>Moodle</strong>, proti:';
+$string['welcomep40'] = 'Pakotnē ir iekļauta arī sistēma <strong>Moodle $a->moodlerelease ($a->moodleversion)</strong>.';
+$string['welcomep50'] = 'Visu šīs pakotnes lietojumprogrammu izmantošanu regulē attiecīgo 
+    licenču nosacījumi. Visā <strong>$a->installername</strong> pakotnē ir iekļauts 
+    <a href=\"http://www.opensource.org/docs/definition_plain.html\">atklātais pirmkods</a>, un tā tiek izplatīta 
+    saskaņā ar <a href=\"http://www.gnu.org/copyleft/gpl.html\">GPL</a> licences nosacījumiem.';
+$string['welcomep60'] = 'Nākamajās lapās tiks sniegti vienkārši norādījumi par to, kā 
+    datorā konfigurēt un iestatīt sistēmu <strong>Moodle</strong>. Varat akceptēt noklusējuma 
+    iestatījumus vai varat tos mainīt, lai pielāgotu savām vajadzībām.';
+$string['welcomep70'] = 'Noklikšķiniet uz pogas Tālāk, lai turpinātu sistēmas <strong>Moodle</strong> instalēšanu.';
+$string['wrongdestpath'] = 'Nepareizs mērķa ceļš.';
+$string['wrongsourcebase'] = 'Nepareiza avota URL bāze.';
+$string['wrongzipfilename'] = 'Nepareizs ZIP faila nosaukums.';
+$string['wwwroot'] = 'Tīmekļa adrese';
+$string['wwwrooterror'] = 'Iestatījums “Tīmekļa adrese”, šķiet, ir nederīgs, jo šī sistēmas Moodle instalācija tajā nav atrodama. Tālāk norādītā vērtība ir atiestatīta.';
+$string['xmlrpcrecommended'] = 'Neobligātās xmlrpc pakotnes uzstādīšana ir noderīga Moodle tīklošanas funkcionalitātei.';
 ?>

install/lang/mi_wwow_utf8/installer.php

@@ -80,9 +80,9 @@ $string['doyouagree'] = 'Kua pānui i ēnei herenga, ā, he mārama ki a koe?';
 $string['environmenterrortodo'] = 'Me ea koe i ngā raru taiao katoa (hapa) i kitea i runga, i mua i te tāutatanga o tēnei putanga o Moodle!';
 $string['environmenthead'] = 'E taki ana i tō taiao …';
 $string['environmentrecommendinstall'] = 'e tūtohutia ana kia tāuta/whakahohe';
-$string['environmentrecommendversion'] = 'putanga $a->e hiahiatia ana e tūtohu ana, ā, kei te whakahaere koe i te $a->ōnāianei';
+$string['environmentrecommendversion'] = 'putanga $a->needed hiahiatia ana e tūtohu ana, ā, kei te whakahaere koe i te $a->current';
 $string['environmentrequireinstall'] = 'e hiahiatia ana kia tāuta/whakahohe.';
-$string['environmentrequireversion'] = 'putanga $a->e hiahiatia ana, ā, kei te whakahaere koe i te $a->ōnāianei';
+$string['environmentrequireversion'] = 'putanga $a->needed hiahiatia ana, ā, kei te whakahaere koe i te $a->current';
 $string['environmentsub'] = 'E taki ana mehemea he tika āu wae pūnaha maha mō ngā hiahiatanga o tēnei pūnaha';
 $string['environmentxmlerror'] = 'I hapa te pānui i ngā raraunga taiao ($a->error_code)';
 $string['error'] = 'Hapa';
@@ -156,10 +156,10 @@ $string['thislanguage'] = 'Māori - Waikato';
 $string['unicoderecommended'] = 'E tūtohitia ana te penapena i ō raraunga katoa hei Unicode (UTF-8). Ko te tikanga me mahi i ngā tāutatanga hōu ki ngā pātengi raraunga ko te pūāhua taunoa he Unicode. Mēnā e whakahōu ana koe, me mahi i te tuka heke UTF8 (tirohia te whārangi Whakahaere).';
 $string['unicoderequired'] = 'E hiahiatia ana kia penapena koe i ō raraunga katoa ki te hōputu Unicode (UTF-8). Ko te tikanga me mahi i ngā tāutatanga hōu ki ngā pātengi raraunga ko te pūāhua taunoa he Unicode. Mēnā e whakahōu ana koe, me mahi i te tuka heke UTF8 (tirohia te whārangi Whakahaere).';
 $string['user'] = 'Kaiwhakamahi';
-$string['welcomep10'] = '$a->ingoapūtāuta ($a->putangapūtāuta)';
-$string['welcomep20'] = 'Ka taea e koe te kite i tēnei whārangi nātemea kua tāuta tika, whakarewa tika hoki koe i te pōkai <strong>$a->ingoapōkai $a->putangapōkai</strong> i tō rorohiko. Ngā mihi!';
+$string['welcomep10'] = '$a->installername ($a->installerversion)';
+$string['welcomep20'] = 'Ka taea e koe te kite i tēnei whārangi nātemea kua tāuta tika, whakarewa tika hoki koe i te pōkai <strong>$a->packname $a->packversion</strong> i tō rorohiko. Ngā mihi!';
 $string['welcomep30'] = 'Kei roto hoki i tēnei <strong>$a->installername</strong> he taupānga hei hanga i tētahi taiao whakahaere tino pai mō <strong>Moodle</strong>, arā ko';
-$string['welcomep40'] = 'Kei roto hoki i tēnei pōkai he <strong>Moodle $a->wetekangamoodle($a->putangamoodle)</strong>.';
+$string['welcomep40'] = 'Kei roto hoki i tēnei pōkai he <strong>Moodle $a->moodlerelease($a->moodleversion)</strong>.';
 $string['welcomep50'] = 'Kei raro katoa te whakamahinga o ia taupānga i āna ake raihana. He pūtake tuwhera <a href=\"http://www.opensource.org/docs/definition_plain.html\"> te pōkai katoa <strong>$a->installername</strong>, ā,</a>ka tūaritia atu i raro i te raihana<a href=\"http://www.gnu.org/copyleft/gpl.html\">GPL</a>.';
 $string['welcomep60'] = 'Mā ngā whārangi e whai mai nei ka arataki i a koe ki te whirihora me te whakarite i a <strong>Moodle</strong> i runga i tō rorohiko.';
 $string['welcomep70'] = 'Pāwhiritia te pātene \"Panuku\" kia whakarite tonu ai i a <strong>Moodle</strong>.';

install/lang/nl_utf8/installer.php

@@ -9,6 +9,7 @@
 /// File generated by cvs://contrib/lang2installer/installer_builder
 /// using strings defined in stringnames.txt (same dir)
 
+$string['aborting'] = 'Installatie afbreken';
 $string['admindirerror'] = 'De admin-map die je opgeeft is niet juist';
 $string['admindirname'] = 'Admin-map';
 $string['admindirsetting'] = 'Enkele webhosts gebruiken /admin als speciale URL  om je toegang te geven tot een controlepaneel of iets dergelijks. Jammer genoeg geeft dit conflicten met de standaardmap voor de Moodle-beheerpagina\'s. Je kunt dit toch aan het werk krijgen door de adminmap van jouw installatie te hernoemen en deze nieuwe mapnaam hier te zetten. Bijvoorbeeld <br /> <br /><b>moodleadmin</b><br /> <br />. Dit zal alle beheerlinks in Moodle aanpassen.';
@@ -217,6 +218,7 @@ $string['globalsquoteshelp'] = '<p>De combinatie van uitgeschakelde Magic Quotes
 <blockquote>php_value magic_quotes_gpc On</blockquote>
 <blockquote>php_value register_globals Off</blockquote>
 </p>';
+$string['globalswarning'] = '<p><strong>Veiligheidswaarschuwing</strong>:om Moodle goed te laten werken, is het nodig <br />dat je enkele wijzigingen maakt in je huidige PHP-instellingen.</p><p>Je <em>moet</em> <code>register_globals=off</code> instellen.</p><p>Deze instelling kan aangepast worden door je <code>php.ini</code>, Apache/IIS <br /> configuratie aan te passen of door een <code>.htaccess</code>-bestand te gebruiken.';
 $string['help'] = 'Help';
 $string['iconvrecommended'] = 'Als je site andere talen dan die uit de Latin1 tekenset gebruikt, dan is het installeren van de optionele ICONV library ten zeerste aangeraden om de performantie van de site te verhogen.';
 $string['info'] = 'Informatie';
@@ -384,5 +386,6 @@ $string['wrongsourcebase'] = 'Foute URL voor de bron';
 $string['wrongzipfilename'] = 'Foute ZIP-bestandsnaam';
 $string['wwwroot'] = 'Web adres';
 $string['wwwrooterror'] = 'Het webadres lijkt niet geldig te zijn - deze Moodle-installatie is blijkbaar niet op die plaats.';
+$string['xmlrpcrecommended'] = 'Het installeren van de optionele XMLRPC-extentie is nuttig voor de werking van Moodle Netwerk';
 $string['yourchoice'] = 'Jouw keuze:';
 ?>

install/lang/no_utf8/installer.php

@@ -93,6 +93,12 @@ $string['databasesettingssub_mysql'] = '<b>Type:</b> MySQL<br />
 <b>Bruker:</b> ditt brukernavn til databasen<br />
 <b>Passord:</b> databasepassordet ditt<br />
 <b>Tabell prefix:</b> prefiks å bruke foran alle tabellnavnene (valgfritt)';
+$string['databasesettingssub_mysqli'] = '<b>Type:</b> Forbedret MySQL<br />
+<b>Vert:</b> f.eks localhost or db.isp.no<br />
+<b>Navn:</b> databasenavn, eks moodle<br />
+<b>Bruker<:</b> databasebrukernavnet ditt<br />
+<b>Password:</b> databasepassordet ditt<br />
+<b>Tabellprefiks:</b> prefiks å bruke for alle tabell navn (valgfritt)';
 $string['databasesettingssub_oci8po'] = '<b>Type:</b> Oracle<br />
 <b>Vert:</b> brukes ikke, må være blank<br />
 <b>Navn:</b> gitt navn på tnsnames.ora forbindelsen<br />
@@ -111,6 +117,7 @@ $string['databasesettingssub_postgres7'] = '<b>Type:</b> PostgreSQL<br />
 <b>Bruker:</b> ditt brukernavn til databasen<br />
 <b>Passord:</b> databasepassordet ditt<br />
 <b>Tabell prefix:</b> prefiks å bruke foran alle tabellnavnene (obligatorisk)';
+$string['databasesettingswillbecreated'] = '<b>NB:</b> Installeringen vil prøve å lage databasen automatisk hvis den ikke eksisterer.';
 $string['dataroot'] = 'Datamappe';
 $string['datarooterror'] = '\"Datamappen\" du oppga kunne ikke bli funnet eller opprettet. Vennligst rett stien eller opprett katalogen manuelt.';
 $string['dbconnectionerror'] = 'Fikk ingen forbindelse til databasen du oppga. Vennligst sjekk database-innstillingene dine.';
@@ -193,6 +200,7 @@ $string['globalsquoteshelp'] = '<p>Kombinasjonen av avslått Magic Quotes GPC og
 <blockquote>php_value magic_quotes_gpc On</blockquote>
 <blockquote>php_value register_globals Off</blockquote>
 </p>';
+$string['globalswarning'] = '<p><strong>Sikkerhetsadvarsel</strong>: for å virke ordentlig trenger Moodle <br />at du gjør enkelte endringer i din nåværende PHP-innstillinger.<p/><p>Du <em>må</em> sette <code>register_globals=off</code>.<p>Denne innstillingen redigeres ved å endre din <code>php.ini</code>fil, Apache/IIS <br />konfigurasjon eller  <code>.htaccess</code> file.</p>';
 $string['help'] = 'Hjelp';
 $string['iconvrecommended'] = 'Installering av ICONV-biblioteket er sterkt anbefalt for å forbedre ytelsen, spesielt hvis siten din støtter ikke-latinske språk.';
 $string['info'] = 'Informasjon';
@@ -236,6 +244,8 @@ $string['mysql'] = 'MySQL (mysql)';
 $string['mysql416bypassed'] = 'Likevel, dersom Moodle-siten bare bruker iso-8859-1 (latin, KAN du likevel bruke din installerte MySQL 4.1.12 (eller høyere).';
 $string['mysql416required'] = 'MySQL 4.1.16 er minstekravet for Moodle 1.6.x, hvis vi skal garantere at alle data skal kunne konverteres til UTF-8 i fremtiden.';
 $string['mysqlextensionisnotpresentinphp'] = 'PHP har ikke blitt ordentlig konfigurert med MySQL innstillingene slik at den kan kommunisere med MySQL. Vær vennlig å sjekk php.ini fila di eller rekompiler PHP.';
+$string['mysqli'] = 'Forbedret MySQL (mysqli)';
+$string['mysqliextensionisnotpresentinphp'] = 'PHP er ikke ordentlig innstilt med MySQLi tillegget slik at den kan kommunisere med MySQL. Sjekk php.ini fila di eller rekompiler PHP. MySQLi tillegget finnes ikke for PHP 4.';
 $string['name'] = 'Navn';
 $string['next'] = 'Neste';
 $string['oci8po'] = 'Oracle (oci8po)';
@@ -297,4 +307,5 @@ $string['wrongsourcebase'] = 'Galt ZIP-filnavn.';
 $string['wrongzipfilename'] = 'Galt ZIP-filnavn.';
 $string['wwwroot'] = 'Web addresse';
 $string['wwwrooterror'] = 'Webadressen synes ikke å være gyldig - denne Moodleinstallasjonen synes ikke å være der. Innstilling har blitt resatt.';
+$string['xmlrpcrecommended'] = 'Å installere det valgfrie xmlrpc-tillegget er nyttig for Moodle Networking funksjonaliteten.';
 ?>

install/lang/pt_utf8/installer.php

@@ -9,7 +9,7 @@
 /// File generated by cvs://contrib/lang2installer/installer_builder
 /// using strings defined in stringnames.txt (same dir)
 
-$string['aborting'] = 'Abortando a instalaçaõ';
+$string['aborting'] = 'Abortando a instalação';
 $string['admindirerror'] = 'O directório da administração especificado está errado';
 $string['admindirname'] = 'Directório de Administração';
 $string['admindirsetting'] = 'Alguns servidores Web utilizam /admin como endereço especial para acedera um painel de controlo, ou semelhante. Desafortunadamente, isso cria conflictos com o endereço padrão das páginas de gestão do Moodle. Poderá resolver o problema renomeando o directório admin na sua instalação do Moodle, e escrevendo aqui o novo nome que utilizou. Por exemplo:<br /><br /><b>moodleadmin</b><br /><br />
@@ -27,7 +27,7 @@ $string['askcontinue'] = 'Continuar (yes/no):';
 $string['availabledbtypes'] = 'Tipos de bases de dados disponíveis';
 $string['availablelangs'] = 'Lista de línguas disponíveis';
 $string['bypassed'] = 'Ultrapassada';
-$string['cannotconnecttodb'] = 'Não é possível aceder a base de dados';
+$string['cannotconnecttodb'] = 'Não é possível aceder à base de dados';
 $string['cannotcreatelangdir'] = 'Não é possível criar o directório para pacotes linguísticos';
 $string['cannotcreatetempdir'] = 'Não é possível criar o directório temporal';
 $string['cannotdownloadcomponents'] = 'Não é possível descarregar a cópia dos componentes';
@@ -47,13 +47,13 @@ $string['compatibilitysettings'] = 'A conferir a configuração do PHP...';
 $string['compatibilitysettingshead'] = 'A conferir a configuração do PHP...';
 $string['compatibilitysettingssub'] = 'A conferir a língua substituta...';
 $string['componentisuptodate'] = 'O componente está actualizado';
-$string['configfilecreated'] = 'Ficheiro de configuração criado com éxito';
+$string['configfilecreated'] = 'Ficheiro de configuração criado com êxito';
 $string['configfiledoesnotexist'] = 'O ficheiro de configuração não existe!!!';
 $string['configfilenotwritten'] = 'O script de instalação não conseguiu criar o ficheiro config.php em forma automática, provavelmente por não ter autorização para escrever no directório do Moodle. Poderá copiar manualmente o código que se segue para um ficheiro que deverá chamar config.php, no directório principal do Moodle.';
 $string['configfilewritten'] = 'O ficheiro config.php foi criado com sucesso';
 $string['configurationcomplete'] = 'Configuração concluida';
 $string['configurationcompletehead'] = 'Configuração concluida';
-$string['configurationcompletesub'] = 'Configuração de substituições concluida';
+$string['configurationcompletesub'] = 'O Moodle tentou gravar a sua configuração  instalação do Moodle.';
 $string['configurationfileexist'] = 'O ficheiro de configuração já existe!';
 $string['continue'] = 'Continue';
 $string['creatingconfigfile'] = 'A criar ficheiro de configuração';
@@ -140,7 +140,7 @@ $string['databasesettingswillbecreated'] = '<b>Nota:</b> O instalador tentará c
 $string['databasetype'] = 'Tipo de base de dados';
 $string['databaseuser'] = 'Utilizador da base de dados:';
 $string['dataroot'] = 'Directório de dados';
-$string['datarooterror'] = 'Não foi possível encontrar ou criar o directório de dados que indicou. Terá que tentar corrigir o caminho que indicou, ou criar o directório manualmente.';
+$string['datarooterror'] = 'Não foi possível encontrar ou criar o directório de dados que indicou. Terá que ou corrigir o caminho que indicou, ou criar o directório manualmente.';
 $string['dbconnectionerror'] = 'Não foi possível estabelecer a ligação à base de dados que indicou. Por favor verifique as definições dessa base de dados.';
 $string['dbcreationerror'] = 'Erro na criação da base de dados. Não foi possível criar a base de dados com o nome e definições que indicou.';
 $string['dbhost'] = 'Servidor';
@@ -148,7 +148,7 @@ $string['dbpass'] = 'Senha';
 $string['dbprefix'] = 'Prefixo das tabelas';
 $string['dbtype'] = 'Tipo';
 $string['dbwrongencoding'] = 'A base de dados seleccionada está a funcionar com uma codificação de caracteres não recomendada ($a). Seria melhor usar uma base de dados com codificação Unicode (UTF-8). De qualquer forma, poderá proceder com a base de dados que indicou, seleccionando \"Não testar codificação da Base de Dados\" aqui em baixo, mas poderá ter problemas no futuro.';
-$string['dbwronghostserver'] = 'Deverá usar \"Regras do Servidor\" como se explica acima.';
+$string['dbwronghostserver'] = 'Deverá usar regras de \"Servidor\" como se explica acima.';
 $string['dbwrongnlslang'] = 'A variável de configuração NLS_LANG no seu servidor Web deverá usar os caracteres AL32UTF8. Consulte como configurar correctamente o OCI8, na documentação do PHP.';
 $string['dbwrongprefix'] = 'Deverá usar um \"Prefixo das Tabelas\" como se explica acima.';
 $string['directorysettings'] = '<p>Por favor confira as localizações para esta instalação do Moodle</p>
@@ -182,7 +182,7 @@ $string['downloadlanguagehead'] = 'Descarregar pacote linguístico';
 $string['downloadlanguagenotneeded'] = 'Pode continuar com o processo de instalação usando o pacote linguístico por omissão, \"$a\".';
 $string['downloadlanguagepack'] = 'Quer descarregar pacotes linguísticos agora (yes/no):';
 $string['downloadlanguagesub'] = 'Agora, se quiser, pode descarregar um pacote linguístico e continuar com o processo de instalação nessa língua.<br /><br />Se não conseguir descarregar o pacote linguístico, o processo de instalação continuará em inglês. (Uma vez a instalação for concluida, terá a oportunidade de descarregar e instalar pacotes linguísticos adicionais.)';
-$string['downloadsuccess'] = 'Pacote linguístico descarregado com éxito';
+$string['downloadsuccess'] = 'Pacote linguístico descarregado com êxito';
 $string['doyouagree'] = 'Esta de acordo ? (yes/no)';
 $string['environmenterrortodo'] = 'Deve resolver todos os problemas (erros) do ambiente que encontrou acima antes de proceder à instalação desta versão do Moodle!';
 $string['environmenthead'] = 'A verificar o seu ambiente ...';
@@ -195,15 +195,15 @@ $string['environmentrequireversion'] = 'É requerida a versão $a->needed e est
 $string['environmentsub'] = 'Estamos a verificar que os vários componentes do seu sistema estejam de acordo com os requerimentos do Moodle';
 $string['environmentxmlerror'] = 'Erros ao ler dados do ambiente ($a->error_code)';
 $string['error'] = 'Erro';
-$string['errorsinenvironment'] = 'Erros no ambiente';
+$string['errorsinenvironment'] = 'Erros no ambiente!';
 $string['fail'] = 'Falha';
-$string['fileuploads'] = 'Envio de ficheiros';
+$string['fileuploads'] = 'Transferência de ficheiros para o servidor';
 $string['fileuploadserror'] = 'Isto deveria estar activo';
-$string['fileuploadshelp'] = '<p>O envio de ficheiros parece não estar habilitado no seu servidor.</p>
+$string['fileuploadshelp'] = '<p>A transferência de ficheiros para o servidor parece estar deshabilitada no seu servidor.</p>
 
 <p>Moodle poderá ainda ser instalado, mas sem essa funcionalidade, não poderá enviar ficheiros de uma disciplina nem fotografias de utilizadores.</p>
 
-<p>Para habilitar o envio de ficheiros terá que editar (ou pedir ao administrador do sistema que o faça) o ficheiro principal php.ini do seu sistema, modificando o valor de <b>file_upload</b> para \'1\', e reiniciando o servidor Web.</p>';
+<p>Para habilitar a transferência de ficheiros terá que editar (ou pedir ao administrador do sistema que o faça) o ficheiro principal php.ini do seu sistema, modificando o valor de <b>file_upload</b> para \'1\', e reiniciando o servidor Web.</p>';
 $string['gdversion'] = 'Versão do GD';
 $string['gdversionerror'] = 'A biblioteca GD deverá estar instalada para processar e criar imagens.';
 $string['gdversionhelp'] = '<p>O seu servidor não parece ter GD instalado.</p>
@@ -213,7 +213,7 @@ $string['gdversionhelp'] = '<p>O seu servidor não parece ter GD instalado.</p>
 <p>Para adicionar GD ao PHP, em Unix, compile o PHP usando o parâmetro --with-gd.</p>
 
 <p>Em Windows, normalmente poderá editar php.ini e descomentar a linha que faz referência a php_gd2.dll.</p>';
-$string['globalsquotes'] = 'Variáveis Globais manipuladas em forma insegura';
+$string['globalsquotes'] = 'Variáveis globais manipuladas em forma insegura';
 $string['globalsquoteserror'] = 'Corrija as suas definições do PHP: desactive o register_globals e/ou active magic_quotes_gpc';
 $string['globalsquoteshelp'] = '<p>Não se recomenda a combinação simultânea de Magic Quotes GPC desactivada e Register Globals activa.</p>
 
@@ -223,8 +223,9 @@ $string['globalsquoteshelp'] = '<p>Não se recomenda a combinação simultânea
 <blockquote>php_value magic_quotes_gpc On</blockquote>
 <blockquote>php_value register_globals Off</blockquote>
 </p>';
+$string['globalswarning'] = '<p><strong>Anúncio de segurança</strong>: para funcionar devidamente, o Moodle precisa que altere às suas definições actuais do PHP.<p/><p> <em>Deverá</em> usar <code>register_globals=off</code>.<p>Essa opção altera-se editando o seu ficheiro  <code>php.ini</code>, ou os ficheiros de configuração do Apache/IIS <br />ou o ficheiro <code>.htaccess</code>, e reiniciando o servidor.</p>';
 $string['help'] = 'Ajuda';
-$string['iconvrecommended'] = 'A instalação da biblioteca opcional ICONV é altamente recomendada para trazer uma maior performance ao site, principalmente se o seu site suporta linguagens não latinas.';
+$string['iconvrecommended'] = 'A instalação da biblioteca opcional ICONV é altamente recomendada para um melhor desempenho do sítio, principalmente se o seu sítio suporta linguagens não latinas.';
 $string['info'] = 'Informação';
 $string['inputdatadirectory'] = 'Directório de dados:';
 $string['inputwebadress'] = 'Endereço Web:';
@@ -235,7 +236,7 @@ $string['invalidargumenthelp'] = 'Erro: Argumento(s) inválido(s)
 Uso: $php cliupgrade.php OPÇÕES
 Para obter ajuda use a opção --help';
 $string['invalidemail'] = 'Endereço de correio inválido';
-$string['invalidhost'] = 'Servidor não inválido';
+$string['invalidhost'] = 'Servidor inválido';
 $string['invalidint'] = 'Erro: o valor não é um inteiro';
 $string['invalidintrange'] = 'Erro: O valor está fora dos limites permitidos';
 $string['invalidmd5'] = 'md5 não válido';
@@ -281,7 +282,7 @@ $string['mssql'] = 'SQL*Server (mssql)';
 $string['mssql_n'] = 'SQL*Server com suporte UTF-8 (mssql_n)';
 $string['mssqlextensionisnotpresentinphp'] = 'O PHP não tem sido configurado correctamente com a extensão MSSQL, para que possa comunicar-se com o SQL*Server. Por favor confira o ficheiro php.ini ou recompile o PHP.';
 $string['mysql'] = 'MySQL (mysql)';
-$string['mysql416bypassed'] = 'Contudo, se o seu sítio estiver a utilizar APENAS cartacteres iso-8859-1 (latin), poderá continuar a utilizar o seu já instalado MySQL 4.1.12 (ou superior).';
+$string['mysql416bypassed'] = 'Contudo, se o seu sítio estiver a utilizar APENAS código iso-8859-1 (latin1), poderá continuar a utilizar o seu MySQL já instalado (4.1.12 ou superior).';
 $string['mysql416required'] = 'O MySQL 4.1.16 é a versão mínima requerida para o Moodle 1.6 para que se possa garantir que todos os dados poderão ser convertidos para UTF-8 no futuro.';
 $string['mysqlextensionisnotpresentinphp'] = 'O PHP não está configurado correctamente com a extensão MySQL, para que possa comunicar-se com o MySQL. Por favor verifique o seu ficheiro php.ini ou recompile o PHP.';
 $string['mysqli'] = 'MySQL Melhorado (mysqli)';
@@ -294,11 +295,11 @@ $string['odbc_mssql'] = 'SQL*Server sobre ODBC (odbc_mssql)';
 $string['odbcextensionisnotpresentinphp'] = 'O PHP não está configurado correctamente com a extensão ODBC, para que possa comunicar-se com o SQL*Server. Por favor confira o ficheiro php.ini ou recompile o PHP.';
 $string['ok'] = 'OK';
 $string['opensslrecommended'] = 'É altamente recomendada a instalação da livraria OpenSSL -- activa a funcionalidade da rede Moodle.';
-$string['parentlanguage'] = '<< TRADUTORES: Se existir uma língua semelhante à sua, que poderá ser usada quando alguma frase não estiver traduzida no sue pacote linguístico, especifíque o código dessa língua aqui. Se deixar este espaço em branco, será usado o inglês. exemplo: nl >>';
+$string['parentlanguage'] = '<< TRADUTORES: Se existir uma língua semelhante à sua, que poderá ser usada quando alguma frase não estiver traduzida no sue pacote linguístico, especifique o código dessa língua aqui. Se deixar este espaço em branco, será usado o inglês. exemplo: nl >>';
 $string['pass'] = 'Passa';
 $string['password'] = 'Senha';
 $string['pgsqlextensionisnotpresentinphp'] = 'O PHP não está configurado correctamente com a extensão PGSQL, para que possa comunicar-se com o PostgreSQL. Por favor confira o ficheiro php.ini ou recompile o PHP.';
-$string['php50restricted'] = 'O PHP 5.0.x tem um certo número de problemas conhecidos, por favor faça o upgrade para o 5.1.x ou o downgrade para o 4.3.x ou 4.4.x';
+$string['php50restricted'] = 'O PHP 5.0.x tem um certo número de problemas conhecidos, por favor faça o processo de actualização para o 5.1.x ou o retorno para o 4.3.x ou 4.4.x';
 $string['phpversion'] = 'Versão do PHP';
 $string['phpversionerror'] = 'A versão do PHP deverá ser, pelo menos, 4.3.0 ou 5.1.0 (5.0.x tem alguns problemas)';
 $string['phpversionhelp'] = '<p>Moodle precisa da vesão 4.3.0 ou 5.1.0 do PHP (5.0.x produz vários problemas).</p>
@@ -307,9 +308,10 @@ $string['phpversionhelp'] = '<p>Moodle precisa da vesão 4.3.0 ou 5.1.0 do PHP (
 (No caso da versão 5.0.x, poderá regredir para uma versão 4.4.x)</p>';
 $string['postgres7'] = 'PostgreSQL (postgres7)';
 $string['previous'] = 'Prévio';
-$string['qtyperqpwillberemoved'] = 'Durante a actualização, as perguntas do tipo RQP serão eliminadas. Não deverá experimentar nenhumar problema, porque não estava a usar esse tipo de perguntas.';
+$string['qtyperqpwillberemoved'] = 'Durante a actualização, as perguntas do tipo RQP serão eliminadas. Não deverá experimentar nenhum problema, porque não estava a usar esse tipo de perguntas.';
 $string['qtyperqpwillberemovedanyway'] = 'Durante a actualização, as perguntas do tipo RQP serão eliminadas. Tem algumas perguntas desse tipo na sua base de dados, que deixarão de funcionar, a menos que instale novamente o código em http://moodle.org/mod/data/view.php?d=13&amp;rid=797  antes de proceder com a actualização.';
 $string['releasenoteslink'] = 'Para obter informação sobre esta versão do Moodle, consulte as notas de lançamento em $a';
+$string['remotedownloaderror'] = 'Não foi possível descarregar algum componente para o seu servidor; verifique as definições do proxy; recomenda-se fortemente o uso da extensão cURL do PHP.<br /><br />Deverá descarregar o ficheiro <a href=\"$a->url\">$a->url</a> manualmente, copiá-lo para \"$a->dest\" no seu servidor, e descomprimi-lo nesse local.';
 $string['remotedownloadnotallowed'] = 'O seu servidor não permite descarregar componentes  (a variável allow_url_fopen está desactivada).<br /><br />Terá que descarregar <a href=\"$a->url\">$a->url</a> manualmente, copia-lo para  \"$a->dest\" no seu servidor e descompacta-lo.';
 $string['report'] = 'Relatório';
 $string['restricted'] = 'Restrito';
@@ -332,7 +334,7 @@ $string['siteinfo'] = 'Pormenores do sítio:';
 $string['sitenewsitems'] = 'Notícias:';
 $string['siteshortname'] = 'Nome curto do sítio:';
 $string['sitesummary'] = 'Sumário do sítio:';
-$string['skipdbencodingtest'] = 'Não testar codificação da Base de Dados';
+$string['skipdbencodingtest'] = 'Não testar codificação da base de dados';
 $string['status'] = 'Regime';
 $string['tableprefix'] = 'Prefixo das tabelas:';
 $string['thischarset'] = 'UTF-8';
@@ -400,5 +402,6 @@ $string['wrongsourcebase'] = 'URL errado para a fonte.';
 $string['wrongzipfilename'] = 'Nome de ficheiro ZIP errado.';
 $string['wwwroot'] = 'Endereço Web';
 $string['wwwrooterror'] = 'O \'Endereço Web\' não parece ser válido - esta instalação do Moodle não parece estar lá. O endereço foi modificado para o que se mostra em baixo.';
+$string['xmlrpcrecommended'] = 'A instalação da extensão opcional xmlrpc é útil para a Rede Moodle.';
 $string['yourchoice'] = 'A sua escolha:';
 ?>

install/lang/si_utf8/installer.php

@@ -9,11 +9,21 @@
 /// File generated by cvs://contrib/lang2installer/installer_builder
 /// using strings defined in stringnames.txt (same dir)
 
-$string['admindirerror'] = 'සදහන් කර ඇති ඇඩ්මින් ඩිරෙක්ටරිය වැරදි සහිතයි';
-$string['admindirname'] = 'ඇඩ්මින් ඩිරෙක්ටරිය';
-$string['admindirsettinghead'] = 'ඇඩ්මින් ඩිරෙක්ටරිය සැකසීම...';
-$string['availablelangs'] = 'ප්‍රයෝජ්‍ය භාෂා ඇසුරුම්';
+$string['aborting'] = 'ස්ථාපනය අත්හැර දැමීම';
+$string['admindirerror'] = 'සදහන් කර ඇති admin ඩිරෙක්ටරිය වැරදි සහිතයි';
+$string['admindirname'] = 'admin ඩිරෙක්ටරිය';
+$string['admindirsettinghead'] = 'admin ඩිරෙක්ටරිය සැකසීම...';
+$string['adminemail'] = 'විද්‍යුත් තැපෑල :';
+$string['adminfirstname'] = 'පළමු නම :';
+$string['admininfo'] = 'පරිපාලකයරයාගේ විස්තර';
+$string['adminlastname'] = 'අවසන් නම :';
+$string['adminpassword'] = 'මුරපදය :';
+$string['adminusername'] = 'පරිශීලක නම :';
+$string['askcontinue'] = 'පවත්වාගෙන යන්න (ඔව්/නැත) :';
+$string['availabledbtypes'] = 'පවතින db වර්ග';
+$string['availablelangs'] = 'පවතින භාෂා ලයිස්තුව';
 $string['bypassed'] = 'මඟහැර';
+$string['cannotconnecttodb'] = 'db සඳහා සම්බන්ධ විය නොහැක';
 $string['cannotcreatelangdir'] = 'lang ඩිරෙක්ටරිය සෑදීය නොහැක';
 $string['cannotcreatetempdir'] = 'temp ඩිරෙක්ටරිය සෑදීය නොහැක';
 $string['cannotdownloadcomponents'] = 'සංරචක බාගත කළ නොහැක';
@@ -24,19 +34,56 @@ $string['cannotsavezipfile'] = 'zip ගොනුව සුරැකිය නො
 $string['cannotunzipfile'] = 'ගොනුව විහිදිය නොහැක';
 $string['caution'] = 'අනතුරු ඇගවීම';
 $string['check'] = 'පිරික්සන්න.';
+$string['checkingphpsettings'] = 'PHP සැකසීම් පරීක්ෂා කිරීම';
 $string['chooselanguage'] = 'භාෂාවක් තෝරාගන්න';
 $string['chooselanguagehead'] = 'භාෂාවක් තෝරාගන්න';
 $string['closewindow'] = 'මෙම කවුළුව වසන්න';
 $string['compatibilitysettings'] = 'ඔබගේ PHP සැකසීම් පරීක්ෂා කිරීම...';
 $string['compatibilitysettingshead'] = 'ඔබගේ PHP සැකසීම් පරීක්ෂා කිරීම...';
+$string['compatibilitysettingssub'] = 'මූඩ්ල් මනාව ධාවනය වීම සඳහා ඔබගේ සේවාදායකය මෙම සියලු පරීක්ෂණ සමත් විය යුතුයි';
 $string['componentisuptodate'] = 'සංරචකය යාවත්කාලීන වී ඇත';
+$string['configfilecreated'] = 'වින්‍යාස ගොනුව සාර්ථකව සාදන ලදි';
+$string['configfiledoesnotexist'] = 'වින්‍යාස ගොනුව නොපවතී !!!';
 $string['configfilewritten'] = 'config.php සාර්ථකව සාදන ලදි';
 $string['configurationcomplete'] = 'වින්‍යසගත කිරීම අවසන්';
 $string['configurationcompletehead'] = 'වින්‍යසගත කිරීම අවසන්';
+$string['configurationcompletesub'] = 'ඔබගේ මූඩ්ල් මූලිකයෙහි ඇති ගොනුවක ඔබගේ සැකසුම් සුරක්ෂිත කිරීමට මූඩ්ල් උත්සාහ දරණ ලදි';
+$string['configurationfileexist'] = 'වින්‍යාස ගොනුව දැනටමත් පවතී!';
 $string['continue'] = 'පවත්වා ගෙන යන්න';
+$string['creatingconfigfile'] = 'වින්‍යාස ගොනුව සෑදීම ...';
 $string['curlrecommended'] = 'මූඩ්ල් ජාලකරණ ක්‍රියාකාරීත්වය සක්‍රිය කිරීම සදහා විකල්ප curl අගාරය ස්ථාපනය කිරීමට දැඩිව උපදෙස් දෙනු ලැබේ';
 $string['customcheck'] = 'වෙනත් පරික්ෂා';
 $string['database'] = 'දත්තගබඩාව';
+$string['databasehost'] = 'දත්තගබඩා ධාරකය';
+$string['databasename'] = 'දත්තගබඩා නම:';
+$string['databasepass'] = 'දත්තගබඩා මුරපදය :';
+$string['databasesettingsformoodle'] = 'මූඩ්ල් සඳහා දත්තගබඩා සැකසුම්';
+$string['databasesettingssub'] = '<b>වර්ගය:</b> mysql හෝ postgres7<br />
+<b>ධාරකය:</b> උදා. localhost හෝ db.isp.com<br />
+<b>නම:</b> දත්ත ගබඩා නම, උදා. moodle<br />
+<b>පරිශීලක:</b> ඔබගේ දත්ත ගබඩා පරිශීලක නාමය<br />
+<b>මුරපදය:</b> ඔබගේ දත්ත ගබඩා මුරපදය<br />
+<b>වගු උපසර්ගය:</b> සියලු වගු නාම සඳහා භාවිතා කල යුතු විකල්ප උපසර්ගය';
+$string['databasesettingssub_mssql_n'] = '<b>වර්ගය:</b> SQL*Server (UTF-8 සක්‍රිය කරන ලද)<br />
+<b>ධාරකය:</b> උදා. localhost හෝ db.isp.com<br />
+<b>නම:</b> දත්ත ගබඩා නාමය, උදා.  moodle<br />
+<b>පරිශීලක:</b> ඔබගේ දත්ත ගබඩා පරිශීලක නාමය<br />
+<b>මුරපදය:</b> ඔබගේ දත්ත ගබඩා මුරපදය<br />
+<b>වගු උපසර්ගය:</b> සියලු වගු නාම සඳහා භාවිතා කල යුතු විකල්ප උපසර්ගය (අනිවාර්ය)';
+$string['databasesettingssub_mysql'] = '<b>වර්ගය:</b> MySQL<br />
+<b>ධාරකය:</b> උදා. localhost හෝ db.isp.com<br />
+<b>නම:</b> දත්ත ගබඩා නාමය, උදා.  moodle<br />
+<b>පරිශීලක:</b> ඔබගේ දත්ත ගබඩා පරිශීලක නාමය<br />
+<b>මුරපදය:</b> ඔබගේ දත්ත ගබඩා මුරපදය<br />
+<b>වගු උපසර්ගය:</b> සියලු වගු නාම සඳහා භාවිතා කල යුතු විකල්ප උපසර්ගය (අනිවාර්ය)';
+$string['databasesettingssub_mysqli'] = '<b>වර්ගය:</b> වැඩි දියුණුකරන ලද MySQL<br />
+<b>ධාරකය:</b> උදා. localhost හෝ db.isp.com<br />
+<b>නම:</b> දත්ත ගබඩා නාමය, උදා.  moodle<br />
+<b>පරිශීලක:</b> ඔබගේ දත්ත ගබඩා පරිශීලක නාමය<br />
+<b>මුරපදය:</b> ඔබගේ දත්ත ගබඩා මුරපදය<br />
+<b>වගු උපසර්ගය:</b> සියලු වගු නාම සඳහා භාවිතා කල යුතු විකල්ප උපසර්ගය (අනිවාර්ය)';
+$string['databasetype'] = 'දත්තගබඩා වර්ගය :';
+$string['databaseuser'] = 'දත්තගබඩා පරීශීලක :';
 $string['dataroot'] = 'දත්ත ඩිරෙක්ටරිය';
 $string['dbhost'] = 'ධාරක සර්වරය';
 $string['dbpass'] = 'මුරපදය';
@@ -47,7 +94,8 @@ $string['dirroot'] = 'මූඩ්ල් ඩිරෙක්ටරිය';
 $string['download'] = 'බාගත කිරීම';
 $string['downloadedfilecheckfailed'] = 'බාගත කරන ලද ගොනු පරික්ෂාව නොහැකිවිය';
 $string['downloadlanguagehead'] = 'භාෂා ඇසුරුම බාගත කරන්න';
-$string['doyouagree'] = 'ඔබ මෙම කොන්දේසි කියවා තේරුම් ගත්තාද?';
+$string['downloadsuccess'] = 'භාෂා ඇසුරුම සාර්ථකව බාගත කරන ලදි';
+$string['doyouagree'] = 'ඔබ එකඟ වන්නේද ? (ඔව්/නැත):';
 $string['environmenterrortodo'] = 'මෙම මූඩ්ල් අනුවාදය ස්ථාපනයට ප්‍රථම ඉහත සියලුම පාරසරික ගැටලු (දෝෂ)ඔබ විසින් විසදිය යුතුයි.';
 $string['environmenthead'] = 'ඔබගේ පාරිසරිකය පරීක්ෂා කිරීම';
 $string['environmentrecommendcustomcheck'] = 'මෙම පරීක්ෂණය අසමත්වුවහොත් ඉන් ඉදිරියේදී කිසියම් දොසක් ඇතිවීමේ හැකියාව පෙන්නුම් කරයි';
@@ -58,27 +106,45 @@ $string['environmentrequireinstall'] = 'ස්ථාපනයට/ක්‍රි
 $string['environmentrequireversion'] = '$a->needed අනුවාදය අවශ්‍ය කරන අතර දැනට ඔබ භා‍විතාකරන්නේ $a->current අනුවාදයයි';
 $string['environmentxmlerror'] = 'පාරසරික දත්ත කියවිය නොහැක ($a->error_code)';
 $string['error'] = 'වැරදිද';
+$string['errorsinenvironment'] = 'පරිසරයේ දෝෂයකි!';
 $string['fail'] = 'අසමත්';
 $string['fileuploads'] = 'ෆයිල් අප්ලෝඩ් කිරීම';
 $string['fileuploadserror'] = 'මෙය විවෘතව තිබිය යුතුයි';
 $string['gdversion'] = 'GD සංස්කරණය';
+$string['globalsquotes'] = 'අනාරක්ෂික Globals හැසිරවීම';
 $string['help'] = 'උදව්';
 $string['iconvrecommended'] = 'අඩවි කාර්යක්ෂමතාව වැඩි කිරීම සදහා විකල්ප ICONV ආගාරය ස්ථාපනය කිරීම නිර්දේශ කරනු ලැබේ. විශේෂයෙන් ඔබගේ වෙබ් අඩවිය ලතින් නොවන භාෂා සදහා අනුග්‍රහය දක්වයිනම්';
 $string['info'] = 'තොරතුරු';
+$string['inputdatadirectory'] = 'දත්ත ඩිරෙක්ටරිය :';
+$string['inputwebadress'] = 'අන්තර්ජාල ලිපිනය :';
+$string['inputwebdirectory'] = 'මූඩ්ල් ඩිරෙක්ටරිය :';
 $string['installation'] = 'පිහිටුවීම';
-$string['invalidemail'] = 'සදොස් ඊ- තැපැල් ලිපිනය';
+$string['installationiscomplete'] = 'ස්ථාපනය සම්පූර්ණයි!';
+$string['invalidemail'] = 'වලංගු නොවන විද්‍යුත් තැපැල් ලිපිනය';
+$string['invalidhost'] = 'වලංගු නොවන ධාරකය';
+$string['invalidint'] = 'දෝෂය : අගය පූර්ණ සංඛ්‍යාවක් නොවේ';
+$string['invalidintrange'] = 'දෝෂය : අගය වලංගු පරාසයෙන් පිටත පවතී';
 $string['invalidmd5'] = 'අවලංගු md5';
-$string['invalidurl'] = 'අවලංගු URL';
+$string['invalidpath'] = 'වලංගු නොවන පථය';
+$string['invalidsetelement'] = 'දෝෂය : දෙන ලද අගය දෙන ලද විකල්පයේ ‍අඩංගු නොවේ';
+$string['invalidtextvalue'] = 'වලංගු නොවන පෙළ අගය';
+$string['invalidurl'] = 'වලංගු නොවන URL ය';
 $string['language'] = 'භාෂාව';
+$string['locationanddirectories'] = 'ස්ථානය හා ඩිරෙක්ටරියන්';
 $string['magicquotesruntimeerror'] = 'මෙය වසා තැබිය යුතුයි';
 $string['mbstringrecommended'] = 'අඩවි කාර්යක්ෂමතාව වැඩි කිරීම සදහා විකල්ප MBSTRING ආගාරය ස්ථාපනය කිරීම නිර්දේශ කරනු ලැබේ. විශේෂයෙන් ඔබගේ වෙබ් අඩවිය ලතින් නොවන භාෂා සදහා අනුග්‍රහය දක්වයිනම්';
 $string['memorylimit'] = 'මතක සීමාව';
 $string['missingrequiredfield'] = 'අත්‍යවශ්‍ය ක්ෂේත්‍ර කිහිපයක් අස්ථානගතවී ඇත';
 $string['moodledocslink'] = 'මෙම පිටුව සදහා මූඩ්ල් ලේඛන';
+$string['mssql'] = 'SQL* සේවාදායකය (mssql)';
+$string['mssql_n'] = 'SQL* සේවාදායකය UTF-8 ආධාරය සහිත (mssql_n)';
+$string['mysql'] = 'MySQL (mysql)';
 $string['mysql416bypassed'] = 'කෙසේ නමුත් ඔබගේ අඩවිය iso-8859-1 (ලතින්) භාෂා භාවිතා කරන්නේනම් පමණක් ඔබ දැනට ස්ථාපිත MySQL 4.1.12 (හෝ ඉහල) භාවිතා කල හැක.';
 $string['mysql416required'] = 'මූඩ්ල් 1.6 සදහා අනාගතයේදී සියලු දත්ත UTF-8 බවට පරිවර්ථනය වගකීමක් සහිතව සිදුකිරීමට නම්  අවම වශයෙන් MySQL 4.1.16 වත් අවශ්‍ය වේ.';
+$string['mysqli'] = 'වැඩි දියුණු කරන ලද MySQL (mysqli)';
 $string['name'] = 'නම';
 $string['next'] = 'ඊලඟ';
+$string['oci8po'] = 'Oracle (oci8po)';
 $string['ok'] = 'OK';
 $string['opensslrecommended'] = 'විකල්ප OpenSSL ආගාරය ස්ථාපනය දැඩිව නිර්දේශ කරනු ලැබේ. එමගින් මූඩ්ල් ජාලකරණ හැකියාව ඇතිකරයි.';
 $string['parentlanguage'] = '<< පරිවර්ථකයෝ: අදාල වචන නොමැති විට භාවිතා කිරීමට ඔබගේ භාෂාවට මව් භාෂාවක් ඇතිවිට එය සදහා කේත මෙහි දෙන්න.  හිස්ව තැබුවහොත් ඉන්ග්‍රීසි භාෂාව භාවිතා කරනු ලැබේ.';
@@ -86,9 +152,10 @@ $string['pass'] = 'සමත්';
 $string['password'] = 'මුරපදය';
 $string['php50restricted'] = 'PHP 5.0.x හි හදුනාගත් දෝෂ කිහිපයක් ඇති බැවින් 5.1.x වලට උත්ශ්‍රේණි කිරීම හෝ 4.3.x හෝ 4.4.x වලට පාතශ්‍රේණි කිරීම හෝ කරන්න';
 $string['phpversion'] = 'PHP සංස්කරණය';
+$string['postgres7'] = 'PostgreSQL (postgres7)';
 $string['previous'] = 'පසුගිය';
-$string['qtyperqpwillberemoved'] = 'උත්ශ්‍රේණි ක්‍රියාවලිය තුලදී RQP පැන වර්ගය ඉවත්කෙරෙනු ඇත. ඔබ මෙම පැන වර්ගය භාවිතා කර නොමැති බැවින් ඔබට කිසිදු ගැටළුවකට මුහුන පැමට සිදු නොවේ.'; // ORPHANED
-$string['qtyperqpwillberemovedanyway'] = 'උත්ශ්‍රේණි ක්‍රියාවලිය තුලදී RQP පැන වර්ගය ඉවත්කෙරෙනු ඇත. ඔබගේ දත්තගබඩාව තුල RQP පැන කිහිපයක් ඇති අතර මෙම උත්ශ්‍රේණි ක්‍රියාවලිය සන්තනය කිරීමට පෙර http://moodle.org/mod/data/view.php?d=13&amp;rid=797 හි ඇති කේතය නැවත ස්ථාපනය නොකළහොත් ඒවා ක්‍රියාවිරහිත වනු ඇත.'; // ORPHANED
+$string['qtyperqpwillberemoved'] = 'උත්ශ්‍රේණි ක්‍රියාවලිය තුලදී RQP පැන වර්ගය ඉවත්කෙරෙනු ඇත. ඔබ මෙම පැන වර්ගය භාවිතා කර නොමැති බැවින් ඔබට කිසිදු ගැටළුවකට මුහුන පැමට සිදු නොවේ.';
+$string['qtyperqpwillberemovedanyway'] = 'උත්ශ්‍රේණි ක්‍රියාවලිය තුලදී RQP පැන වර්ගය ඉවත්කෙරෙනු ඇත. ඔබගේ දත්තගබඩාව තුල RQP පැන කිහිපයක් ඇති අතර මෙම උත්ශ්‍රේණි ක්‍රියාවලිය සන්තනය කිරීමට පෙර http://moodle.org/mod/data/view.php?d=13&amp;rid=797 හි ඇති කේතය නැවත ස්ථාපනය නොකළහොත් ඒවා ක්‍රියාවිරහිත වනු ඇත.';
 $string['releasenoteslink'] = 'මෙම මූඩ්ල් අනුවාදයේ තොරතුරු සදහා කරුණාකර <a target=\"_new\" href=\"$a\">සබැදි නිකුත් කිරීමේ සටහන්</a> බලන්න';
 $string['remotedownloadnotallowed'] = 'ඔබගේ සේවාදායකයට සංරචක බාගත කිරීම සදහා ඉඩලබා දී නැත (allow_url_fopen අක්‍රිය කර ඇත). <br /><br /> ඔබ හස්ථීයව මෙම ගොනුව <a href=\"$a->url\">$a->url</a> බාගත කල යුතුය. එය ඔබගේ සේවාදායකයේ \"$a->dest\" වෙත පිටපත් කර unzip කරන්න.';
 $string['report'] = 'වාර්තාව';
@@ -98,16 +165,39 @@ $string['safemodeerror'] = 'ආරක්ෂාකාරී මාදිලිය
 $string['serverchecks'] = 'සේවාදායක පරික්සුම්';
 $string['sessionautostart'] = 'සැසිය ස්වයංක්‍රීය ආරම්භය';
 $string['sessionautostarterror'] = 'මෙය වසාතැබිය යුතුයි';
+$string['sitefullname'] = 'සම්පූර්ණ අඩවි නාමය:';
+$string['siteinfo'] = 'අඩවි තොරතුරු';
+$string['sitenewsitems'] = 'පුවත් අයිතමයන් :';
+$string['siteshortname'] = 'කෙටි අඩවි නාමය :';
+$string['sitesummary'] = 'අඩවි සාරාංශය :';
 $string['skipdbencodingtest'] = 'DB කේතගත කිරීමේ පරීක්ෂණය මගහරින්න';
 $string['status'] = 'තත්වය';
-$string['thischarset'] = 'UTF-8';
-$string['thisdirection'] = 'ltr';
-$string['thislanguage'] = 'සිංහල ';
+$string['tableprefix'] = 'වගු උපසර්ගය :';
+$string['thischarset'] = 'UTF-8';
+$string['thisdirection'] = 'ltr';
+$string['thislanguage'] = 'සිංහල ';
 $string['unicoderecommended'] = 'ඔබගේ සියලු දත්ත යුනිකෝඩ්(UTF-8) ආකාරයෙන් ගබඩා කිරීම නිර්දේශ කෙරේ. නව ස්‍ථාපනයන් සිදුකලයුත්තේ පෙරනිමි අක්ෂර කුලකය යුනිකෝඩ් වන දත්ත ගබඩාවලටය. ඔබ උත්ශ්‍රේණි කරන්නේනම්, ඔබ විසින් UTF-8 සංක්‍රමණ ක්‍රියාවලිය (පරිපාලක පිටු බලන්න) සිදුකල යුතුය.';
 $string['unicoderequired'] = 'ඔබගේ සියලු දත්ත යුනිකෝඩ්(UTF-8) ආකාරයෙන් ගබඩා කිරීම අත්‍යාවශ්‍යවේ. නව ස්‍ථාපනයන් සිදුකලයුත්තේ පෙරනිමි අක්ෂර කුලකය යුනිකෝඩ් වන දත්ත ගබඩාවලටමය. ඔබ උත්ශ්‍රේණි කරන්නේනම්, ඔබ විසින් UTF-8 සංක්‍රමණ ක්‍රියාවලිය (පරිපාලක පිටු බලන්න)සිදුකල යුතුය.';
+$string['upgradingactivitymodule'] = 'ක්‍රියාකාරකම් මොඩියුලය යාවත් කාලීන කිරීම';
+$string['upgradingbackupdb'] = 'පසුගබඩා දත්ත ගබඩාව යාවත් කාලීන කිරීම';
+$string['upgradingblocksdb'] = 'කොටස් දත්ත ගබඩාව යාවත් කාලීන කිරීම';
+$string['upgradingblocksplugin'] = 'කොටස් ප්ලගිනයන් යාවත් කාලීන කිරීම';
+$string['upgradingcompleted'] = 'යාවත් කාලීන කිරීම සම්පූර්ණයි...';
+$string['upgradingcourseformatplugin'] = 'පාඨමාලා ආකෘති ප්ලගිනය යාවත් කාලීන කිරීම';
+$string['upgradingenrolplugin'] = 'ලියාපදිංච් වීමේ ප්ලගිනය යාවත් කාලීන කිරීම';
+$string['upgradinggradeexportplugin'] = 'ශ්‍රේණි නිර්යාත කිරීමේ ප්ලගිනය යාවත් කාලීන කිරීම';
+$string['upgradinggradeimportplugin'] = 'ශ්‍රේණි ආයාත කිරීමේ ප්ලගිනය යාවත් කාලීන කිරීම';
+$string['upgradinggradereportplugin'] = 'ශ්‍රේණී වාර්තා ප්ලගිනය යාවත් කාලීන කිරීම';
+$string['upgradinglocaldb'] = 'ප්‍රාදේශීය දත්ත ගබඩාව යාවත් කාලීන කිරීම';
+$string['upgradingmessageoutputpluggin'] = 'පණිවිඩ ප්‍රතිදාන ප්ලගිනය යාවත් කාලීන කිරීම';
+$string['upgradingqtypeplugin'] = 'ප්‍රශ්න/වර්ග ප්ලගිනය යාවත් කාලීන කිරීම';
+$string['upgradingrpcfunctions'] = 'RPC ක්‍රියාවන් යාවත් කාලීන කිරීම';
 $string['user'] = 'පරිශිලකයා';
+$string['welcomep10'] = '$a->installername ($a->installerversion)';
 $string['wrongdestpath'] = 'වැරදි ගමනාන්ත පථයකි';
 $string['wrongsourcebase'] = 'වැරදි මූලාශ්‍ර URL පදනමකි';
 $string['wrongzipfilename'] = 'වැරදි ZIP ගොනු නාමයකි';
 $string['wwwroot'] = 'අන්තර්ජාල ලිපිනය';
+$string['xmlrpcrecommended'] = 'මූඩ්ල් ජාලකරණ ක්‍රියාකාරිත්වය සඳහා විකල්ප xmlrpc දිගුව ස්ථාපනය ප්‍රයෝජනවත් වේ.';
+$string['yourchoice'] = 'ඔබගේ තේරීම';
 ?>

install/lang/sk_utf8/installer.php

@@ -188,6 +188,7 @@ $string['globalsquoteshelp'] = '<p>Kombinácia vypnutých Magic Quotes GPC a zap
 <blockquote>php_value magic_quotes_gpc On</blockquote>
 <blockquote>php_value register_globals Off</blockquote>
 </p>';
+$string['globalswarning'] = '<p><strong>Bezpečnostné upozornenie</strong>: pre správne fungovanie Moodle je nutné upraviť nastavenie PHP <br />na vašom serveri.<p/><p><em>Musíte</em> nastaviť <code>register_globals=off</code>. <p>Nastavenie skontrolujte v súbore <code>php.ini</code>, v konfiguračnom súbore Apache/IIS, alebo v súbore <code>.htaccess</code>.</p>';
 $string['help'] = 'Pomoc';
 $string['iconvrecommended'] = 'Inštalácia voliteľnej knižnice ICONV je vysoko doporučovaná, pretože zvyšuje výkon stránok, najmä ak používate mäkčeňové jazyky - napr. slovenčinu.';
 $string['info'] = 'Informácie';
@@ -237,7 +238,7 @@ $string['odbc_mssql'] = 'SQL*Server cez ODBC (odbc_mssql)';
 $string['odbcextensionisnotpresentinphp'] = 'PHP nebolo správne nakonfigurované s ODBC rozšírením, a tak nemôže komunikovať s SQL*Serverom. Prosím, skontrolujte si Váš php.ini súbor alebo znovu vytvorte PHP.';
 $string['ok'] = 'OK';
 $string['opensslrecommended'] = 'Pre beh sieťových funkcionalít (\"Moodle Networking\") je treba nainštalovať voliteľnú knižnicu OpenSSL.';
-$string['parentlanguage'] = '<< PREKLADATELIA: Ak Váš jazyk má Nadradený jazyk, ktorý by mal Moodle používať pri chýbajúcich reťazcoch, potom tu špecifikujte jeho kód. Ak necháte prázdne, použije sa angličtina. Príklad: nl >>';
+$string['parentlanguage'] = '<< PREKLADATELIA: Ak chcete definovať sekundárny jazyk, ktorý má Moodle používať v prípadoch, keď reťazce vo vašom jazykovom balíčku chýbajú, zadajte ho sem. Príklad: cs_utf8>>';
 $string['pass'] = 'Prejsť';
 $string['password'] = 'Heslo';
 $string['pgsqlextensionisnotpresentinphp'] = 'PHP nebolo správne nakonfigurované s PGSQL rozšírením, a tak nemôže komunikovať s PostgreSQL. Prosím, skontrolujte si Váš php.ini súbor alebo znovu vytvorte PHP.';
@@ -282,4 +283,5 @@ $string['wrongsourcebase'] = 'Chybné URL zdrojového serveru';
 $string['wrongzipfilename'] = 'Chybné meno súboru ZIP';
 $string['wwwroot'] = 'Web adresa';
 $string['wwwrooterror'] = 'Táto web adresa pravdepodobne nie je platná - táto inštalácia Moodle tu pravdepodobne nie je.';
+$string['xmlrpcrecommended'] = 'Pre beh sieťových funkcionalít (\"Moodle Networking\") je treba nainštalovať voliteľnú knižnicu xlmrpc.';
 ?>

install/lang/sv_utf8/installer.php

@@ -90,6 +90,13 @@ $string['databasesettingssub_mysql'] = '<b>Type (typ):</b>MySQL <br />
 <b>User (användare):</b> Ditt användarnamn för tillgång till databasen<br />
 <b>Password (lösenord):</b> Ditt lösenord för tillgång till databasen<br />
 <b>Tables Prefix (prefix för tabeller):</b> ett valfritt prefix som kopplas till alla namn på tabeller';
+$string['databasesettingssub_mysqli'] = '<b>Type (typ):</b> Förbättrad MySQL<br />
+<b>Host (värd):</b> t.ex. localhost eller db.isp.com<br />
+<b>Namn:</b> databasnamn, t.ex. moodle<br />
+<b>Användare:</b> Ditt användarnamn till databasen<br />
+<b>Lösenord:</b> Ditt lösenord till databasen<br />
+<b>Tabellprefix:</b> prefix som ska användas i alla tabellnamn (valfritt)
+databasesettingssub_mysqli';
 $string['databasesettingssub_oci8po'] = '<b>Type (typ):</b>Oracle <br />
 <b>Host (värd):</b>används inte, måste vara tomt<br />
 <b>Name (namn):</b> det givna namnet på tnsnames.ora anslutningen<br />
@@ -189,6 +196,7 @@ $string['info'] = 'Information';
 $string['installation'] = 'Installation';
 $string['invalidemail'] = 'Ogiltig e-postadress';
 $string['invalidmd5'] = 'Ogiltig md5';
+$string['invalidurl'] = 'Ogiltig url';
 $string['langdownloaderror'] = 'Språket \"$a\" installerades tyvärr inte. Installationen kommer att fullföljas på engelska.';
 $string['langdownloadok'] = 'Språket \"$a\" installerades framgångsrikt. Installationen kommer att fullföljas på detta språk.';
 $string['language'] = 'Språk';
@@ -217,6 +225,8 @@ $string['mysql'] = 'MySQL';
 $string['mysql416bypassed'] = 'Om Du emellertid på Din webbplats använder BARA språk som är kodade enligt ISO-8859-1 så kan Du fortsätta att använda Din aktuella installation av MySQL 4.1.12 (eller högre).';
 $string['mysql416required'] = 'MySQL 4.1.16 är den äldsta version som Du kan använda tillsammans med Moodle 1.6 om Du vill säkerställa att alla data kan konverteras till UTF-8 i framtiden.';
 $string['mysqlextensionisnotpresentinphp'] = 'PHP har inte konfigurerats på det sätt som måste i förhållande till MySQL-extensionen för att kunna kommunicera med MySQL. Var snäll och kontrollera Din php.ini-fil eller kompilera om PHP.';
+$string['mysqli'] = 'Förbättrad MySQL (mysqli)';
+$string['mysqliextensionisnotpresentinphp'] = 'PHP har inte konfigurerats på ettt korrekt sätt i förhållande till MySQLi extensionen så att den kan kommunicera med PHP. Det finns ingen MySQLi extension för PHP4.';
 $string['name'] = 'Namn';
 $string['next'] = 'Nästa';
 $string['oci8po'] = 'Oracle (oci8po)';

install/lang/tr_utf8/installer.php

@@ -9,13 +9,23 @@
 /// File generated by cvs://contrib/lang2installer/installer_builder
 /// using strings defined in stringnames.txt (same dir)
 
+$string['aborting'] = 'Kurulum iptal ediliyor';
 $string['admindirerror'] = 'Belirtilen yönetici dizini hatalı';
 $string['admindirname'] = 'Yönetici Dizini';
-$string['admindirsetting'] = 'Bazı web hostingler kontrol paneline ulaşmak için /admin olarak belirtilmiş bir URL kullanıyor. Maalesef, bu Moodle yönetici sayfalarıyla karışıklığa sebep olmaktadır. Yönetici dizininin ismini kurulum sırasında değiştirerek bu sorunu ortadan kaldırabilirsiniz. Örnek: <br /><br /><b>moodleadmin</b><br /> <br />Bu Moodle içinde yönetici linklerini düzeltecektir.';
+$string['admindirsetting'] = 'Bazı web hostingler, kontrol paneline erişmek için /admin olarak belirtilmiş bir URL kullanır. Maalesef, bu Moodle yönetici sayfalarıyla karışıklığa sebep olmaktadır. Yönetici dizininin ismini kurulum sırasında değiştirerek bu sorunu ortadan kaldırabilirsiniz. Örnek: <br /><br /><b>moodleadmin</b><br /> <br />Bu Moodle içinde yönetici linklerini düzeltecektir.';
 $string['admindirsettinghead'] = 'Yönetici dizini ayarlanıyor...';
-$string['admindirsettingsub'] = 'Bazı web hostingler kontrol paneline ulaşmak için /admin olarak belirtilmiş bir URL kullanıyor. Maalesef, bu Moodle yönetici sayfalarıyla karışıklığa sebep olmaktadır. Yönetici dizininin ismini kurulum sırasında değiştirerek bu sorunu ortadan kaldırabilirsiniz. Örnek: <br /><br /><b>moodleadmin</b><br /> <br />Bu Moodle içinde yönetici linklerini düzeltecektir.';
-$string['availablelangs'] = 'Kullanılabilir dil paketleri';
+$string['admindirsettingsub'] = 'Bazı web hostingler, kontrol paneline erişmek için /admin olarak belirtilmiş bir URL kullanır. Maalesef, bu Moodle yönetici sayfalarıyla karışıklığa sebep olmaktadır. Yönetici dizininin ismini kurulum sırasında değiştirerek bu sorunu ortadan kaldırabilirsiniz. Örnek: <br /><br /><b>moodleadmin</b><br /> <br />Bu Moodle içinde yönetici linklerini düzeltecektir.';
+$string['adminemail'] = 'E-posta';
+$string['adminfirstname'] = 'Adı:';
+$string['admininfo'] = 'Yönetici Ayrıntıları';
+$string['adminlastname'] = 'Soyadı:';
+$string['adminpassword'] = 'Şifre:';
+$string['adminusername'] = 'Kullanıcı adı:';
+$string['askcontinue'] = 'Devam et (yes/no)';
+$string['availabledbtypes'] = 'Kullanılabilir db tipleri';
+$string['availablelangs'] = 'Kullanılabilir diller';
 $string['bypassed'] = 'Geçti';
+$string['cannotconnecttodb'] = 'Veritabanına bağlantı kurulamadı';
 $string['cannotcreatelangdir'] = 'Dil dizini oluşturulamıyor.';
 $string['cannotcreatetempdir'] = 'Geçici dizin oluşturulamıyor.';
 $string['cannotdownloadcomponents'] = 'Bileşenler indirilemedi.';
@@ -26,6 +36,7 @@ $string['cannotsavezipfile'] = 'ZIP dosyası kaydedilemedi.';
 $string['cannotunzipfile'] = 'Dosya arşivi açılamadı.';
 $string['caution'] = 'Dikkat';
 $string['check'] = 'Kontrol et';
+$string['checkingphpsettings'] = 'PHP Ayarları Kontrol Ediliyor';
 $string['chooselanguage'] = 'Bir dil seçin';
 $string['chooselanguagehead'] = 'Bir dil seçin';
 $string['chooselanguagesub'] = 'Lütfen, SADECE kurulum için bir dil seçin. Site ve kullanıcı dillerini sonraki ekranda seçebilirsiniz.';
@@ -34,12 +45,16 @@ $string['compatibilitysettings'] = 'PHP ayarlarınız kontrol ediliyor...';
 $string['compatibilitysettingshead'] = 'PHP ayarlarınız kontrol ediliyor...';
 $string['compatibilitysettingssub'] = 'Moodle\'ın düzgün çalışması için sunucunuz bütün testleri geçti.';
 $string['componentisuptodate'] = 'Bileşen günceldir.';
-$string['configfilenotwritten'] = 'Kurulum programı, Moodle dizini yazılabilir olmadığından dolayı seçtiğiniz ayarları içeren bir config.php dosyası oluşturamıyor.  Aşağıdaki kodu kopyalayıp bu kodu config.php dosyası içine yapıştırıp Moodle kök dizinine oluşturduğunuz dosyayı yükleyebilirsiniz.';
+$string['configfilecreated'] = 'Yapılandırma dosyası başarılıyla oluşturuldu';
+$string['configfiledoesnotexist'] = 'Yapılandırma dosyası yok!!!';
+$string['configfilenotwritten'] = 'Kurulum programı, Moodle dizini yazılabilir olmadığından dolayı seçtiğiniz ayarları içeren bir config.php dosyası oluşturamıyor. Aşağıdaki kodu kopyalayıp bu kodu config.php dosyası içine yapıştırıp Moodle kök dizinine oluşturduğunuz dosyayı yükleyebilirsiniz.';
 $string['configfilewritten'] = 'config.php dosyası başarıyla oluşturuldu';
 $string['configurationcomplete'] = 'Yapılandırma tamamlandı';
 $string['configurationcompletehead'] = 'Yapılandırma tamamlandı';
 $string['configurationcompletesub'] = 'Ana moodle dizine yapılandırma dosyasının kaydedilmesi için girişimde bulunuldu.';
+$string['configurationfileexist'] = 'Yapılandırma dosyası zaten var!';
 $string['continue'] = 'Devam';
+$string['creatingconfigfile'] = 'Yapılandırma dosyası oluşturuluyor...';
 $string['curlrecommended'] = 'Moodle Ağının işlevsel bir şekilde çalışması için isteğe bağlı Curl kütüphanesinin kurulması şiddetle tavsiye edilir.';
 $string['customcheck'] = 'Diğer Kontroller';
 $string['database'] = 'Veritabanı';
@@ -60,6 +75,9 @@ $string['databasecreationsettingssub'] = '<b>Tipi:</b> kurulum tarafından mysql
 <b>Kullanıcı:</b> kurulum tarafından root olarak sabitlendi<br />
 <b>Şifre:</b> kullanıcı şifresi<br />
 <b>Tablo öneki:</b> tüm tablo isimleri için isteğe bağlı önek';
+$string['databasehost'] = 'Veritabanı sunucusu:';
+$string['databasename'] = 'Veritabanı adı:';
+$string['databasepass'] = 'Veritabanı parolası:';
 $string['databasesettings'] = 'Şimdi, Moodle verilerinin saklanacağı veritabanını
 oluşturmanız gerekiyor. Bu veritabanı önceden oluşturulmalı
 ve bu veritabanına erişmek için kullanıcı adı - şifre ayarlanmalı.<br />
@@ -70,6 +88,7 @@ ve bu veritabanına erişmek için kullanıcı adı - şifre ayarlanmalı.<br />
 <b>Kullanıcı:</b> veritabanı kullanıcısı<br />
 <b>Şifre:</b> kullanıcı şifresi<br />
 <b>Tablo öneki:</b> tüm tablo isimleri için isteğe bağlı önek';
+$string['databasesettingsformoodle'] = 'Moodle için veritabanı ayarları';
 $string['databasesettingshead'] = 'Şimdi, Moodle verilerinin saklanacağı veritabanını
 oluşturmanız gerekiyor. Bu veritabanı önceden oluşturulmalı
 ve bu veritabanına erişmek için kullanıcı adı - şifre ayarlanmalı.';
@@ -97,6 +116,12 @@ $string['databasesettingssub_mysql'] = '<b>Tipi:</b> MySQL<br />
 <b>Kullanıcı:</b> veritabanı kullanıcısı<br />
 <b>Şifre:</b> kullanıcı şifresi<br />
 <b>Tablo öneki:</b> tüm tablo isimleri için ön ek (isteğe bağlı)';
+$string['databasesettingssub_mysqli'] = '<b>Tipi:</b> Geliştirilmiş MySQL<br />
+<b>Sunucu:</b> ör: localhost veya db.iss.com<br />
+<b>Adı:</b> veritabanı adı, ör: moodle<br />
+<b>Kullanıcı:</b> veritabanı kullanıcısı<br />
+<b>Şifre:</b> kullanıcı şifresi<br />
+<b>Tablo öneki:</b> tüm tablo isimleri için ön ek (isteğe bağlı)';
 $string['databasesettingssub_oci8po'] = '<b>Tipi:</b> Oracle<br />
 <b>Sunucu:</b> kullanılmaz, boş bırakılmalı<br />
 <b>Adı:</b> tnsnames.ora bağlantısına verilen ad<br />
@@ -115,6 +140,9 @@ $string['databasesettingssub_postgres7'] = '<b>Tipi:</b> PostgreSQL<br />
 <b>Kullanıcı:</b> veritabanı kullanıcısı<br />
 <b>Şifre:</b> kullanıcı şifresi<br />
 <b>Tablo öneki:</b> tüm tablo isimleri için ön ek (gerekli)';
+$string['databasesettingswillbecreated'] = '<b>Not:</b> Kurulum programı veritabanı yoksa otomatikmen veritabanını oluşturmayı deneyecektir.';
+$string['databasetype'] = 'Veritabanı tipi:';
+$string['databaseuser'] = 'Veritabanı kullanıcısı:';
 $string['dataroot'] = 'Veri Dizini';
 $string['datarooterror'] = 'Belirtilen \'Veri Dizini\' bulunamadı veya oluşturulamadı. Dizin yolunu düzenleyin veya bu dizini kendiniz oluşturun.';
 $string['dbconnectionerror'] = 'Belirtiğiniz veritabanına bağlantı kuramadık. Lütfen veritabanı ayarlarını kontrol edin.';
@@ -156,24 +184,30 @@ Siteye yüklenen dosyaların nereye kaydedileceğini belirtin. Bu dizin sunucu k
 Ancak, bu dizine direkt olarak webden erişim olMAMAlı.';
 $string['dirroot'] = 'Moodle Dizini';
 $string['dirrooterror'] = '\'Moodle Dizini\' ayarları hatalı görünüyor - Burada bir Moodle kurulumu bulunamadı. Aşağıdaki değer yeniden ayarlandı.';
+$string['disagreelicense'] = 'GPL kabul edilmediğinden dolayı güncelleme ye devam edilemez!';
 $string['download'] = 'İndir';
 $string['downloadedfilecheckfailed'] = 'İndirilmiş dosya kontrol hatası';
-$string['downloadlanguagebutton'] = 'Dil paketini $a indir';
+$string['downloadlanguagebutton'] = '&quot;$a&quot; dil paketini indir';
 $string['downloadlanguagehead'] = 'Dil paketi indir';
 $string['downloadlanguagenotneeded'] = 'Varsayılan dil paketini \"$a\" kullanarak kurulum işlemine devam edebilirsiniz.';
-$string['downloadlanguagesub'] = 'Şu anda bir dil paketi indirme ve bu dilde kuruluma devam etme seçeneğiniz var.<br /><br />Dil paketini indiremezseniz kurulum işlemi İngilizce ile devam edecektir. (Kurulum işlemi bittiğinde ek dil paketlerini indirme ve kurma fırsatınız vardır.)';
-$string['doyouagree'] = 'Şartları okuyup kabul ediyor musunuz?';
+$string['downloadlanguagepack'] = 'Dil paketini şimdi indirmek istiyor musunuz (yes/no):';
+$string['downloadlanguagesub'] = 'Şu anda bir dil paketi indirme ve bu dilde kuruluma devam etme seçeneğiniz var.<br /><br />Dil paketini indiremezseniz kurulum işlemi İngilizce ile devam edecektir. (Kurulum işlemi bittiğinde ek dil paketlerini indirme ve kurma imkanınız vardır.)';
+$string['downloadsuccess'] = 'Dil Paketi Başarıyla İndirildi';
+$string['doyouagree'] = 'Kabul ediyor musunuz? (yes/no)';
 $string['environmenterrortodo'] = 'Bu Moodle sürümünü kurmaya başlamadan önce yukarıda bulunan bütün ortam sorunlarını (hatalarını) çözmeniz gerekiyor!';
 $string['environmenthead'] = 'Ortam kontrol ediliyor...';
+$string['environmentrecommendcustomcheck'] = 'bu test hata verirse önemli bir sorunu gösterir';
 $string['environmentrecommendinstall'] = 'yüklenmesi/etkinleştirilmesi tavsiye edilir';
 $string['environmentrecommendversion'] = 'sürüm $a->needed tavsiye edilir ve şu anda $a->current çalışıyor';
+$string['environmentrequirecustomcheck'] = 'bu test geçmeli';
 $string['environmentrequireinstall'] = 'yüklenmesi/etkinleştirilmesi gerekli';
 $string['environmentrequireversion'] = 'sürüm $a->needed gerekli ve şu anda $a->current çalışıyor';
-$string['environmentsub'] = 'Çeşitli bileşenlerin sisteminizle uyum içinde olup olmadığını kontrol ediyoruz';
+$string['environmentsub'] = 'Çeşitli bileşenlerin sisteminizle uyum içinde olup olmadığı kontrol ediliyor';
 $string['environmentxmlerror'] = 'Ortam verisini okurken hata ($a->error_code)';
 $string['error'] = 'Hata';
+$string['errorsinenvironment'] = 'Ortamda hatalar var!';
 $string['fail'] = 'Hata';
-$string['fileuploads'] = 'Dosya Göndermeleri';
+$string['fileuploads'] = 'Dosya Yüklemeleri';
 $string['fileuploadserror'] = 'Bu açık olmalı';
 $string['fileuploadshelp'] = '<p>Bu sunucuda, Dosya yüklemesi etkinleştirilmemiş görünüyor.</p>
 
@@ -205,17 +239,34 @@ $string['globalsquoteshelp'] = '<p>Pasifleştirilmiş Magic Quotes GPC ve etkinl
 $string['help'] = 'Yardım';
 $string['iconvrecommended'] = 'Sitenizde latin olmayan dilleri kullanıyorsanız isteğe bağlı ICONV kütüphanesinin kurulması site performansını arttırmak için şiddetle tavsiye edilir.';
 $string['info'] = 'Bilgi';
+$string['inputdatadirectory'] = 'Veri dizini:';
+$string['inputwebadress'] = 'Web adresi:';
+$string['inputwebdirectory'] = 'Moodle Dizini:';
 $string['installation'] = 'Kurulum';
-$string['invalidemail'] = 'Geçersiz e-posta adresi';
+$string['installationiscomplete'] = 'Kurulum tamamlandı!';
+$string['invalidargumenthelp'] = 'Hata: Geçersiz argüman(lar)
+Kullanım: $php cliupgrade.php SECENEKLER
+Daha fazla yardım için --help seçeneğini kullanın';
+$string['invalidemail'] = 'Geçersiz Eposta';
+$string['invalidhost'] = 'Geçersiz Alan adı';
+$string['invalidint'] = 'Hata: değer sayı değil';
+$string['invalidintrange'] = 'Hata: değer aralık dışında';
 $string['invalidmd5'] = 'Geçersiz md5';
+$string['invalidpath'] = 'Geçersiz yol';
+$string['invalidsetelement'] = 'Hata: Girilen değer seçeneklerdekiyle aynı değil';
+$string['invalidtextvalue'] = 'Geçersiz Metin Değeri';
+$string['invalidurl'] = 'Geçersiz URL';
+$string['invalidvalueforlanguage'] = '--lang seçeneği için geçersiz değer. Daha fazla yardım için --help yazınız';
+$string['invalidyesno'] = 'Hata: değer geçerli bir yes/no argümanı değil';
 $string['langdownloaderror'] = 'Maalesef \"$a\" dil paketi kurulamadı. Kuruluma İngilizce olarak devam edilecek.';
 $string['langdownloadok'] = 'Dil paketi \"$a\" başarıyla kuruldu. Kurulum bu dilde devam edecek.';
 $string['language'] = 'Dil';
+$string['locationanddirectories'] = 'Yerler ve klasörler';
 $string['magicquotesruntime'] = 'Magic Quotes Run Time';
 $string['magicquotesruntimeerror'] = 'Bu kapalı olmalı';
 $string['magicquotesruntimehelp'] = '<p>Magic quotes runtime ayarı, Moodle\'ın işlevsel çalışması için kapalı olmalı.</p>
 
-<p>Normalde de zaten bu varsayılan olarak kapalıdır ...  php.ini dosyasındaki <b>magic_quotes_runtime</b> ayarına bakın.</p>
+<p>Normalde de zaten bu varsayılan olarak kapalıdır... php.ini dosyasındaki <b>magic_quotes_runtime</b> ayarına bakın.</p>
 
 <p>php.ini dosyasına erişim hakkınız yoksa, Moodle klasöründe yer alan .htaccess isimli dosyada şu ayarı yapın:
 
@@ -256,6 +307,8 @@ $string['mysql'] = 'MySQL (mysql)';
 $string['mysql416bypassed'] = 'Siteniz SADECE iso-8859-1 (latin) dillerini kullanıyorsa şimdiki kurulu  MySQL 4.1.12 (veya yüksek) veritabanını kullanmaya devam edebilirsiniz.';
 $string['mysql416required'] = 'Moodle 1.6 için ilerde tüm verilerin UTF-8\'e çevrilebilmesinin garantilenmesi için en az MySQL 4.1.16 kurulu olması gerekir.';
 $string['mysqlextensionisnotpresentinphp'] = 'PHP, MySQL ile iletişim kurabilmek için mysql uzantısı düzgün bir şekilde yapılandırılmamış. Lütfen php.ini dosyasını kontrol edin veya PHP\'yi tekrar derleyin.';
+$string['mysqli'] = 'Geliştirilmiş MySQL (mysqli)';
+$string['mysqliextensionisnotpresentinphp'] = 'PHP, MySQLi ile iletişim kurabilmek için mysqli uzantısı düzgün bir şekilde yapılandırılmamış. Lütfen php.ini dosyasını kontrol edin veya PHP\'yi tekrar derleyin. MySQLi uzantısı PHP4 te kullanılamaz.';
 $string['name'] = 'Ad';
 $string['next'] = 'Sonraki';
 $string['oci8po'] = 'Oracle (oci8po)';
@@ -275,7 +328,8 @@ $string['phpversionhelp'] = '<p>Moodle, PHP sürümünün en az 4.3.0 veya 5.1.0
 <p>PHP\'yi güncellemeli veya PHP\'nin yeni sürümünü kullananan bir hostinge taşınmalısınız!</p>';
 $string['postgres7'] = 'PostgreSQL (postgres7)';
 $string['previous'] = 'Önceki';
-$string['releasenoteslink'] = 'Moodle\'ın bu sürümü hakkında bilgi için lütfen çevrimiçi <a target=\"_new\" href=\"$a\">Sürüm Notlarına</a> bakınız';
+$string['releasenoteslink'] = 'Moodle\'ın bu sürümü hakkında daha fazla bilgi için lütfen bu adresteki Sürüm Notlarına bakın: $a';
+$string['remotedownloaderror'] = 'Bileşeni sunucunuza indirirken hata oluştu, lütfen proxy(vekil) ayarlarını kontrol edin. PHP cURL eklentisi şiddetle tavsiye edilir.<br /><br /><a href=\"$a->url\">$a->url</a><br />dosyasını kendiniz indirmeli ve indirdiğiniz dosyayı sunucunuzundaki \"$a->dest\" klasörüne kaydetmeli ve zip arşivini açmalısınız.';
 $string['remotedownloadnotallowed'] = 'Sunucunuza bileşen indirmeye izin verilmiyor. (allow_url_fopen pasif).<br /><br />Arşivlenmiş dosyayı <a href=\"$a->url\">$a->url</a> elle indirip buraya \"$a->dest\" açmalısınız.';
 $string['report'] = 'Rapor';
 $string['restricted'] = 'Sınırlandırıldı';
@@ -283,21 +337,73 @@ $string['safemode'] = 'Safe Mode';
 $string['safemodeerror'] = 'Moodle, safe mode\'ın açık olması durumunda bazı sorunlar çıkartabilir';
 $string['safemodehelp'] = '<p>Moodle, safe mode\'un açık olması durumunda bazı sorunlar çıkartabilir. Moodle tarafından en azından bazı dosyaların oluşturulması gerekiyor, ama bu mod yeni dosyaların oluşturulmasına izin vermiyor.</p>
 <p>Safe mode sadece paranoyak web hostinglerince kullanılmaktadır. Bu durumda Moodle için başka bir web hosting firması bulmanız gerekiyor.</p>
-<p>İsterseniz devam edebilirsiniz, ama daha sonra bir çok sorunla karşılaşırsınız.</p>';
+<p>İsterseniz devam edebilirsiniz, ama daha sonra çok fazla sorunla karşılaşırsınız.</p>';
+$string['selectlanguage'] = 'Kurulum için dil seçimi';
 $string['serverchecks'] = 'Sunucu Kontrolleri';
 $string['sessionautostart'] = 'Otomatik Oturum Başlama';
 $string['sessionautostarterror'] = 'Bu kapalı olmalı';
 $string['sessionautostarthelp'] = '<p>Moodle, oturum desteği gerektirir ve bu olmadan işlevsel çalışamaz.</p>
 
 <p>Oturum desteği php.ini dosyasından ayarlanabilir ... session.auto_start parametresine bakın.</p>';
+$string['sitefullname'] = 'Site tam adı:';
+$string['siteinfo'] = 'Site Ayrıntıları';
+$string['sitenewsitems'] = 'Haber Öğeleri';
+$string['siteshortname'] = 'Site kısa adı:';
+$string['sitesummary'] = 'Site özeti:';
 $string['skipdbencodingtest'] = 'Veritabanı Dil Kodlama Testini Atla';
 $string['status'] = 'Durum';
+$string['tableprefix'] = 'Tablo öneki:';
 $string['thischarset'] = 'UTF-8';
 $string['thisdirection'] = 'ltr';
 $string['thislanguage'] = 'Türkçe';
 $string['unicoderecommended'] = 'Bütün verilerinizi Unicode (UTF-8) olarak saklamanız tavsiye edilir. Yeni kurulumların veritabanlarına varsayılan olarak Unicode karakter setinde işlem yapması önerilir. Güncelleme yapıyorsanız, UTF-8 Çevirim işlemini yapmanız gerekiyor (Yönetici sayfasına bakınız).';
 $string['unicoderequired'] = 'Bütün verilerinizi Unicode (UTF-8) olarak saklamanız gerekir. Yeni kurulumların veritabanlarına varsayılan olarak Unicode karakter setinde işlem yapması gerekir. Güncelleme yapıyorsanız, UTF-8 Çevirim işlemini yapmanız gerekiyor (Yönetici sayfasına bakınız).';
+$string['upgradingactivitymodule'] = 'Etkinlik Modülü Güncelleniyor';
+$string['upgradingbackupdb'] = 'Yedekleme Veribananı Güncelleniyor';
+$string['upgradingblocksdb'] = 'Blok Veritabanı Güncelleniyor';
+$string['upgradingblocksplugin'] = 'Blok Eklentileri Güncelleniyor';
+$string['upgradingcompleted'] = 'Güncelleme tamamlandı...';
+$string['upgradingcourseformatplugin'] = 'Kurs Biçimi Eklentisi Güncelleniyor';
+$string['upgradingenrolplugin'] = 'Ders Kaydı Eklentisi Güncelleniyor';
+$string['upgradinggradeexportplugin'] = 'Başarı Notu Dışa Ver Eklentisi Güncelleniyor';
+$string['upgradinggradeimportplugin'] = 'Başarı Notu İçe Al Eklentisi Güncelleniyor';
+$string['upgradinggradereportplugin'] = 'Başarı Notu Rapor Eklentisi Güncelleniyor';
+$string['upgradinglocaldb'] = 'Yerel Veritabanı Güncelleniyor';
+$string['upgradingmessageoutputpluggin'] = 'Mesaj Çıktısı Eklentisi Güncelleniyor';
+$string['upgradingqtypeplugin'] = 'Soru Tipi Eklentisi Güncelleniyor';
+$string['upgradingrpcfunctions'] = 'RPC İşlevleri Güncelleniyor';
+$string['usagehelp'] = 'Özet:
+$php cliupgrade.php SECENEKLER
+
+SECENEKLER
+--lang Kurulum icin gecerli kurulu dil. Varsayilan English(en)
+--webaddr Moodle sitesi icin web adresi
+--moodledir Moodle web dizini yeri
+--datadir Moodle veri dizini yeri (webden ulasilamamali)
+--dbtype Veritabani tipi. Varsayilan mysql
+--dbhost Veritabani sunucusu. Varsayilan localhost
+--dbname Veritabani adi. Varsayilan moodle
+--dbuser Veritabani kullanicisi. Varsayilan bos
+--dbpass Veritabani sifresi. Varsayilan bos
+--prefix Yukaridaki veritabani tablolari icin onek. Varsayilan mdl
+--verbose 0 Cikti yok, 1 Ozet cikti(Varsayilan), 2 Ayrintili cikti
+--interactivelevel 0 Interaktiflik yok, 1 Yari interaktif(Varsayilan), 2 Interaktif
+--agreelicense Lisansin kabulu. Yes(Varsayilan) veya No
+--confirmrelease Surumun kabulu. Yes(Varsayilan) veya No
+--sitefullname Site icin tam ad. Varsayilan: Moodle Site (Lutfen Site Adini Degistirin!!)
+--siteshortname Site icin kisa ad. Varsayilan moodle
+--sitesummary Site ozeti. Varsayilan bos
+--adminfirstname Yoneticinin adi. Varsayilan Admin
+--adminlastname Yoneticinin soyadi. Varsayilan User
+--adminusername Yonetici icin kullaniciadi. Varsayilan admin
+--adminpassword Yonetici icin sifre. Varsayilan admin
+--adminemail Yoneticinin eposta adresi. Varsayilan root@localhost
+--help Yardimi yaz
+
+Kullanim:
+$php cliupgrade.php --lang=tr --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=\"Ornek Moodle Sitesi\" --siteshortname=moodle --sitesummary=siteforme --adminfirstname=Admin --adminlastname=User --adminusername=admin --adminpassword=admin --adminemail=admin@example.com --verbose=1 --interactivelevel=2';
 $string['user'] = 'Kullanıcı';
+$string['versionerror'] = 'Sürüm hatasından kullanıcı iptal edildi';
 $string['welcomep10'] = '$a->installername ($a->installerversion)';
 $string['welcomep20'] = 'Bilgisayarınıza <strong>$a->packname $a->packversion</strong> paketini başarıyla kurdunuz. Tebrikler!';
 $string['welcomep30'] = '<strong>$a->installername</strong>\'nin bu sürümü <strong>Moodle</strong>\'da bir ortam oluşturmak için uygulamaları içerir:';
@@ -305,9 +411,12 @@ $string['welcomep40'] = 'Bu paket <strong>Moodle $a->moodlerelease ($a->moodleve
 $string['welcomep50'] = 'Bu paketteki tüm uygulamaların kullanımı her biri kendine ait olan lisanslar tarafından yönetilir. <strong>$a->installername</strong> paketinin tamamı <a href=\"http://www.opensource.org/docs/definition_plain.html\">açık kaynak</a> kodludur ve <a href=\"http://www.gnu.org/copyleft/gpl.html\">GPL</a> lisansı altında dağıtılır.';
 $string['welcomep60'] = 'Aşağıdaki sayfalar <strong>Moodle</strong>ın kurulumu ve yapılandırılması için size basitçe yol gösterecektir. Varsayılan ayarları kabul edebilir veya ihtiyaçlarınıza göre bunları değiştirebilirsiniz.';
 $string['welcomep70'] = '<strong>Moodle</strong> kurulumu için aşağıdaki \"İleri\" tuşuna basın.';
+$string['welcometext'] = '---Komut satırı kurulumuna hoş geldiniz---';
+$string['writetoconfigfilefaild'] = 'Hata: Ayar dosyasına yazarken hata oluştu';
 $string['wrongdestpath'] = 'Hatalı hedef yolu';
 $string['wrongsourcebase'] = 'Hatalı kaynak URL base.';
 $string['wrongzipfilename'] = 'Hatalı ZIP dosya adı.';
 $string['wwwroot'] = 'Web adresi';
 $string['wwwrooterror'] = 'Web adresi doğru ayarlanmış görünmüyor. Moodle kurulumu belirtilen yerde görünmüyor.';
+$string['yourchoice'] = 'Seçiminiz:';
 ?>

install/lang/zh_cn_utf8/installer.php

@@ -92,6 +92,12 @@ $string['databasesettingssub_mysql'] = '<b>类型:</b> MySQL<br />
 <b>用户:</b> 您的数据库用户名<br />
 <b>密码:</b> 您的数据库密码<br />
 <b>表格前缀:</b> 在所有的表格名称前加上前缀（可选的）';
+$string['databasesettingssub_mysqli'] = '<b>类型:</b> 改进的MySQL<br />
+<b>主机:</b> 例如，localhost或者db.isp.com<br />
+<b>名字:</b> 数据库名, 比如moodle<br />
+<b>用户:</b> 您的数据库用户名<br />
+<b>密码:</b> 您的数据库密码<br />
+<b>表格前缀:</b> 在所有的表格名称前加上前缀（可选的）';
 $string['databasesettingssub_oci8po'] = '<b>类型:</b> Oracle<br />
 <b>主机:</b> 不需要，必须留空<br />
 <b>名字:</b> 给出tnsnames.ora连接的名字<br />
@@ -110,6 +116,7 @@ $string['databasesettingssub_postgres7'] = '<b>类型:</b> PostgreSQL<br />
 <b>用户:</b> 您的数据库用户名<br />
 <b>密码:</b> 您的数据库密码<br />
 <b>表格前缀:</b> 在所有的表格名称前加上前缀(强制的)';
+$string['databasesettingswillbecreated'] = '<b>注意：</b>如果数据库不存在，则安装程序会尝试创建它。';
 $string['dataroot'] = '数据目录';
 $string['datarooterror'] = '找不到也无法创建您指定的“数据目录”，请更正路径或手工创建它。';
 $string['dbconnectionerror'] = '无法连接到您指定的数据库，请检查您的数据库设置。';
@@ -152,8 +159,10 @@ $string['downloadlanguagesub'] = '您现在可以下载一个语言包并以该
 $string['doyouagree'] = '您已经阅读并理解了这些条件吗?';
 $string['environmenterrortodo'] = '在继续安装此版本的 Moodle 前，您必需解决上面所列出的所有环境问题（错误）！';
 $string['environmenthead'] = '检测您的运行环境...';
+$string['environmentrecommendcustomcheck'] = '如果此测试失败，就表示有潜在的错误';
 $string['environmentrecommendinstall'] = '- 推荐安装/激活';
 $string['environmentrecommendversion'] = '推荐 {$a->needed} 版本，而您的是 {$a->current}';
+$string['environmentrequirecustomcheck'] = '此测试必须通过';
 $string['environmentrequireinstall'] = '- 必需安装/激活';
 $string['environmentrequireversion'] = '需要 {$a->needed} 版本，而您的是 {$a->current}';
 $string['environmentsub'] = '我们正在检查您系统中的某些组件是否符合需求';
@@ -186,6 +195,7 @@ $string['globalsquoteshelp'] = '<p>我们不建议你在禁用Magic Quotes GPC
 <blockquote>php_value magic_quotes_gpc On</blockquote>
 <blockquote>php_value register_globals Off</blockquote>
 </p>';
+$string['globalswarning'] = '<p><strong>安全警告</strong>: 为了能够正常工作，Moodle需要您修改您修改您的PHP设置。<p/><p>您<em>必须</em>设定<code>register_globals=off</code>。<p>此选项由您的<code>php.ini</code>文件控制，您也可以修改Apache/IIS的配置或者是<code>.htaccess</code>文件。</p>';
 $string['help'] = '帮助';
 $string['iconvrecommended'] = '我们强烈建议您安装时 ICONV 库，特别是您的站点使用非拉丁语系的语言时，它可以大大提升系统性能。';
 $string['info'] = '信息';
@@ -227,6 +237,8 @@ $string['mysql'] = 'MySQL (mysql)';
 $string['mysql416bypassed'] = '如果您的站点只使用 iso-8859-1 (latin) 语言，您可以使用您当前安装的 MySQL 4.1.12(或更高)。';
 $string['mysql416required'] = 'MySQL 4.1.16 是 Moodle 1.6 所需要的最低版本，否则将无法保证所有数据都能转换到 UTF-8 编码。';
 $string['mysqlextensionisnotpresentinphp'] = 'PHP的MySQL扩展并未安装正确，因此无法与MySQL通信。请检查您的php.ini文件或重新编译PHP。';
+$string['mysqli'] = '改进的MySQL(mysqli)';
+$string['mysqliextensionisnotpresentinphp'] = 'PHP的MySQLi扩展并未安装正确，因此无法与MySQL通信。请检查您的php.ini文件或重新编译PHP。';
 $string['name'] = '名称';
 $string['next'] = '向后';
 $string['oci8po'] = 'Oracle (oci8po)';
@@ -246,6 +258,8 @@ $string['phpversionhelp'] = '<p>Moodle需要PHP 4.3.0或5.1.0（5.0.x有若干
 <p>您必须升级PHP或者转移到一个有新版PHP的服务器上!</p>';
 $string['postgres7'] = 'PostgreSQL (postgres7)';
 $string['previous'] = '向前';
+$string['qtyperqpwillberemoved'] = '在升级过程中，RQP问题类型将会被删除。您没有使用此问题类型，因此您不会遇到任何问题。';
+$string['qtyperqpwillberemovedanyway'] = '在升级过程中，RQP问题类型将会被删除。在您的数据库中有一些RQP问题，除非您在继续升级前重新安装 http://moodle.org/mod/data/view.php?d=13&amp;rid=797 的代码，否则它们将会停止工作。';
 $string['releasenoteslink'] = '对于这个版本的 Moodle，请参考在线的 <a target=\"_new\" href=\"{$a}\">发行备忘录</a>。';
 $string['remotedownloadnotallowed'] = '不允许为您的服务器下载组件(allow_url_fopen失败)。<br /><br />您应该<a href=\"{$a->url}\">{$a->url}</a> 先手动的把它复制到“{$a->dest}”您的服务器上然后解压。';
 $string['report'] = '报表';
@@ -283,4 +297,5 @@ $string['wrongsourcebase'] = '错误的源URL基地址。';
 $string['wrongzipfilename'] = '错误的ZIP文件名。';
 $string['wwwroot'] = '网站地址';
 $string['wwwrooterror'] = '这个网站地址似乎是错的——在那里并没有安装好的Moodle。下面的值会被重置。';
+$string['xmlrpcrecommended'] = '安装可选的xmlrpc扩展模块对于Moodle网络功能很有用。';
 ?>

lang/en_utf8/admin.php

@@ -303,6 +303,7 @@ $string['fullnamedisplay'] = 'Full Name Format';
 $string['gdversion'] = 'GD version';
 $string['generalsettings'] = 'General settings';
 $string['globalsquoteswarning'] = '<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> and/or <code>magic_quotes_gpc=on</code>. <br />If possible, you should set <code>register_globals=off</code> to improve general <br /> server security, setting <code>magic_quotes_gpc=on</code> is also recommended.<p/><p>These settings are controlled by editing your <code>php.ini</code>, Apache/IIS <br />configuration or <code>.htaccess</code> file.</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['gotofirst'] = 'Go to first missing string';
 $string['gradebook'] = 'Gradebook';
 $string['gradebookroles'] = 'Graded roles';
@@ -340,6 +341,7 @@ $string['langimport'] = 'Language import utility';
 $string['langimportsuccess'] = 'Language pack successfully upgraded';
 $string['langlist'] = 'Languages on language menu';
 $string['langmenu'] = 'Display language menu';
+$string['langnoeditenglish'] = 'Can\'t overwrite the base english language pack. Please switch lang directory to make local changes';
 $string['langpackremoved'] = 'Language pack was uninstalled';
 $string['langpacks'] = 'Language packs';
 $string['langpackupdated'] = 'Language pack $a was successfully installed';
@@ -582,6 +584,6 @@ $string['userscreated'] = 'Users created';
 $string['usersrenamed'] = 'Users renamed';
 $string['usersupdated'] = 'Users updated';
 $string['validateerror'] = 'This value was not valid:';
-
+$string['xmlrpcrecommended'] = 'Installing the optional xmlrpc extension is useful for Moodle Networking functionality.';
 
 ?>

lang/en_utf8/countries.php

@@ -1,246 +1,258 @@
-<?PHP // $Id$ 
+<?PHP // $Id$
       // countries.php - created with Moodle 1.7 beta + (2006101003)
+      // http://www.iso.org/iso/country_codes/iso_3166_code_lists.htm
+      //
+      // UPDATE NOTE - When country codes are deleted or re-assigned, 
+      // you must re-assign users to a valid country, doing both:
+      // 1 - add an upgrade path in /lib/db/upgrade.php
+      // 2 - add a line in the $country_update_map array, in 
+      //     /backup/restorelib.php 
 
-
-$string['AD'] = 'Andorra';
-$string['AE'] = 'United Arab Emirates';
 $string['AF'] = 'Afghanistan';
-$string['AG'] = 'Antigua and Barbuda';
-$string['AI'] = 'Anguilla';
+$string['AX'] = 'Åland Islands';
 $string['AL'] = 'Albania';
-$string['AM'] = 'Armenia';
-$string['AN'] = 'Netherlands Antilles';
-$string['AO'] = 'Angola';
-$string['AQ'] = 'Antarctica';
-$string['AR'] = 'Argentina';
+$string['DZ'] = 'Algeria';
 $string['AS'] = 'American Samoa';
-$string['AT'] = 'Austria';
-$string['AU'] = 'Australia';
+$string['AD'] = 'Andorra';
+$string['AO'] = 'Angola';
+$string['AI'] = 'Anguilla';
+$string['AQ'] = 'Antarctica';
+$string['AG'] = 'Antigua And Barbuda';
+$string['AR'] = 'Argentina';
+$string['AM'] = 'Armenia';
 $string['AW'] = 'Aruba';
+$string['AU'] = 'Australia';
+$string['AT'] = 'Austria';
 $string['AZ'] = 'Azerbaijan';
-$string['BA'] = 'Bosnia and Herzegovina';
-$string['BB'] = 'Barbados';
-$string['BD'] = 'Bangladesh';
-$string['BE'] = 'Belgium';
-$string['BF'] = 'Burkina Faso';
-$string['BG'] = 'Bulgaria';
+$string['BS'] = 'Bahamas';
 $string['BH'] = 'Bahrain';
-$string['BI'] = 'Burundi';
+$string['BD'] = 'Bangladesh';
+$string['BB'] = 'Barbados';
+$string['BY'] = 'Belarus';
+$string['BE'] = 'Belgium';
+$string['BZ'] = 'Belize';
 $string['BJ'] = 'Benin';
 $string['BM'] = 'Bermuda';
-$string['BN'] = 'Brunei Darussalam';
-$string['BO'] = 'Bolivia';
-$string['BR'] = 'Brazil';
-$string['BS'] = 'Bahamas';
 $string['BT'] = 'Bhutan';
-$string['BV'] = 'Bouvet Island';
+$string['BO'] = 'Bolivia';
+$string['BA'] = 'Bosnia And Herzegovina';
 $string['BW'] = 'Botswana';
-$string['BY'] = 'Belarus';
-$string['BZ'] = 'Belize';
-$string['CA'] = 'Canada';
-$string['CC'] = 'Cocos (Keeling) Islands';
-$string['CF'] = 'Central African Republic';
-$string['CG'] = 'Congo';
-$string['CH'] = 'Switzerland';
-$string['CI'] = 'Cote D\'Ivoire';
-$string['CK'] = 'Cook Islands';
-$string['CL'] = 'Chile';
+$string['BV'] = 'Bouvet Island';
+$string['BR'] = 'Brazil';
+$string['IO'] = 'British Indian Ocean Territory';
+$string['BN'] = 'Brunei Darussalam';
+$string['BG'] = 'Bulgaria';
+$string['BF'] = 'Burkina Faso';
+$string['BI'] = 'Burundi';
+$string['KH'] = 'Cambodia';
 $string['CM'] = 'Cameroon';
-$string['CN'] = 'China';
-$string['CO'] = 'Colombia';
-$string['CR'] = 'Costa Rica';
-$string['CS'] = 'Serbia and Montenegro';
-$string['CU'] = 'Cuba';
+$string['CA'] = 'Canada';
 $string['CV'] = 'Cape Verde';
+$string['KY'] = 'Cayman Islands';
+$string['CF'] = 'Central African Republic';
+$string['TD'] = 'Chad';
+$string['CL'] = 'Chile';
+$string['CN'] = 'China';
 $string['CX'] = 'Christmas Island';
+$string['CC'] = 'Cocos (Keeling) Islands';
+$string['CO'] = 'Colombia';
+$string['KM'] = 'Comoros';
+$string['CG'] = 'Congo';
+$string['CD'] = 'Congo, The Democratic Republic Of The';
+$string['CK'] = 'Cook Islands';
+$string['CR'] = 'Costa Rica';
+$string['CI'] = 'Côte D\'Ivoire';
+$string['HR'] = 'Croatia';
+$string['CU'] = 'Cuba';
 $string['CY'] = 'Cyprus';
 $string['CZ'] = 'Czech Republic';
-$string['DE'] = 'Germany';
-$string['DJ'] = 'Djibouti';
 $string['DK'] = 'Denmark';
+$string['DJ'] = 'Djibouti';
 $string['DM'] = 'Dominica';
 $string['DO'] = 'Dominican Republic';
-$string['DZ'] = 'Algeria';
 $string['EC'] = 'Ecuador';
-$string['EE'] = 'Estonia';
 $string['EG'] = 'Egypt';
-$string['EH'] = 'Western Sahara';
+$string['SV'] = 'El Salvador';
+$string['GQ'] = 'Equatorial Guinea';
 $string['ER'] = 'Eritrea';
-$string['ES'] = 'Spain';
+$string['EE'] = 'Estonia';
 $string['ET'] = 'Ethiopia';
-$string['FI'] = 'Finland';
-$string['FJ'] = 'Fiji';
 $string['FK'] = 'Falkland Islands (Malvinas)';
-$string['FM'] = 'Micronesia; Federated States of';
 $string['FO'] = 'Faroe Islands';
+$string['FJ'] = 'Fiji';
+$string['FI'] = 'Finland';
 $string['FR'] = 'France';
-$string['FX'] = 'France; Metropolitan';
-$string['GA'] = 'Gabon';
-$string['GB'] = 'United Kingdom';
-$string['GD'] = 'Grenada';
-$string['GE'] = 'Georgia';
 $string['GF'] = 'French Guiana';
+$string['PF'] = 'French Polynesia';
+$string['TF'] = 'French Southern Territories';
+$string['GA'] = 'Gabon';
+$string['GM'] = 'Gambia';
+$string['GE'] = 'Georgia';
+$string['DE'] = 'Germany';
 $string['GH'] = 'Ghana';
 $string['GI'] = 'Gibraltar';
-$string['GL'] = 'Greenland';
-$string['GM'] = 'Gambia';
-$string['GN'] = 'Guinea';
-$string['GP'] = 'Guadeloupe';
-$string['GQ'] = 'Equatorial Guinea';
 $string['GR'] = 'Greece';
-$string['GT'] = 'Guatemala';
+$string['GL'] = 'Greenland';
+$string['GD'] = 'Grenada';
+$string['GP'] = 'Guadeloupe';
 $string['GU'] = 'Guam';
+$string['GT'] = 'Guatemala';
+$string['GG'] = 'Guernsey';
+$string['GN'] = 'Guinea';
 $string['GW'] = 'Guinea-Bissau';
 $string['GY'] = 'Guyana';
-$string['HK'] = 'Hong Kong';
-$string['HM'] = 'Heard and Mc Donald Islands';
-$string['HN'] = 'Honduras';
-$string['HR'] = 'Croatia (Hrvatska)';
 $string['HT'] = 'Haiti';
+$string['HM'] = 'Heard Island And Mcdonald Islands';
+$string['VA'] = 'Holy See (Vatican City State)';
+$string['HN'] = 'Honduras';
+$string['HK'] = 'Hong Kong';
 $string['HU'] = 'Hungary';
-$string['ID'] = 'Indonesia';
-$string['IE'] = 'Ireland';
-$string['IL'] = 'Israel';
-$string['IN'] = 'India';
-$string['IO'] = 'British Indian Ocean Territory';
-$string['IQ'] = 'Iraq';
-$string['IR'] = 'Iran (Islamic Republic of)';
 $string['IS'] = 'Iceland';
+$string['IN'] = 'India';
+$string['ID'] = 'Indonesia';
+$string['IR'] = 'Iran, Islamic Republic Of';
+$string['IQ'] = 'Iraq';
+$string['IE'] = 'Ireland';
+$string['IM'] = 'Isle Of Man';
+$string['IL'] = 'Israel';
 $string['IT'] = 'Italy';
 $string['JM'] = 'Jamaica';
-$string['JO'] = 'Jordan';
 $string['JP'] = 'Japan';
-$string['KE'] = 'Kenya';
-$string['KG'] = 'Kyrgyzstan';
-$string['KH'] = 'Cambodia';
-$string['KI'] = 'Kiribati';
-$string['KM'] = 'Comoros';
-$string['KN'] = 'Saint Kitts and Nevis';
-$string['KO'] = 'Kosovo';
-$string['KP'] = 'Korea; Democratic People\'s Republic of';
-$string['KR'] = 'Korea; Republic of';
-$string['KW'] = 'Kuwait';
-$string['KY'] = 'Cayman Islands';
+$string['JE'] = 'Jersey';
+$string['JO'] = 'Jordan';
 $string['KZ'] = 'Kazakhstan';
-$string['LA'] = 'Lao People\'s Democratic Republic';
+$string['KE'] = 'Kenya';
+$string['KI'] = 'Kiribati';
+$string['KP'] = 'Korea, Democratic People\'S Republic Of';
+$string['KR'] = 'Korea, Republic Of';
+$string['KW'] = 'Kuwait';
+$string['KG'] = 'Kyrgyzstan';
+$string['LA'] = 'Lao People\'S Democratic Republic';
+$string['LV'] = 'Latvia';
 $string['LB'] = 'Lebanon';
-$string['LC'] = 'Saint Lucia';
-$string['LI'] = 'Liechtenstein';
-$string['LK'] = 'Sri Lanka';
-$string['LR'] = 'Liberia';
 $string['LS'] = 'Lesotho';
+$string['LR'] = 'Liberia';
+$string['LY'] = 'Libyan Arab Jamahiriya';
+$string['LI'] = 'Liechtenstein';
 $string['LT'] = 'Lithuania';
 $string['LU'] = 'Luxembourg';
-$string['LV'] = 'Latvia';
-$string['LY'] = 'Libyan Arab Jamahiriya';
-$string['MA'] = 'Morocco';
-$string['MC'] = 'Monaco';
-$string['MD'] = 'Moldova; Republic of';
+$string['MO'] = 'Macao';
+$string['MK'] = 'Macedonia, The Former Yugoslav Republic Of';
 $string['MG'] = 'Madagascar';
-$string['MH'] = 'Marshall Islands';
-$string['MK'] = 'Macedonia; Former Yugoslav Republic of';
+$string['MW'] = 'Malawi';
+$string['MY'] = 'Malaysia';
+$string['MV'] = 'Maldives';
 $string['ML'] = 'Mali';
-$string['MM'] = 'Myanmar';
-$string['MN'] = 'Mongolia';
-$string['MO'] = 'Macau';
-$string['MP'] = 'Northern Mariana Islands';
+$string['MT'] = 'Malta';
+$string['MH'] = 'Marshall Islands';
 $string['MQ'] = 'Martinique';
 $string['MR'] = 'Mauritania';
-$string['MS'] = 'Montserrat';
-$string['MT'] = 'Malta';
 $string['MU'] = 'Mauritius';
-$string['MV'] = 'Maldives';
-$string['MW'] = 'Malawi';
+$string['YT'] = 'Mayotte';
 $string['MX'] = 'Mexico';
-$string['MY'] = 'Malaysia';
+$string['FM'] = 'Micronesia, Federated States Of';
+$string['MD'] = 'Moldova, Republic Of';
+$string['MC'] = 'Monaco';
+$string['MN'] = 'Mongolia';
+$string['ME'] = 'Montenegro';
+$string['MS'] = 'Montserrat';
+$string['MA'] = 'Morocco';
 $string['MZ'] = 'Mozambique';
+$string['MM'] = 'Myanmar';
 $string['NA'] = 'Namibia';
-$string['NC'] = 'New Caledonia';
-$string['NE'] = 'Niger';
-$string['NF'] = 'Norfolk Island';
-$string['NG'] = 'Nigeria';
-$string['NI'] = 'Nicaragua';
-$string['NL'] = 'Netherlands';
-$string['NO'] = 'Norway';
-$string['NP'] = 'Nepal';
 $string['NR'] = 'Nauru';
-$string['NU'] = 'Niue';
+$string['NP'] = 'Nepal';
+$string['NL'] = 'Netherlands';
+$string['AN'] = 'Netherlands Antilles';
+$string['NC'] = 'New Caledonia';
 $string['NZ'] = 'New Zealand';
+$string['NI'] = 'Nicaragua';
+$string['NE'] = 'Niger';
+$string['NG'] = 'Nigeria';
+$string['NU'] = 'Niue';
+$string['NF'] = 'Norfolk Island';
+$string['MP'] = 'Northern Mariana Islands';
+$string['NO'] = 'Norway';
 $string['OM'] = 'Oman';
-$string['PA'] = 'Panama';
-$string['PE'] = 'Peru';
-$string['PF'] = 'French Polynesia';
-$string['PG'] = 'Papua New Guinea';
-$string['PH'] = 'Philippines';
 $string['PK'] = 'Pakistan';
-$string['PL'] = 'Poland';
-$string['PM'] = 'St. Pierre and Miquelon';
-$string['PN'] = 'Pitcairn';
-$string['PR'] = 'Puerto Rico';
-$string['PS'] = 'Palestine';
-$string['PT'] = 'Portugal';
 $string['PW'] = 'Palau';
+$string['PS'] = 'Palestinian Territory, Occupied';
+$string['PA'] = 'Panama';
+$string['PG'] = 'Papua New Guinea';
 $string['PY'] = 'Paraguay';
+$string['PE'] = 'Peru';
+$string['PH'] = 'Philippines';
+$string['PN'] = 'Pitcairn';
+$string['PL'] = 'Poland';
+$string['PT'] = 'Portugal';
+$string['PR'] = 'Puerto Rico';
 $string['QA'] = 'Qatar';
-$string['RE'] = 'Reunion';
+$string['RE'] = 'Réunion';
 $string['RO'] = 'Romania';
 $string['RU'] = 'Russian Federation';
 $string['RW'] = 'Rwanda';
-$string['SA'] = 'Saudi Arabia';
-$string['SB'] = 'Solomon Islands';
-$string['SC'] = 'Seychelles';
-$string['SD'] = 'Sudan';
-$string['SE'] = 'Sweden';
-$string['SG'] = 'Singapore';
-$string['SH'] = 'St. Helena';
-$string['SI'] = 'Slovenia';
-$string['SJ'] = 'Svalbard and Jan Mayen Islands';
-$string['SK'] = 'Slovakia (Slovak Republic)';
-$string['SL'] = 'Sierra Leone';
+$string['BL'] = 'Saint Barthélemy';
+$string['SH'] = 'Saint Helena';
+$string['KN'] = 'Saint Kitts And Nevis';
+$string['LC'] = 'Saint Lucia';
+$string['MF'] = 'Saint Martin';
+$string['PM'] = 'Saint Pierre And Miquelon';
+$string['VC'] = 'Saint Vincent And The Grenadines';
+$string['WS'] = 'Samoa';
 $string['SM'] = 'San Marino';
+$string['ST'] = 'Sao Tome And Principe';
+$string['SA'] = 'Saudi Arabia';
 $string['SN'] = 'Senegal';
+$string['RS'] = 'Serbia';
+$string['SC'] = 'Seychelles';
+$string['SL'] = 'Sierra Leone';
+$string['SG'] = 'Singapore';
+$string['SK'] = 'Slovakia';
+$string['SI'] = 'Slovenia';
+$string['SB'] = 'Solomon Islands';
 $string['SO'] = 'Somalia';
+$string['ZA'] = 'South Africa';
+$string['GS'] = 'South Georgia And The South Sandwich Islands';
+$string['ES'] = 'Spain';
+$string['LK'] = 'Sri Lanka';
+$string['SD'] = 'Sudan';
 $string['SR'] = 'Suriname';
-$string['ST'] = 'Sao Tome and Principe';
-$string['SV'] = 'El Salvador';
-$string['SY'] = 'Syrian Arab Republic';
+$string['SJ'] = 'Svalbard And Jan Mayen';
 $string['SZ'] = 'Swaziland';
-$string['TC'] = 'Turks and Caicos Islands';
-$string['TD'] = 'Chad';
-$string['TF'] = 'French Southern Territories';
-$string['TG'] = 'Togo';
-$string['TH'] = 'Thailand';
+$string['SE'] = 'Sweden';
+$string['CH'] = 'Switzerland';
+$string['SY'] = 'Syrian Arab Republic';
+$string['TW'] = 'Taiwan, Province Of China';
 $string['TJ'] = 'Tajikistan';
+$string['TZ'] = 'Tanzania, United Republic Of';
+$string['TH'] = 'Thailand';
+$string['TL'] = 'Timor-Leste';
+$string['TG'] = 'Togo';
 $string['TK'] = 'Tokelau';
-$string['TM'] = 'Turkmenistan';
-$string['TN'] = 'Tunisia';
 $string['TO'] = 'Tonga';
-$string['TP'] = 'East Timor';
+$string['TT'] = 'Trinidad And Tobago';
+$string['TN'] = 'Tunisia';
 $string['TR'] = 'Turkey';
-$string['TT'] = 'Trinidad and Tobago';
+$string['TM'] = 'Turkmenistan';
+$string['TC'] = 'Turks And Caicos Islands';
 $string['TV'] = 'Tuvalu';
-$string['TW'] = 'Taiwan';
-$string['TZ'] = 'Tanzania; United Republic of';
-$string['UA'] = 'Ukraine';
 $string['UG'] = 'Uganda';
-$string['US'] = 'United States of America';
+$string['UA'] = 'Ukraine';
+$string['AE'] = 'United Arab Emirates';
+$string['GB'] = 'United Kingdom';
+$string['US'] = 'United States';
+$string['UM'] = 'United States Minor Outlying Islands';
 $string['UY'] = 'Uruguay';
 $string['UZ'] = 'Uzbekistan';
-$string['VA'] = 'Vatican City State (Holy See)';
-$string['VC'] = 'Saint Vincent and the Grenadines';
-$string['VE'] = 'Venezuela';
-$string['VG'] = 'Virgin Islands (British)';
-$string['VI'] = 'Virgin Islands (U.S.)';
-$string['VN'] = 'Vietnam';
 $string['VU'] = 'Vanuatu';
-$string['WA'] = 'Wales';
-$string['WF'] = 'Wallis And Futuna Islands';
-$string['WS'] = 'Samoa';
+$string['VE'] = 'Venezuela';
+$string['VN'] = 'Viet Nam';
+$string['VG'] = 'Virgin Islands, British';
+$string['VI'] = 'Virgin Islands, U.S.';
+$string['WF'] = 'Wallis And Futuna';
+$string['EH'] = 'Western Sahara';
 $string['YE'] = 'Yemen';
-$string['YT'] = 'Mayotte';
-$string['ZA'] = 'South Africa';
 $string['ZM'] = 'Zambia';
-$string['ZR'] = 'Zaire';
 $string['ZW'] = 'Zimbabwe';
 
 ?>

lang/en_utf8/data.php

@@ -71,6 +71,7 @@ $string['editordisable'] = 'Disable editor';
 $string['emptyadd'] = 'The Add template is empty, generating a default form...';
 $string['emptyaddform'] = 'You did not fill out any fields!';
 $string['entries'] = 'Entries';
+$string['entrieslefttoadd'] = 'You must add $a->entriesleft more entry/entries before you can view other participants\' entries.';
 $string['entry'] = 'Entry';
 $string['entrysaved'] = 'Your entry has been saved';
 $string['errormustbeteacher'] = 'You need to be a teacher to use this page!';

lang/en_utf8/forum.php

@@ -144,6 +144,7 @@ $string['noguestsubscribe'] = 'Sorry, guests are not allowed to subscribe to rec
 $string['noguesttracking'] = 'Sorry, guests are not allowed to set tracking options.';
 $string['nomorepostscontaining'] = 'No more posts containing \'$a\' were found';
 $string['nonews'] = 'No news has been posted yet';
+$string['nopostforum'] = 'Sorry, you are not allowed to post to this forum';
 $string['noposts'] = 'No posts';
 $string['nopostscontaining'] = 'No posts containing \'$a\' were found';
 $string['noquestions'] = 'There are no questions yet in this forum';

lang/en_utf8/help/contexts.html

@@ -14,7 +14,6 @@
 <li>Courses</li>
 <li>Blocks and Activities</li>
 </ol>
-</p>
 
 <p>
 See also 

lang/en_utf8/help/dialogue/info.html

@@ -1,4 +1,4 @@
-<img alt="" src="<?php echo $CFG->wwwroot?>/mod/dialogue/icon.gif" />&nbsp;<b>Dialogues</b></p>
+<img alt="" src="<?php echo $CFG->wwwroot?>/mod/dialogue/icon.gif" />&nbsp;<b>Dialogues</b>
 
 <p>This module provides a simple communication method between pairs of users.
     A teacher can open an dialogue with a student, a student can open
@@ -18,7 +18,7 @@
 <p>...The module deletes closed dialogues and all their entries after a 
     certain time. That time is set here when the Dialogue is created.</p>
 
-<p>If the course has groups the following points apply.
+<p>If the course has groups the following points apply.</p>
 <ul><li>When opening a new dialogue the teacher is shown the group mode of the 
     dialogue and their current group. This information is displayed immediately
     below the Tab Bar.</li>
@@ -31,5 +31,3 @@
     dialogues). In this mode students who are not in any group do not see any 
     other students.</li>
 </ul>
-</p>
-

lang/en_utf8/help/hotpot/outputformat.html

@@ -16,7 +16,7 @@
         The quiz will be displayed in format for v6 browsers
     </p>
     <p>
-        <b>v5</b></b><br />
+        <b>v5</b><br />
         The quiz will be displayed in a format for v5 browsers
     </p>
     <p>

lang/en_utf8/help/markdown.html

@@ -91,8 +91,7 @@ etc.</p>
 
 <h3>Indented Lists</h3>
 
-<p>You can nest or indent bullet and numbered lists, even mixing bullet point and numbered lists in one structure:
-<b></p>
+<p>You can nest or indent bullet and numbered lists, even mixing bullet point and numbered lists in one structure:</p>
 
 <pre>
     * top level bullet one
@@ -104,8 +103,7 @@ etc.</p>
     2. numbered point two
 </pre>
 
-<p></b>
-becomes</p>
+<p>becomes</p>
 
 <ul>
 <li>top level bullet one

lang/en_utf8/help/permissions.html

@@ -10,7 +10,7 @@ For example, one capability is "Start new discussions" (in forums).
 
 <p>
 In each role, you can choose to set the permission for such a capability 
-to one of four values:
+to one of four values:</p>
 <dl>
 <dt>INHERIT</dt>
 <dd>This is the default setting, generally.  It's a neutral setting that
@@ -48,7 +48,6 @@ to one of four values:
   </dd>
 
 </dl>
-</p>
 
 <h1>Conflict resolution of permissions</h1>
 

lang/en_utf8/help/roles.html

@@ -18,8 +18,8 @@ that user those capabilities just in that forum.
 <p>
 A role must have a <strong>name</strong>.  If you need to name the role for multiple 
 languages you can use multilang syntax if you wish, such as <pre>
-  &lt;span lang="en">Teacher&lt;/span> 
-  &lt;span lang="es_es">Profesor&lt;/span> 
+  &lt;span lang="en"&gt;Teacher&lt;/span&gt; 
+  &lt;span lang="es_es"&gt;Profesor&lt;/span&gt; 
   </pre>If you do this make sure the setting to "filter strings" is on for your installation.
 </p>
 

lang/en_utf8/moodle.php

@@ -1205,6 +1205,8 @@ $string['rsserror'] = 'Error reading RSS data';
 $string['rsstype'] = 'RSS feed for this activity';
 $string['saveandnext'] = 'Save and show next';
 $string['savechanges'] = 'Save changes';
+$string['savechangesanddisplay'] = 'Save and display';
+$string['savechangesandreturntocourse'] = 'Save and return to course';
 $string['savedat'] = 'Saved at:';
 $string['savepreferences'] = 'Save preferences';
 $string['saveto'] = 'Save to';

lib/accesslib.php

@@ -3774,10 +3774,13 @@ function count_role_users($roleid, $context, $parent=false) {
         $parentcontexts = '';
     }
 
-    $SQL = "SELECT count(*)
-            FROM {$CFG->prefix}role_assignments r
-            WHERE (r.contextid = $context->id $parentcontexts)
-            AND r.roleid = $roleid";
+    $SQL = "SELECT count(u.id)
+        FROM {$CFG->prefix}role_assignments r
+        JOIN {$CFG->prefix}user u 
+          ON u.id = r.userid
+        WHERE (r.contextid = $context->id $parentcontexts)
+        AND r.roleid = $roleid
+        AND u.deleted = 0";
 
     return count_records_sql($SQL);
 }

lib/adodb/adodb-active-record.inc.php

@@ -1,7 +1,7 @@
 <?php
 /*
 
-@version V4.93 10 Oct 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+@version V4.98 13 Feb 2008  (c) 2000-2008 John Lim (jlim#natsoft.com.my). All rights reserved.
   Latest version is available at http://adodb.sourceforge.net
  
   Released under both BSD license and Lesser GPL library license. 
@@ -10,7 +10,7 @@
   
   Active Record implementation. Superset of Zend Framework's.
   
-  Version 0.04
+  Version 0.09
   
   See http://www-128.ibm.com/developerworks/java/library/j-cb03076/?ca=dgr-lnxw01ActiveRecord 
   	for info on Ruby on Rails Active Record implementation
@@ -18,10 +18,13 @@
 
 global $_ADODB_ACTIVE_DBS;
 global $ADODB_ACTIVE_CACHESECS; // set to true to enable caching of metadata such as field info
+global $ACTIVE_RECORD_SAFETY; // set to false to disable safety checks
+global $ADODB_ACTIVE_DEFVALS; // use default values of table definition when creating new active record.
 
 // array of ADODB_Active_DB's, indexed by ADODB_Active_Record->_dbat
 $_ADODB_ACTIVE_DBS = array();
-
+$ACTIVE_RECORD_SAFETY = true;
+$ADODB_ACTIVE_DEFVALS = false;
 
 class ADODB_Active_DB {
 	var $db; // ADOConnection
@@ -42,9 +45,9 @@ function ADODB_SetDatabaseAdapter(&$db)
 	
 		foreach($_ADODB_ACTIVE_DBS as $k => $d) {
 			if (PHP_VERSION >= 5) {
-				if ($d->db == $db) return $k;
+				if ($d->db === $db) return $k;
 			} else {
-				if ($d->db->_connectionID == $db->_connectionID && $db->database == $d->db->database) 
+				if ($d->db->_connectionID === $db->_connectionID && $db->database == $d->db->database) 
 					return $k;
 			}
 		}
@@ -68,6 +71,14 @@ class ADODB_Active_Record {
 	var $_lasterr = false; // last error message
 	var $_original = false; // the original values loaded or inserted, refreshed on update
 	
+	// should be static
+	function UseDefaultValues($bool=null)
+	{
+	global $ADODB_ACTIVE_DEFVALS;
+		if (isset($bool)) $ADODB_ACTIVE_DEFVALS = $bool;
+		return $ADODB_ACTIVE_DEFVALS;
+	}
+
 	// should be static
 	function SetDatabaseAdapter(&$db) 
 	{
@@ -140,7 +151,8 @@ class ADODB_Active_Record {
 	function UpdateActiveTable($pkeys=false,$forceUpdate=false)
 	{
 	global $ADODB_ASSOC_CASE,$_ADODB_ACTIVE_DBS , $ADODB_CACHE_DIR, $ADODB_ACTIVE_CACHESECS;
-	
+	global $ADODB_ACTIVE_DEFVALS;
+
 		$activedb =& $_ADODB_ACTIVE_DBS[$this->_dbat];
 
 		$table = $this->_table;
@@ -148,8 +160,12 @@ class ADODB_Active_Record {
 		$tableat = $this->_tableat;
 		if (!$forceUpdate && !empty($tables[$tableat])) {
 			$tobj =& $tables[$tableat];
-			foreach($tobj->flds as $name => $fld) 
-				$this->$name = null;
+			foreach($tobj->flds as $name => $fld) {
+				if ($ADODB_ACTIVE_DEFVALS && isset($fld->default_value)) 
+					$this->$name = $fld->default_value;
+				else
+					$this->$name = null;
+			}
 			return;
 		}
 		
@@ -202,7 +218,10 @@ class ADODB_Active_Record {
 		case 0:
 			foreach($cols as $name => $fldobj) {
 				$name = strtolower($name);
-				$this->$name = null;
+                if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value))
+                    $this->$name = $fldobj->default_value;
+                else
+					$this->$name = null;
 				$attr[$name] = $fldobj;
 			}
 			foreach($pkeys as $k => $name) {
@@ -213,7 +232,11 @@ class ADODB_Active_Record {
 		case 1: 
 			foreach($cols as $name => $fldobj) {
 				$name = strtoupper($name);
-				$this->$name = null;
+               
+                if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value))
+                    $this->$name = $fldobj->default_value;
+                else
+					$this->$name = null;
 				$attr[$name] = $fldobj;
 			}
 			
@@ -223,8 +246,12 @@ class ADODB_Active_Record {
 			break;
 		default:
 			foreach($cols as $name => $fldobj) {
-				$name = ($fldobj->$name);
-				$this->$name = null;
+				$name = ($fldobj->name);
+                
+                if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value))
+                    $this->$name = $fldobj->default_value;
+                else
+					$this->$name = null;
 				$attr[$name] = $fldobj;
 			}
 			foreach($pkeys as $k => $name) {
@@ -285,6 +312,15 @@ class ADODB_Active_Record {
 		return $this->_lasterr;
 	}
 	
+	function ErrorNo() 
+	{
+		if ($this->_dbat < 0) return -9999; // no database connection...
+		$db = $this->DB();
+		
+		return (int) $db->ErrorNo();
+	}
+
+
 	// retrieve ADOConnection from _ADODB_Active_DBs
 	function &DB()
 	{
@@ -313,6 +349,8 @@ class ADODB_Active_Record {
 	// set a numeric array (using natural table field ordering) as object properties
 	function Set(&$row)
 	{
+	global $ACTIVE_RECORD_SAFETY;
+	
 		$db =& $this->DB();
 		
 		if (!$row) {
@@ -323,17 +361,31 @@ class ADODB_Active_Record {
 		$this->_saved = true;
 		
 		$table =& $this->TableInfo();
-		if (sizeof($table->flds) != sizeof($row)) {
-			$this->Error("Table structure of $this->_table has changed","Load");
-			return false;
+		if ($ACTIVE_RECORD_SAFETY && sizeof($table->flds) != sizeof($row)) {
+            $bad_size = TRUE;
+            if (sizeof($row) == 2 * sizeof($table->flds)) {
+                // Only keep string keys
+                $keys = array_filter(array_keys($row), 'is_string');
+                if (sizeof($keys) == sizeof($table->flds))
+                    $bad_size = FALSE;
+            }
+            if ($bad_size) {
+				$this->Error("Table structure of $this->_table has changed","Load");
+				return false;
+			}
 		}
-		
-		$cnt = 0;
+        else
+			$keys = array_keys($row);
+      
+        reset($keys);
+        $this->_original = array();
 		foreach($table->flds as $name=>$fld) {
-			$this->$name = $row[$cnt];
-			$cnt += 1;
+            $value = $row[current($keys)];
+			$this->$name = $value;
+            $this->_original[] = $value;
+            next($keys);
 		}
-		$this->_original = $row;
+        # </AP>
 		return true;
 	}
 	
@@ -520,7 +572,7 @@ class ADODB_Active_Record {
 		if ($ADODB_ASSOC_CASE == 0) 
 			foreach($pkey as $k => $v)
 				$pkey[$k] = strtolower($v);
-		elseif ($ADODB_ASSOC_CASE == 0) 
+		elseif ($ADODB_ASSOC_CASE == 1) 
 			foreach($pkey as $k => $v)
 				$pkey[$k] = strtoupper($v);
 				

lib/adodb/adodb-csvlib.inc.php

@@ -8,7 +8,7 @@ $ADODB_INCLUDED_CSV = 1;
 
 /* 
 
-  V4.93 10 Oct 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.98 13 Feb 2008  (c) 2000-2008 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. See License.txt. 
@@ -261,6 +261,7 @@ $ADODB_INCLUDED_CSV = 1;
 
 	/**
 	* Save a file $filename and its $contents (normally for caching) with file locking
+	* Returns true if ok, false if fopen/fwrite error, 0 if rename error (eg. file is locked)
 	*/
 	function adodb_write_file($filename, $contents,$debug=false)
 	{ 
@@ -280,25 +281,29 @@ $ADODB_INCLUDED_CSV = 1;
 			$mtime = substr(str_replace(' ','_',microtime()),2); 
 			// getmypid() actually returns 0 on Win98 - never mind!
 			$tmpname = $filename.uniqid($mtime).getmypid();
-			if (!($fd = @fopen($tmpname,'a'))) return false;
-			$ok = ftruncate($fd,0);			
-			if (!fwrite($fd,$contents)) $ok = false;
+			if (!($fd = @fopen($tmpname,'w'))) return false;
+			if (fwrite($fd,$contents)) $ok = true;
+			else $ok = false;
 			fclose($fd);
-			chmod($tmpname,0644);
-			// the tricky moment
-			@unlink($filename);
-			if (!@rename($tmpname,$filename)) {
-				unlink($tmpname);
-				$ok = false;
-			}
-			if (!$ok) {
-				if ($debug) ADOConnection::outp( " Rename $tmpname ".($ok? 'ok' : 'failed'));
+			
+			if ($ok) {
+				chmod($tmpname,0644);
+				// the tricky moment
+				@unlink($filename);
+				if (!@rename($tmpname,$filename)) {
+					unlink($tmpname);
+					$ok = 0;
+				}
+				if (!$ok) {
+					if ($debug) ADOConnection::outp( " Rename $tmpname ".($ok? 'ok' : 'failed'));
+				}
 			}
 			return $ok;
 		}
 		if (!($fd = @fopen($filename, 'a'))) return false;
 		if (flock($fd, LOCK_EX) && ftruncate($fd, 0)) {
-			$ok = fwrite( $fd, $contents );
+			if (fwrite( $fd, $contents )) $ok = true;
+			else $ok = false;
 			fclose($fd);
 			chmod($filename,0644);
 		}else {

lib/adodb/adodb-datadict.inc.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V4.93 10 Oct 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.98 13 Feb 2008  (c) 2000-2008 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.
@@ -215,9 +215,117 @@ class ADODB_DataDict {
 		return $this->connection->MetaIndexes($this->TableName($table), $primary, $owner);
 	}
 	
+
 	function MetaType($t,$len=-1,$fieldobj=false)
-	{
-		return ADORecordSet::MetaType($t,$len,$fieldobj);
+	{		
+		static $typeMap = array(
+		'VARCHAR' => 'C',
+		'VARCHAR2' => 'C',
+		'CHAR' => 'C',
+		'C' => 'C',
+		'STRING' => 'C',
+		'NCHAR' => 'C',
+		'NVARCHAR' => 'C',
+		'VARYING' => 'C',
+		'BPCHAR' => 'C',
+		'CHARACTER' => 'C',
+		'INTERVAL' => 'C',  # Postgres
+		'MACADDR' => 'C', # postgres
+		##
+		'LONGCHAR' => 'X',
+		'TEXT' => 'X',
+		'NTEXT' => 'X',
+		'M' => 'X',
+		'X' => 'X',
+		'CLOB' => 'X',
+		'NCLOB' => 'X',
+		'LVARCHAR' => 'X',
+		##
+		'BLOB' => 'B',
+		'IMAGE' => 'B',
+		'BINARY' => 'B',
+		'VARBINARY' => 'B',
+		'LONGBINARY' => 'B',
+		'B' => 'B',
+		##
+		'YEAR' => 'D', // mysql
+		'DATE' => 'D',
+		'D' => 'D',
+		##
+		'UNIQUEIDENTIFIER' => 'C', # MS SQL Server
+		##
+		'TIME' => 'T',
+		'TIMESTAMP' => 'T',
+		'DATETIME' => 'T',
+		'TIMESTAMPTZ' => 'T',
+		'T' => 'T',
+		'TIMESTAMP WITHOUT TIME ZONE' => 'T', // postgresql
+		##
+		'BOOL' => 'L',
+		'BOOLEAN' => 'L', 
+		'BIT' => 'L',
+		'L' => 'L',
+		##
+		'COUNTER' => 'R',
+		'R' => 'R',
+		'SERIAL' => 'R', // ifx
+		'INT IDENTITY' => 'R',
+		##
+		'INT' => 'I',
+		'INT2' => 'I',
+		'INT4' => 'I',
+		'INT8' => 'I',
+		'INTEGER' => 'I',
+		'INTEGER UNSIGNED' => 'I',
+		'SHORT' => 'I',
+		'TINYINT' => 'I',
+		'SMALLINT' => 'I',
+		'I' => 'I',
+		##
+		'LONG' => 'N', // interbase is numeric, oci8 is blob
+		'BIGINT' => 'N', // this is bigger than PHP 32-bit integers
+		'DECIMAL' => 'N',
+		'DEC' => 'N',
+		'REAL' => 'N',
+		'DOUBLE' => 'N',
+		'DOUBLE PRECISION' => 'N',
+		'SMALLFLOAT' => 'N',
+		'FLOAT' => 'N',
+		'NUMBER' => 'N',
+		'NUM' => 'N',
+		'NUMERIC' => 'N',
+		'MONEY' => 'N',
+		
+		## informix 9.2
+		'SQLINT' => 'I', 
+		'SQLSERIAL' => 'I', 
+		'SQLSMINT' => 'I', 
+		'SQLSMFLOAT' => 'N', 
+		'SQLFLOAT' => 'N', 
+		'SQLMONEY' => 'N', 
+		'SQLDECIMAL' => 'N', 
+		'SQLDATE' => 'D', 
+		'SQLVCHAR' => 'C', 
+		'SQLCHAR' => 'C', 
+		'SQLDTIME' => 'T', 
+		'SQLINTERVAL' => 'N', 
+		'SQLBYTES' => 'B', 
+		'SQLTEXT' => 'X',
+		 ## informix 10
+		"SQLINT8" => 'I8',
+		"SQLSERIAL8" => 'I8',
+		"SQLNCHAR" => 'C',
+		"SQLNVCHAR" => 'C',
+		"SQLLVARCHAR" => 'X',
+		"SQLBOOL" => 'L'
+		);
+		
+		if (!$this->connection->IsConnected()) {
+			$t = strtoupper($t);
+			if (isset($typeMap[$t])) return $typeMap[$t];
+			return 'N';
+		}
+		return $this->connection->MetaType($t,$len,$fieldobj);
 	}
 	
 	function NameQuote($name = NULL,$allowBrackets=false)
@@ -277,7 +385,7 @@ class ADODB_DataDict {
 		return $rez;
 	}
 	
-	/*
+	/**
 	 	Returns the actual type given a character code.
 		
 		C:  varchar
@@ -344,11 +452,19 @@ class ADODB_DataDict {
 	{
 		$tabname = $this->TableName ($tabname);
 		$sql = array();
-		list($lines,$pkey) = $this->_GenFields($flds);
+		list($lines,$pkey,$idxs) = $this->_GenFields($flds);
+		// genfields can return FALSE at times
+		if ($lines  == null) $lines = array();
 		$alter = 'ALTER TABLE ' . $tabname . $this->addCol . ' ';
 		foreach($lines as $v) {
 			$sql[] = $alter . $v;
 		}
+		if (is_array($idxs)) {
+			foreach($idxs as $idx => $idxdef) {
+				$sql_idxs = $this->CreateIndexSql($idx, $tabname, $idxdef['cols'], $idxdef['opts']);
+				$sql = array_merge($sql, $sql_idxs);
+			}
+		}
 		return $sql;
 	}
 	
@@ -367,11 +483,20 @@ class ADODB_DataDict {
 	{
 		$tabname = $this->TableName ($tabname);
 		$sql = array();
-		list($lines,$pkey) = $this->_GenFields($flds);
+		list($lines,$pkey,$idxs) = $this->_GenFields($flds);
+		// genfields can return FALSE at times
+		if ($lines == null) $lines = array();
 		$alter = 'ALTER TABLE ' . $tabname . $this->alterCol . ' ';
 		foreach($lines as $v) {
 			$sql[] = $alter . $v;
 		}
+		if (is_array($idxs)) {
+			foreach($idxs as $idx => $idxdef) {
+				$sql_idxs = $this->CreateIndexSql($idx, $tabname, $idxdef['cols'], $idxdef['opts']);
+				$sql = array_merge($sql, $sql_idxs);
+			}
+
+		}
 		return $sql;
 	}
 	
@@ -389,7 +514,9 @@ class ADODB_DataDict {
 	{
 		$tabname = $this->TableName ($tabname);
 		if ($flds) {
-			list($lines,$pkey) = $this->_GenFields($flds);
+			list($lines,$pkey,$idxs) = $this->_GenFields($flds);
+			// genfields can return FALSE at times
+			if ($lines == null) $lines = array();
 			list(,$first) = each($lines);
 			list(,$column_def) = split("[\t ]+",$first,2);
 		}
@@ -429,22 +556,36 @@ class ADODB_DataDict {
 		return array (sprintf($this->renameTable, $this->TableName($tabname),$this->TableName($newname)));
 	}	
 	
-	/*
+	/**
 	 Generate the SQL to create table. Returns an array of sql strings.
 	*/
-	function CreateTableSQL($tabname, $flds, $tableoptions=false)
+	function CreateTableSQL($tabname, $flds, $tableoptions=array())
 	{
-		if (!$tableoptions) $tableoptions = array();
-		
-		list($lines,$pkey) = $this->_GenFields($flds, true);
+		list($lines,$pkey,$idxs) = $this->_GenFields($flds, true);
+		// genfields can return FALSE at times
+		if ($lines == null) $lines = array();
 		
 		$taboptions = $this->_Options($tableoptions);
 		$tabname = $this->TableName ($tabname);
 		$sql = $this->_TableSQL($tabname,$lines,$pkey,$taboptions);
 		
+		// ggiunta - 2006/10/12 - KLUDGE:
+        // if we are on autoincrement, and table options includes REPLACE, the
+        // autoincrement sequence has already been dropped on table creation sql, so
+        // we avoid passing REPLACE to trigger creation code. This prevents
+        // creating sql that double-drops the sequence
+        if ($this->autoIncrement && isset($taboptions['REPLACE']))
+        	unset($taboptions['REPLACE']);
 		$tsql = $this->_Triggers($tabname,$taboptions);
 		foreach($tsql as $s) $sql[] = $s;
 		
+		if (is_array($idxs)) {
+			foreach($idxs as $idx => $idxdef) {
+				$sql_idxs = $this->CreateIndexSql($idx, $tabname,  $idxdef['cols'], $idxdef['opts']);
+				$sql = array_merge($sql, $sql_idxs);
+			}
+		}
+
 		return $sql;
 	}
 	
@@ -460,6 +601,9 @@ class ADODB_DataDict {
 				$f1 = array();
 				foreach($f0 as $token) {
 					switch (strtoupper($token)) {
+					case 'INDEX':
+						$f1['INDEX'] = '';
+						// fall through intentionally
 					case 'CONSTRAINT':
 					case 'DEFAULT': 
 						$hasparam = $token;
@@ -471,6 +615,20 @@ class ADODB_DataDict {
 						break;
 					}
 				}
+				// 'index' token without a name means single column index: name it after column
+				if (array_key_exists('INDEX', $f1) && $f1['INDEX'] == '') {
+					$f1['INDEX'] = isset($f0['NAME']) ? $f0['NAME'] : $f0[0];
+					// check if column name used to create an index name was quoted
+					if (($f1['INDEX'][0] == '"' || $f1['INDEX'][0] == "'" || $f1['INDEX'][0] == "`") &&
+						($f1['INDEX'][0] == substr($f1['INDEX'], -1))) {
+						$f1['INDEX'] = $f1['INDEX'][0].'idx_'.substr($f1['INDEX'], 1, -1).$f1['INDEX'][0];
+					}
+					else
+						$f1['INDEX'] = 'idx_'.$f1['INDEX'];
+				}
+				// reset it, so we don't get next field 1st token as INDEX...
+				$hasparam = false;
+
 				$flds[] = $f1;
 				
 			}
@@ -478,9 +636,10 @@ class ADODB_DataDict {
 		$this->autoIncrement = false;
 		$lines = array();
 		$pkey = array();
+		$idxs = array();
 		foreach($flds as $fld) {
 			$fld = _array_change_key_case($fld);
-		
+			
 			$fname = false;
 			$fdefault = false;
 			$fautoinc = false;
@@ -494,6 +653,8 @@ class ADODB_DataDict {
 			$fconstraint = false;
 			$fnotnull = false;
 			$funsigned = false;
+			$findex = '';
+			$funiqueindex = false;
 			
 			//-----------------
 			// Parse attributes
@@ -519,7 +680,8 @@ class ADODB_DataDict {
 				case 'AUTOINCREMENT':
 				case 'AUTO':	$fautoinc = true; $fnotnull = true; break;
 				case 'KEY':
-				case 'PRIMARY':	$fprimary = $v; $fnotnull = true; break;
+                // a primary key col can be non unique in itself (if key spans many cols...)
+				case 'PRIMARY':	$fprimary = $v; $fnotnull = true; /*$funiqueindex = true;*/ break;
 				case 'DEF':
 				case 'DEFAULT': $fdefault = $v; break;
 				case 'NOTNULL': $fnotnull = $v; break;
@@ -527,6 +689,9 @@ class ADODB_DataDict {
 				case 'DEFDATE': $fdefdate = $v; break;
 				case 'DEFTIMESTAMP': $fdefts = $v; break;
 				case 'CONSTRAINT': $fconstraint = $v; break;
+				// let INDEX keyword create a 'very standard' index on column
+				case 'INDEX': $findex = $v; break;
+				case 'UNIQUE': $funiqueindex = true; break;
 				} //switch
 			} // foreach $fld
 			
@@ -556,6 +721,27 @@ class ADODB_DataDict {
 			// some databases do not allow blobs to have defaults
 			if ($ty == 'X') $fdefault = false;
 			
+			// build list of indexes
+			if ($findex != '') {
+				if (array_key_exists($findex, $idxs)) {
+					$idxs[$findex]['cols'][] = ($fname);
+					if (in_array('UNIQUE', $idxs[$findex]['opts']) != $funiqueindex) {
+						if ($this->debug) ADOConnection::outp("Index $findex defined once UNIQUE and once not");
+					}
+					if ($funiqueindex && !in_array('UNIQUE', $idxs[$findex]['opts']))
+						$idxs[$findex]['opts'][] = 'UNIQUE';
+				}
+				else
+				{
+					$idxs[$findex] = array();
+					$idxs[$findex]['cols'] = array($fname);
+					if ($funiqueindex)
+						$idxs[$findex]['opts'] = array('UNIQUE');
+					else
+						$idxs[$findex]['opts'] = array();
+				}
+			}
+
 			//--------------------
 			// CONSTRUCT FIELD SQL
 			if ($fdefts) {
@@ -570,24 +756,47 @@ class ADODB_DataDict {
 				} else {
 					$fdefault = $this->connection->sysDate;
 				}
-			} else if ($fdefault !== false && !$fnoquote)
+			} else if ($fdefault !== false && !$fnoquote) {
 				if ($ty == 'C' or $ty == 'X' or 
-					( substr($fdefault,0,1) != "'" && !is_numeric($fdefault)))
+					( substr($fdefault,0,1) != "'" && !is_numeric($fdefault))) {
+
+					if (($ty == 'D' || $ty == 'T') && strtolower($fdefault) != 'null') {
+						// convert default date into database-aware code
+						if ($ty == 'T')
+						{
+							$fdefault = $this->connection->DBTimeStamp($fdefault);
+						}
+						else
+						{
+							$fdefault = $this->connection->DBDate($fdefault);
+						}
+					}
+					else
 					if (strlen($fdefault) != 1 && substr($fdefault,0,1) == ' ' && substr($fdefault,strlen($fdefault)-1) == ' ') 
 						$fdefault = trim($fdefault);
 					else if (strtolower($fdefault) != 'null')
 						$fdefault = $this->connection->qstr($fdefault);
+				}
+			}
 			$suffix = $this->_CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned);
 			
+			// add index creation
 			if ($widespacing) $fname = str_pad($fname,24);
+			
+			 // check for field names appearing twice
+            if (array_key_exists($fid, $lines)) {
+            	 ADOConnection::outp("Field '$fname' defined twice");
+            }
+			
 			$lines[$fid] = $fname.' '.$ftype.$suffix;
 			
 			if ($fautoinc) $this->autoIncrement = true;
 		} // foreach $flds
 		
-		return array($lines,$pkey);
+		return array($lines,$pkey,$idxs);
 	}
-	/*
+
+	/**
 		 GENERATE THE SIZE PART OF THE DATATYPE
 			$ftype is the actual type
 			$ty is the type defined originally in the DDL
@@ -680,7 +889,7 @@ class ADODB_DataDict {
 		return $sql;
 	}
 	
-	/*
+	/**
 		GENERATE TRIGGERS IF NEEDED
 		used when table has auto-incrementing field that is emulated using triggers
 	*/
@@ -689,7 +898,7 @@ class ADODB_DataDict {
 		return array();
 	}
 	
-	/*
+	/**
 		Sanitize options, so that array elements with no keys are promoted to keys
 	*/
 	function _Options($opts)
@@ -703,7 +912,7 @@ class ADODB_DataDict {
 		return $newopts;
 	}
 	
-	/*
+	/**
 	"Florian Buzin [ easywe ]" <florian.buzin#easywe.de>
 	
 	This function changes/adds new fields to your table. You don't
@@ -760,7 +969,9 @@ class ADODB_DataDict {
 	
 
 		// already exists, alter table instead
-		list($lines,$pkey) = $this->_GenFields($flds);
+		list($lines,$pkey,$idxs) = $this->_GenFields($flds);
+		// genfields can return FALSE at times
+		if ($lines == null) $lines = array();
 		$alter = 'ALTER TABLE ' . $this->TableName($tablename);
 		$sql = array();
 
@@ -770,8 +981,13 @@ class ADODB_DataDict {
 				$flds = Lens_ParseArgs($v,',');
 				
 				//  We are trying to change the size of the field, if not allowed, simply ignore the request.
-				if ($flds && in_array(strtoupper(substr($flds[0][1],0,4)),$this->invalidResizeTypes4)) continue;	 
-	 		
+				// $flds[1] holds the type, $flds[2] holds the size -postnuke addition
+				if ($flds && in_array(strtoupper(substr($flds[0][1],0,4)),$this->invalidResizeTypes4)
+				 && (isset($flds[0][2]) && is_numeric($flds[0][2]))) {
+					if ($this->debug) ADOConnection::outp(sprintf("<h3>%s cannot be changed to %s currently</h3>", $flds[0][0], $flds[0][1]));
+					#echo "<h3>$this->alterCol cannot be changed to $flds currently</h3>";
+					continue;	 
+	 			}
 				$sql[] = $alter . $this->alterCol . ' ' . $v;
 			} else {
 				$sql[] = $alter . $this->addCol . ' ' . $v;

lib/adodb/adodb-error.inc.php

@@ -1,6 +1,6 @@
 <?php
 /** 
- * @version V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ * @version V4.98 13 Feb 2008 (c) 2000-2008 John Lim (jlim#natsoft.com.my). All rights reserved.
  * Released under both BSD license and Lesser GPL library license. 
  * Whenever there is any discrepancy between the two licenses, 
  * the BSD license will take precedence. 
@@ -92,14 +92,14 @@ function adodb_error_pg($errormsg)
 {
 	if (is_numeric($errormsg)) return (integer) $errormsg;
     static $error_regexps = array(
-            '/(Table does not exist\.|Relation [\"\'].*[\"\'] does not exist|sequence does not exist|class ".+" not found)$/' => DB_ERROR_NOSUCHTABLE,
-            '/Relation [\"\'].*[\"\'] already exists|Cannot insert a duplicate key into (a )?unique index.*/'      => DB_ERROR_ALREADY_EXISTS,
-            '/divide by zero$/'                     => DB_ERROR_DIVZERO,
-            '/pg_atoi: error in .*: can\'t parse /' => DB_ERROR_INVALID_NUMBER,
-            '/ttribute [\"\'].*[\"\'] not found|Relation [\"\'].*[\"\'] does not have attribute [\"\'].*[\"\']/' => DB_ERROR_NOSUCHFIELD,
-            '/parser: parse error at or near \"/'   => DB_ERROR_SYNTAX,
-            '/referential integrity violation/'     => DB_ERROR_CONSTRAINT,
-			'/Relation [\"\'].*[\"\'] already exists|Cannot insert a duplicate key into (a )?unique index.*|duplicate key violates unique constraint/'     
+            '/(Table does not exist\.|Relation [\"\'].*[\"\'] does not exist|sequence does not exist|class ".+" not found)$/i' => DB_ERROR_NOSUCHTABLE,
+            '/Relation [\"\'].*[\"\'] already exists|Cannot insert a duplicate key into (a )?unique index.*/i'      => DB_ERROR_ALREADY_EXISTS,
+            '/divide by zero$/i'                     => DB_ERROR_DIVZERO,
+            '/pg_atoi: error in .*: can\'t parse /i' => DB_ERROR_INVALID_NUMBER,
+            '/ttribute [\"\'].*[\"\'] not found|Relation [\"\'].*[\"\'] does not have attribute [\"\'].*[\"\']/i' => DB_ERROR_NOSUCHFIELD,
+            '/parser: parse error at or near \"/i'   => DB_ERROR_SYNTAX,
+            '/referential integrity violation/i'     => DB_ERROR_CONSTRAINT,
+			'/Relation [\"\'].*[\"\'] already exists|Cannot insert a duplicate key into (a )?unique index.*|duplicate key violates unique constraint/i'     
 			 	 => DB_ERROR_ALREADY_EXISTS
         );
 	reset($error_regexps);

lib/adodb/adodb-errorhandler.inc.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @version V4.93 10 Oct 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ * @version V4.98 13 Feb 2008  (c) 2000-2008 John Lim (jlim#natsoft.com.my). All rights reserved.
  * Released under both BSD license and Lesser GPL library license.
  * Whenever there is any discrepancy between the two licenses,
  * the BSD license will take precedence.

lib/adodb/adodb-errorpear.inc.php

@@ -1,6 +1,6 @@
 <?php
 /** 
- * @version V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ * @version V4.98 13 Feb 2008 (c) 2000-2008 John Lim (jlim#natsoft.com.my). All rights reserved.
  * Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 

lib/adodb/adodb-exceptions.inc.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @version V4.93 10 Oct 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ * @version V4.98 13 Feb 2008  (c) 2000-2008 John Lim (jlim#natsoft.com.my). All rights reserved.
  * Released under both BSD license and Lesser GPL library license.
  * Whenever there is any discrepancy between the two licenses,
  * the BSD license will take precedence.

lib/adodb/adodb-iterator.inc.php

@@ -1,7 +1,7 @@
 <?php
 
 /*
-  V4.93 10 Oct 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.98 13 Feb 2008  (c) 2000-2008 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

lib/adodb/adodb-lib.inc.php

@@ -1,5 +1,5 @@
 <?php
-
+	
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
 
@@ -7,7 +7,7 @@ global $ADODB_INCLUDED_LIB;
 $ADODB_INCLUDED_LIB = 1;
 
 /* 
- @version V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim\@natsoft.com.my). All rights reserved.
+ @version V4.98 13 Feb 2008 (c) 2000-2008 John Lim (jlim\@natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. See License.txt. 
@@ -16,6 +16,36 @@ $ADODB_INCLUDED_LIB = 1;
   Less commonly used functions are placed here to reduce size of adodb.inc.php. 
 */ 
 
+function adodb_strip_order_by($sql)
+{
+	$rez = preg_match('/(\sORDER\s+BY\s[^)]*)/is',$sql,$arr);
+	if ($arr)
+		if (strpos($arr[0],'(') !== false) {
+			$at = strpos($sql,$arr[0]);
+			$cntin = 0;
+			for ($i=$at, $max=strlen($sql); $i < $max; $i++) {
+				$ch = $sql[$i];
+				if ($ch == '(') {
+					$cntin += 1;
+				} elseif($ch == ')') {
+					$cntin -= 1;
+					if ($cntin < 0) {
+						break;
+					}
+				}
+			}
+			$sql = substr($sql,0,$at).substr($sql,$i);
+		} else
+			$sql = str_replace($arr[0], '', $sql); 
+	return $sql;
+ }
+
+if (false) {
+	$sql = 'select * from (select a from b order by a(b),b(c) desc)';
+	$sql = '(select * from abc order by 1)';
+	die(adodb_strip_order_by($sql));
+}
+
 function adodb_probetypes(&$array,&$types,$probe=8)
 {
 // probe and guess the type
@@ -56,16 +86,17 @@ function adodb_probetypes(&$array,&$types,$probe=8)
 			
 		}
 	}
+	
 }
 
-function  &adodb_transpose(&$arr, &$newarr, &$hdr)
+function  adodb_transpose(&$arr, &$newarr, &$hdr, &$fobjs)
 {
 	$oldX = sizeof(reset($arr));
 	$oldY = sizeof($arr);	
 	
 	if ($hdr) {
 		$startx = 1;
-		$hdr = array();
+		$hdr = array('Fields');
 		for ($y = 0; $y < $oldY; $y++) {
 			$hdr[] = $arr[$y][0];
 		}
@@ -73,7 +104,12 @@ function  &adodb_transpose(&$arr, &$newarr, &$hdr)
 		$startx = 0;
 
 	for ($x = $startx; $x < $oldX; $x++) {
-		$newarr[] = array();
+		if ($fobjs) {
+			$o = $fobjs[$x];
+			$newarr[] = array($o->name);
+		} else
+			$newarr[] = array();
+			
 		for ($y = 0; $y < $oldY; $y++) {
 			$newarr[$x-$startx][] = $arr[$y][$x];
 		}
@@ -105,7 +141,10 @@ function _adodb_replace(&$zthis, $table, $fieldArray, $keyCol, $autoQuote, $has_
 			$keyCol = array($keyCol);
 		}
 		foreach($fieldArray as $k => $v) {
-			if ($autoQuote && !is_numeric($v) and strncmp($v,"'",1) !== 0 and strcasecmp($v,$zthis->null2null)!=0) {
+			if ($v === null) {
+				$v = 'NULL';
+				$fieldArray[$k] = $v;
+			} else if ($autoQuote && !is_numeric($v) /*and strncmp($v,"'",1) !== 0 -- sql injection risk*/ and strcasecmp($v,$zthis->null2null)!=0) {
 				$v = $zthis->qstr($v);
 				$fieldArray[$k] = $v;
 			}
@@ -363,43 +402,36 @@ function _adodb_getcount(&$zthis, $sql,$inputarr=false,$secs2cache=0)
 	 if (!empty($zthis->_nestedSQL) || preg_match("/^\s*SELECT\s+DISTINCT/is", $sql) || 
 	 	preg_match('/\s+GROUP\s+BY\s+/is',$sql) || 
 		preg_match('/\s+UNION\s+/is',$sql)) {
+		
+		$rewritesql = adodb_strip_order_by($sql);
+		
 		// ok, has SELECT DISTINCT or GROUP BY so see if we can use a table alias
 		// but this is only supported by oracle and postgresql...
 		if ($zthis->dataProvider == 'oci8') {
-			
-			$rewritesql = preg_replace('/(\sORDER\s+BY\s[^)]*)/is','',$sql);
-			
 			// Allow Oracle hints to be used for query optimization, Chris Wrye
 			if (preg_match('#/\\*+.*?\\*\\/#', $sql, $hint)) {
 				$rewritesql = "SELECT ".$hint[0]." COUNT(*) FROM (".$rewritesql.")"; 
 			} else
 				$rewritesql = "SELECT COUNT(*) FROM (".$rewritesql.")"; 
 			
-		} else if (strncmp($zthis->databaseType,'postgres',8) == 0)  {
-			$rewritesql = preg_replace('/(\sORDER\s+BY\s[^)]*)/is','',$sql);
+		} else if (strncmp($zthis->databaseType,'postgres',8) == 0 || strncmp($zthis->databaseType,'mysql',5) == 0)  {
 			$rewritesql = "SELECT COUNT(*) FROM ($rewritesql) _ADODB_ALIAS_";
+		} else {
+			$rewritesql = "SELECT COUNT(*) FROM ($rewritesql) ";
 		}
-	} else {
+	} else {		
 		// now replace SELECT ... FROM with SELECT COUNT(*) FROM
 		$rewritesql = preg_replace(
 					'/^\s*SELECT\s.*\s+FROM\s/Uis','SELECT COUNT(*) FROM ',$sql);
-
-		
-		
 		// fix by alexander zhukov, alex#unipack.ru, because count(*) and 'order by' fails 
 		// with mssql, access and postgresql. Also a good speedup optimization - skips sorting!
 		// also see http://phplens.com/lens/lensforum/msgs.php?id=12752
-		if (preg_match('/\sORDER\s+BY\s*\(/i',$rewritesql))
-			$rewritesql = preg_replace('/(\sORDER\s+BY\s.*)/is','',$rewritesql);
-		else
-			$rewritesql = preg_replace('/(\sORDER\s+BY\s[^)]*)/is','',$rewritesql);
+		$rewritesql = adodb_strip_order_by($rewritesql);
 	}
 	
-	
-	
 	if (isset($rewritesql) && $rewritesql != $sql) {
-		if (preg_match('/\sLIMIT\s+[0-9]+/i',$sql,$limitarr)) $rewritesql .= $limitarr[1];
-		 
+		if (preg_match('/\sLIMIT\s+[0-9]+/i',$sql,$limitarr)) $rewritesql .= $limitarr[0];
+
 		if ($secs2cache) {
 			// we only use half the time of secs2cache because the count can quickly
 			// become inaccurate if new records are added
@@ -416,7 +448,7 @@ function _adodb_getcount(&$zthis, $sql,$inputarr=false,$secs2cache=0)
 	
 	// strip off unneeded ORDER BY if no UNION
 	if (preg_match('/\s*UNION\s*/is', $sql)) $rewritesql = $sql;
-	else $rewritesql = preg_replace('/(\sORDER\s+BY\s.*)/is','',$sql); 
+	else $rewritesql = $rewritesql = adodb_strip_order_by($sql); 
 	
 	if (preg_match('/\sLIMIT\s+[0-9]+/i',$sql,$limitarr)) $rewritesql .= $limitarr[0];
 		
@@ -507,7 +539,7 @@ function &_adodb_pageexecute_all_rows(&$zthis, $sql, $nrows, $page,
 	return $rsreturn;
 }
 
-// Iv�n Oliva version
+// Iván Oliva version
 function &_adodb_pageexecute_no_last_page(&$zthis, $sql, $nrows, $page, $inputarr=false, $secs2cache=0) 
 {
 
@@ -560,6 +592,8 @@ function &_adodb_pageexecute_no_last_page(&$zthis, $sql, $nrows, $page, $inputar
 
 function _adodb_getupdatesql(&$zthis,&$rs, $arrFields,$forceUpdate=false,$magicq=false,$force=2)
 {
+	global $ADODB_QUOTE_FIELDNAMES;
+
 		if (!$rs) {
 			printf(ADODB_BAD_RS,'GetUpdateSQL');
 			return false;
@@ -606,7 +640,7 @@ function _adodb_getupdatesql(&$zthis,&$rs, $arrFields,$forceUpdate=false,$magicq
 						$type = 'C';
 					}
 					
-					if (strpos($upperfname,' ') !== false)
+					if ((strpos($upperfname,' ') !== false) || ($ADODB_QUOTE_FIELDNAMES))
 						$fnameq = $zthis->nameQuote.$upperfname.$zthis->nameQuote;
 					else
 						$fnameq = $upperfname;
@@ -720,6 +754,7 @@ function _adodb_getinsertsql(&$zthis,&$rs,$arrFields,$magicq=false,$force=2)
 static $cacheRS = false;
 static $cacheSig = 0;
 static $cacheCols;
+	global $ADODB_QUOTE_FIELDNAMES;
 
 	$tableName = '';
 	$values = '';
@@ -769,7 +804,7 @@ static $cacheCols;
 		$upperfname = strtoupper($field->name);
 		if (adodb_key_exists($upperfname,$arrFields,$force)) {
 			$bad = false;
-			if (strpos($upperfname,' ') !== false)
+			if ((strpos($upperfname,' ') !== false) || ($ADODB_QUOTE_FIELDNAMES))
 				$fnameq = $zthis->nameQuote.$upperfname.$zthis->nameQuote;
 			else
 				$fnameq = $upperfname;
@@ -958,25 +993,26 @@ function _adodb_column_sql(&$zthis, $action, $type, $fname, $fnameq, $arrFields,
 		case "D":
 			$val = $zthis->DBDate($arrFields[$fname]);
 			break;
-
+		
 		case "T":
 			$val = $zthis->DBTimeStamp($arrFields[$fname]);
+            break;
+
+        case "F": //Floating point number       // Moodle added
+		case "N":
+		    $val = $arrFields[$fname];
+			if (!is_numeric($val)) $val = str_replace(',', '.', (float)$val);
 			break;
 
-// moodle change start - see readme_moodle.txt
-        case "L": //Integer field suitable for storing booleans (0 or 1)
-        case "I": //Integer
-            $val = (int)$arrFields[$fname];
-            break;
+        case "L": //Integer field suitable for storing booleans (0 or 1)     // Moodle added
+		case "I":
+		case "R":
+		    $val = $arrFields[$fname];
+			if (!is_numeric($val)) $val = (integer) $val;
+		    break;
 
-        case "F": //Floating point number
-        case "N": //Numeric or decimal number
-            $val = (float)$arrFields[$fname];
-            break;
-// moodle change end
-
-        default:
-			$val = $arrFields[$fname];
+		default:
+			$val = str_replace(array("'"," ","("),"",$arrFields[$fname]); // basic sql injection defence
 			if (empty($val)) $val = '0';
 			break;
 	}
@@ -996,7 +1032,8 @@ function _adodb_debug_execute(&$zthis, $sql, $inputarr)
 	if ($inputarr) {
 		foreach($inputarr as $kk=>$vv) {
 			if (is_string($vv) && strlen($vv)>64) $vv = substr($vv,0,64).'...';
-			$ss .= "($kk=>'$vv') ";
+			if (is_null($vv)) $ss .= "($kk=>null) ";
+			else $ss .= "($kk=>'$vv') ";
 		}
 		$ss = "[ $ss ]";
 	}
@@ -1047,11 +1084,15 @@ function _adodb_backtrace($printOrArr=true,$levels=9999,$skippy=0)
 	if (!function_exists('debug_backtrace')) return '';
 	 
 	$html =  (isset($_SERVER['HTTP_USER_AGENT']));
-	$fmt =  ($html) ? "</font><font color=#808080 size=-1> %% line %4d, file: <a href=\"file:/%s\">%s</a></font>" : "%% line %4d, file: %s";
+// moodle change start - see readme_moodle.txt
+	$fmt =  ($html) ? "</font><font color=\"#808080\" size=\"-1\"> %% line %4d, file: <a href=\"file:/%s\">%s</a></font>" : "%% line %4d, file: %s";
+// moodle change end
 
 	$MAXSTRLEN = 128;
 
-	$s = ($html) ? '<pre align=left>' : '';
+// moodle change start - see readme_moodle.txt
+	$s = ($html) ? '<pre align="left">' : '';
+// moodle change end
 	
 	if (is_array($printOrArr)) $traceArr = $printOrArr;
 	else $traceArr = debug_backtrace();
@@ -1137,4 +1178,4 @@ function _adodb_find_from($sql)
 }
 */
 
-?>
+?>

lib/adodb/adodb-memcache.lib.inc.php

@@ -8,7 +8,7 @@ $ADODB_INCLUDED_MEMCACHE = 1;
 
 /* 
 
-  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2008 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. See License.txt. 

lib/adodb/adodb-pager.inc.php

@@ -1,7 +1,7 @@
 <?php
 
 /*
-	V4.93 10 Oct 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+	V4.98 13 Feb 2008  (c) 2000-2008 John Lim (jlim#natsoft.com.my). All rights reserved.
 	  Released under both BSD license and Lesser GPL library license. 
 	  Whenever there is any discrepancy between the two licenses, 
 	  the BSD license will take precedence. 

lib/adodb/adodb-pear.inc.php

@@ -1,6 +1,6 @@
 <?php
 /** 
- * @version V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ * @version V4.98 13 Feb 2008 (c) 2000-2008 John Lim (jlim#natsoft.com.my). All rights reserved.
  * Released under both BSD license and Lesser GPL library license. 
  * Whenever there is any discrepancy between the two licenses, 
  * the BSD license will take precedence. 

lib/adodb/adodb-perf.inc.php

@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.93 10 Oct 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.98 13 Feb 2008  (c) 2000-2008 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. See License.txt. 
@@ -19,6 +19,9 @@ V4.93 10 Oct 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights rese
 if (!defined('ADODB_DIR')) include_once(dirname(__FILE__).'/adodb.inc.php');
 include_once(ADODB_DIR.'/tohtml.inc.php');
 
+global $ADODB_PERF_MIN;
+$ADODB_PERF_MIN = 0.05; // log only if >= minimum number of secs to run
+
 define( 'ADODB_OPT_HIGH', 2);
 define( 'ADODB_OPT_LOW', 1);
 
@@ -165,7 +168,12 @@ function& adodb_log_sql(&$connx,$sql,$inputarr)
 			if ($dbT == 'db2') $arr['f'] = (float) $arr['f'];
 			$isql = "insert into $perf_table (created,sql0,sql1,params,tracer,timer) values( $d,?,?,?,?,?)";
 		}
-		$ok = $conn->Execute($isql,$arr);
+		global $ADODB_PERF_MIN;
+		if ($errN != 0 || $time >= $ADODB_PERF_MIN) {
+			$ok = $conn->Execute($isql,$arr);
+		} else {
+			$ok = true;
+		}
 		$conn->debug = $saved;
 		
 		if ($ok) {
@@ -640,13 +648,20 @@ Committed_AS:   348732 kB
 		else return '';
 	}
 	
+	function clearsql()
+	{
+		$perf_table = adodb_perf::table();
+		$this->conn->Execute("delete from $perf_table where created<".$this->conn->sysTimeStamp);
+	}
+	
 	/***********************************************************************************************/
 	//                                    HIGH LEVEL UI FUNCTIONS
 	/***********************************************************************************************/
-
+	
 	
 	function UI($pollsecs=5)
 	{
+	global $ADODB_LOG_CONN;
 	
     $perf_table = adodb_perf::table();
 	$conn = $this->conn;
@@ -659,7 +674,7 @@ Committed_AS:   348732 kB
 	$savelog = $this->conn->LogSQL(false);	
 	$info = $conn->ServerInfo();
 	if (isset($_GET['clearsql'])) {
-		$this->conn->Execute("delete from $perf_table");
+		$this->clearsql();
 	}
 	$this->conn->LogSQL($savelog);
 	
@@ -688,6 +703,8 @@ Committed_AS:   348732 kB
 	else $form = "<td>&nbsp;</td>";
 	
 	$allowsql = !defined('ADODB_PERF_NO_RUN_SQL');
+	global $ADODB_PERF_MIN;
+	$app .= " (Min sql timing \$ADODB_PERF_MIN=$ADODB_PERF_MIN secs)";
 	
 	if  (empty($_GET['hidem']))
 	echo "<table border=1 width=100% bgcolor=lightyellow><tr><td colspan=2>
@@ -702,9 +719,13 @@ Committed_AS:   348732 kB
 	 	switch ($do) {
 		default:
 		case 'stats':
+		
+			if (empty($ADODB_LOG_CONN))
+				echo "<p>&nbsp; <a href=\"?do=viewsql&clearsql=1\">Clear SQL Log</a><br>";
 			echo $this->HealthCheck();
 			//$this->conn->debug=1;
 			echo $this->CheckMemory();
+			global $ADODB_LOG_CONN;
 			break;
 		case 'poll':
 			echo "<iframe width=720 height=80% 

lib/adodb/adodb-php4.inc.php

@@ -1,7 +1,7 @@
 <?php
 
 /*
-  V4.93 10 Oct 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.98 13 Feb 2008  (c) 2000-2008 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

lib/adodb/adodb-time.inc.php

@@ -241,6 +241,24 @@ b. Implement daylight savings, which looks awfully complicated, see
 
 
 CHANGELOG
+
+- 11 Feb 2008 0.33
+* Bug in 0.32 fix for hour handling. Fixed.
+
+- 1 Feb 2008 0.32
+* Now adodb_mktime(0,0,0,12+$m,20,2040) works properly. 
+
+- 10 Jan 2008 0.31
+* Now adodb_mktime(0,0,0,24,1,2037) works correctly.
+
+- 15 July 2007 0.30
+Added PHP 5.2.0 compatability fixes. 
+ * gmtime behaviour for 1970 has changed. We use the actual date if it is between 1970 to 2038 to get the
+ * timezone, otherwise we use the current year as the baseline to retrieve the timezone.
+ * Also the timezone's in php 5.2.* support historical data better, eg. if timezone today was +8, but 
+   in 1970 it was +7:30, then php 5.2 return +7:30, while this library will use +8.
+ * 
+ 
 - 19 March 2006 0.24
 Changed strftime() locale detection, because some locales prepend the day of week to the date when %c is used.
 
@@ -368,7 +386,9 @@ First implementation.
 /*
 	Version Number
 */
-define('ADODB_DATE_VERSION',0.24);
+define('ADODB_DATE_VERSION',0.33);
+
+$ADODB_DATETIME_CLASS = (PHP_VERSION >= 5.2);
 
 /*
 	This code was originally for windows. But apparently this problem happens 
@@ -387,10 +407,13 @@ if (!defined('ADODB_ALLOW_NEGATIVE_TS')) define('ADODB_NO_NEGATIVE_TS',1);
 
 function adodb_date_test_date($y1,$m,$d=13)
 {
-	$t = adodb_mktime(0,0,0,$m,$d,$y1);
+	$h = round(rand()% 24);
+	$t = adodb_mktime($h,0,0,$m,$d,$y1);
 	$rez = adodb_date('Y-n-j H:i:s',$t);
-	if ("$y1-$m-$d 00:00:00" != $rez) {
-		print "<b>$y1 error, expected=$y1-$m-$d 00:00:00, adodb=$rez</b><br>";
+	if ($h == 0) $h = '00';
+	else if ($h < 10) $h = '0'.$h;	
+	if ("$y1-$m-$d $h:00:00" != $rez) {
+		print "<b>$y1 error, expected=$y1-$m-$d $h:00:00, adodb=$rez</b><br>";
 		return false;
 	}
 	return true;
@@ -403,16 +426,19 @@ function adodb_date_test_strftime($fmt)
 	
 	if ($s1 == $s2) return true;
 	
-	echo "error for $fmt,  strftime=$s1, $adodb=$s2<br>";
+	echo "error for $fmt,  strftime=$s1, adodb=$s2<br>";
 	return false;
 }
 
 /**
 	 Test Suite
-*/
+*/		
 function adodb_date_test()
 {
 	
+	for ($m=-24; $m<=24; $m++)
+		echo "$m :",adodb_date('d-m-Y',adodb_mktime(0,0,0,1+$m,20,2040)),"<br>";
+	
 	error_reporting(E_ALL);
 	print "<h4>Testing adodb_date and adodb_mktime. version=".ADODB_DATE_VERSION.' PHP='.PHP_VERSION."</h4>";
 	@set_time_limit(0);
@@ -421,6 +447,15 @@ function adodb_date_test()
 	// This flag disables calling of PHP native functions, so we can properly test the code
 	if (!defined('ADODB_TEST_DATES')) define('ADODB_TEST_DATES',1);
 	
+	$t = time();
+	
+	
+	$fmt = 'Y-m-d H:i:s';
+	echo '<pre>';
+	echo 'adodb: ',adodb_date($fmt,$t),'<br>';
+	echo 'php  : ',date($fmt,$t),'<br>';
+	echo '</pre>';
+	
 	adodb_date_test_strftime('%Y %m %x %X');
 	adodb_date_test_strftime("%A %d %B %Y");
 	adodb_date_test_strftime("%H %M S");
@@ -480,6 +515,7 @@ function adodb_date_test()
 	
 	// Test string formating
 	print "<p>Testing date formating</p>";
+	
 	$fmt = '\d\a\t\e T Y-m-d H:i:s a A d D F g G h H i j l L m M n O \R\F\C2822 r s t U w y Y z Z 2003';
 	$s1 = date($fmt,0);
 	$s2 = adodb_date($fmt,0);
@@ -657,15 +693,45 @@ function adodb_year_digit_check($y)
 	return $y;
 }
 
-/**
- get local time zone offset from GMT
-*/
-function adodb_get_gmt_diff() 
+function adodb_get_gmt_diff_ts($ts) 
 {
-static $TZ;
-	if (isset($TZ)) return $TZ;
+	if (0 <= $ts && $ts <= 0x7FFFFFFF) { // check if number in 32-bit signed range) {
+		$arr = getdate($ts);
+		$y = $arr['year'];
+		$m = $arr['mon'];
+		$d = $arr['mday'];
+		return adodb_get_gmt_diff($y,$m,$d);	
+	} else {
+		return adodb_get_gmt_diff(false,false,false);
+	}
+	
+}
+
+/**
+ get local time zone offset from GMT. Does not handle historical timezones before 1970.
+*/
+function adodb_get_gmt_diff($y,$m,$d) 
+{
+static $TZ,$tzo;
+global $ADODB_DATETIME_CLASS;
+
+	if (!defined('ADODB_TEST_DATES')) $y = false;
+	else if ($y < 1970 || $y >= 2038) $y = false;
+
+	if ($ADODB_DATETIME_CLASS && $y !== false) {
+		$dt = new DateTime();
+		$dt->setISODate($y,$m,$d);
+		if (empty($tzo)) {
+			$tzo = new DateTimeZone(date_default_timezone_get());
+		#	$tzt = timezone_transitions_get( $tzo );
+		}
+		return -$tzo->getOffset($dt);
+	} else {
+		if (isset($TZ)) return $TZ;
+		$y = date('Y');
+		$TZ = mktime(0,0,0,12,2,$y,0) - gmmktime(0,0,0,12,2,$y,0);
+	}
 	
-	$TZ = mktime(0,0,0,1,2,1970,0) - gmmktime(0,0,0,1,2,1970,0);
 	return $TZ;
 }
 
@@ -712,8 +778,8 @@ function adodb_validdate($y,$m,$d)
 {
 global $_month_table_normal,$_month_table_leaf;
 
-	if (_adodb_is_leap_year($y)) $marr =& $_month_table_leaf;
-	else $marr =& $_month_table_normal;
+	if (_adodb_is_leap_year($y)) $marr = $_month_table_leaf;
+	else $marr = $_month_table_normal;
 	
 	if ($m > 12 || $m < 1) return false;
 	
@@ -736,8 +802,7 @@ function _adodb_getdate($origd=false,$fast=false,$is_gmt=false)
 static $YRS;
 global $_month_table_normal,$_month_table_leaf;
 
-	$d =  $origd - ($is_gmt ? 0 : adodb_get_gmt_diff());
-	
+	$d =  $origd - ($is_gmt ? 0 : adodb_get_gmt_diff_ts($origd));
 	$_day_power = 86400;
 	$_hour_power = 3600;
 	$_min_power = 60;
@@ -927,6 +992,23 @@ global $_month_table_normal,$_month_table_leaf;
 		0 => $origd
 	);
 }
+/*
+		if ($isphp5)
+				$dates .= sprintf('%s%04d',($gmt<=0)?'+':'-',abs($gmt)/36); 
+			else
+				$dates .= sprintf('%s%04d',($gmt<0)?'+':'-',abs($gmt)/36); 
+			break;*/
+function adodb_tz_offset($gmt,$isphp5)
+{
+	$zhrs = abs($gmt)/3600;
+	$hrs = floor($zhrs);
+	if ($isphp5) 
+		return sprintf('%s%02d%02d',($gmt<=0)?'+':'-',floor($zhrs),($zhrs-$hrs)*60); 
+	else
+		return sprintf('%s%02d%02d',($gmt<0)?'+':'-',floor($zhrs),($zhrs-$hrs)*60); 
+	break;
+}
+
 
 function adodb_gmdate($fmt,$d=false)
 {
@@ -958,6 +1040,7 @@ function adodb_date2($fmt, $d=false, $is_gmt=false)
 function adodb_date($fmt,$d=false,$is_gmt=false)
 {
 static $daylight;
+global $ADODB_DATETIME_CLASS;
 
 	if ($d === false) return ($is_gmt)? @gmdate($fmt): @date($fmt);
 	if (!defined('ADODB_TEST_DATES')) {
@@ -992,7 +1075,14 @@ static $daylight;
 	*/
 	for ($i=0; $i < $max; $i++) {
 		switch($fmt[$i]) {
-		case 'T': $dates .= date('T');break;
+		case 'T': 
+			if ($ADODB_DATETIME_CLASS) {
+				$dt = new DateTime();
+				$dt->SetDate($year,$month,$day);
+				$dates .= $dt->Format('T');
+			} else
+				$dates .= date('T');
+			break;
 		// YEAR
 		case 'L': $dates .= $arr['leap'] ? '1' : '0'; break;
 		case 'r': // Thu, 21 Dec 2000 16:01:07 +0200
@@ -1008,13 +1098,11 @@ static $daylight;
 			
 			if ($secs < 10) $dates .= ':0'.$secs; else $dates .= ':'.$secs;
 			
-			$gmt = adodb_get_gmt_diff();
-			if ($isphp5) 
-				$dates .= sprintf(' %s%04d',($gmt<=0)?'+':'-',abs($gmt)/36); 
-			else
-				$dates .= sprintf(' %s%04d',($gmt<0)?'+':'-',abs($gmt)/36); 
+			$gmt = adodb_get_gmt_diff($year,$month,$day);
+			
+			$dates .= ' '.adodb_tz_offset($gmt,$isphp5);
 			break;
-				
+			
 		case 'Y': $dates .= $year; break;
 		case 'y': $dates .= substr($year,strlen($year)-2,2); break;
 		// MONTH
@@ -1041,14 +1129,11 @@ static $daylight;
 			
 		// HOUR
 		case 'Z':
-			$dates .= ($is_gmt) ? 0 : -adodb_get_gmt_diff(); break;
+			$dates .= ($is_gmt) ? 0 : -adodb_get_gmt_diff($year,$month,$day); break;
 		case 'O': 
-			$gmt = ($is_gmt) ? 0 : adodb_get_gmt_diff();
+			$gmt = ($is_gmt) ? 0 : adodb_get_gmt_diff($year,$month,$day);
 			
-			if ($isphp5)
-				$dates .= sprintf('%s%04d',($gmt<=0)?'+':'-',abs($gmt)/36); 
-			else
-				$dates .= sprintf('%s%04d',($gmt<0)?'+':'-',abs($gmt)/36); 
+			$dates .= adodb_tz_offset($gmt,$isphp5);
 			break;
 			
 		case 'H': 
@@ -1130,16 +1215,21 @@ function adodb_mktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_dst=fa
 		
 		// for windows, we don't check 1970 because with timezone differences, 
 		// 1 Jan 1970 could generate negative timestamp, which is illegal
-		if (1971 < $year && $year < 2038
+		$usephpfns = (1971 < $year && $year < 2038
 			|| !defined('ADODB_NO_NEGATIVE_TS') && (1901 < $year && $year < 2038)
-			) {
+			); 
+			
+		
+		if ($usephpfns && ($year + $mon/12+$day/365.25+$hr/(24*365.25) >= 2038)) $usephpfns = false;
+			
+		if ($usephpfns) {
 				return $is_gmt ?
 					@gmmktime($hr,$min,$sec,$mon,$day,$year):
 					@mktime($hr,$min,$sec,$mon,$day,$year);
-			}
+		}
 	}
 	
-	$gmt_different = ($is_gmt) ? 0 : adodb_get_gmt_diff();
+	$gmt_different = ($is_gmt) ? 0 : adodb_get_gmt_diff($year,$mon,$day);
 
 	/*
 	# disabled because some people place large values in $sec.
@@ -1156,7 +1246,7 @@ function adodb_mktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_dst=fa
 	$year = adodb_year_digit_check($year);
 
 	if ($mon > 12) {
-		$y = floor($mon / 12);
+		$y = floor(($mon-1)/ 12);
 		$year += $y;
 		$mon -= $y*12;
 	} else if ($mon < 1) {
@@ -1333,5 +1423,4 @@ global $ADODB_DATE_LOCALE;
 	return $ret;
 }
 
-
 ?>

lib/adodb/adodb-xmlschema.inc.php

@@ -10,9 +10,9 @@
  * build a database on any ADOdb-supported platform using a simple
  * XML schema.
  *
- * Last Editor: $Author: skodak $
+ * Last Editor: $Author$
  * @author Richard Tango-Lowy & Dan Cech
- * @version $Revision: 1.14 $
+ * @version $Revision$
  *
  * @package axmls
  * @tutorial getting_started.pkg
@@ -1209,7 +1209,7 @@ class dbQuerySet extends dbObject {
 * @tutorial getting_started.pkg
 *
 * @author Richard Tango-Lowy & Dan Cech
-* @version $Revision: 1.14 $
+* @version $Revision$
 *
 * @package axmls
 */

lib/adodb/adodb-xmlschema03.inc.php

@@ -10,9 +10,9 @@
  * build a database on any ADOdb-supported platform using a simple
  * XML schema.
  *
- * Last Editor: $Author: skodak $
+ * Last Editor: $Author$
  * @author Richard Tango-Lowy & Dan Cech
- * @version $Revision: 1.4 $
+ * @version $Revision$
  *
  * @package axmls
  * @tutorial getting_started.pkg
@@ -1309,7 +1309,7 @@ class dbQuerySet extends dbObject {
 * @tutorial getting_started.pkg
 *
 * @author Richard Tango-Lowy & Dan Cech
-* @version $Revision: 1.4 $
+* @version $Revision$
 *
 * @package axmls
 */

lib/adodb/adodb.inc.php

@@ -1,8 +1,8 @@
-<?php 
+<?php
 /*
  * Set tabs to 4 for best viewing.
  * 
- * Latest version is available at http://adodb.sourceforge.net
+ * Latest version is available at http://adodb.sourceforge.net/
  * 
  * This is the main include file for ADOdb.
  * Database specific drivers are stored in the adodb/drivers/adodb-*.inc.php
@@ -14,7 +14,7 @@
 /**
 	\mainpage 	
 	
-	 @version V4.93 10 Oct 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+	 @version V4.98 13 Feb 2008  (c) 2000-2008 John Lim (jlim#natsoft.com.my). All rights reserved.
 
 	Released under both BSD license and Lesser GPL library license. You can choose which license
 	you prefer.
@@ -56,7 +56,8 @@
 		$ADODB_CACHE_DIR,	// directory to cache recordsets
 		$ADODB_EXTENSION,   // ADODB extension installed
 		$ADODB_COMPAT_FETCH, // If $ADODB_COUNTRECS and this is true, $rs->fields is available on EOF
-	 	$ADODB_FETCH_MODE;	// DEFAULT, NUM, ASSOC or BOTH. Default follows native driver default...
+	 	$ADODB_FETCH_MODE,	// DEFAULT, NUM, ASSOC or BOTH. Default follows native driver default...
+		$ADODB_QUOTE_FIELDNAMES; // Allows you to force quotes (backticks) around field names in queries generated by getinsertsql and getupdatesql.	
 	
 	//==============================================================================================	
 	// GLOBAL SETUP
@@ -152,7 +153,8 @@
 		$ADODB_COUNTRECS,	// count number of records returned - slows down query
 		$ADODB_CACHE_DIR,	// directory to cache recordsets
 	 	$ADODB_FETCH_MODE,
-		$ADODB_FORCE_TYPE;
+		$ADODB_FORCE_TYPE,
+		$ADODB_QUOTE_FIELDNAMES;
 		
 		$ADODB_FETCH_MODE = ADODB_FETCH_DEFAULT;
 		$ADODB_FORCE_TYPE = ADODB_FORCE_VALUE;
@@ -174,7 +176,7 @@
 		/**
 		 * ADODB version as a string.
 		 */
-		$ADODB_vers = 'V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved. Released BSD & LGPL.';
+		$ADODB_vers = 'V4.98 13 Feb 2008 (c) 2000-2008 John Lim (jlim#natsoft.com.my). All rights reserved. Released BSD & LGPL.';
 	
 		/**
 		 * Determines whether recordset->RecordCount() is used. 
@@ -918,7 +920,9 @@
 		} 
 		
 		if ($this->_queryID === true) { // return simplified recordset for inserts/updates/deletes with lower overhead
-			$rs =& new ADORecordSet_empty();
+			$rsclass = $this->rsPrefix.'empty';
+			$rs = (class_exists($rsclass)) ? new $rsclass():  new ADORecordSet_empty();
+			
 			return $rs;
 		}
 		
@@ -1301,7 +1305,9 @@
 		$ret = false;
 		$rs = &$this->Execute($sql,$inputarr);
 		if ($rs) {	
-			if (!$rs->EOF) $ret = reset($rs->fields);
+			if ($rs->EOF) $ret = null;
+			else $ret = reset($rs->fields);
+			
 			$rs->Close();
 		}
 		$ADODB_COUNTRECS = $crecs;
@@ -1313,7 +1319,8 @@
 		$ret = false;
 		$rs = &$this->CacheExecute($secs2cache,$sql,$inputarr);
 		if ($rs) {		
-			if (!$rs->EOF) $ret = reset($rs->fields);
+			if ($rs->EOF) $ret = null;
+			else $ret = reset($rs->fields);
 			$rs->Close();
 		} 
 		
@@ -1322,7 +1329,7 @@
 	
 	function GetCol($sql, $inputarr = false, $trim = false)
 	{
-	  	$rv = false;
+	  	
 	  	$rs = &$this->Execute($sql, $inputarr);
 	  	if ($rs) {
 			$rv = array();
@@ -1338,15 +1345,16 @@
 		   		}
 			}
 	   		$rs->Close();
-	  	}
+	  	} else
+			$rv = false;
 	  	return $rv;
 	}
 	
 	function CacheGetCol($secs, $sql = false, $inputarr = false,$trim=false)
 	{
-	  	$rv = false;
 	  	$rs = &$this->CacheExecute($secs, $sql, $inputarr);
 	  	if ($rs) {
+			$rv = array();
 			if ($trim) {
 				while (!$rs->EOF) {
 					$rv[] = trim(reset($rs->fields));
@@ -1359,17 +1367,19 @@
 		   		}
 			}
 	   		$rs->Close();
-	  	}
-	  	return $rv;
+	  	} else		
+		  	$rv = false;
+	  	
+		return $rv;
 	}
 	
-	function &Transpose(&$rs)
+	function &Transpose(&$rs,$addfieldnames=true)
 	{
 		$rs2 =& $this->_rs2rs($rs);
 		$false = false;
 		if (!$rs2) return $false;
 		
-		$rs2->_transpose();
+		$rs2->_transpose($addfieldnames);
 		return $rs2;
 	}
  
@@ -1441,7 +1451,12 @@
 		return $arr;
 	}
 	
-	
+	function GetRandRow($sql, $arr= false)
+	{
+		$rezarr = $this->GetAll($sql, $arr);
+		$sz = sizeof($rez);
+		return $rezarr[abs(rand()) % $sz];
+	}
 	
 	/**
 	* Return one row of sql statement. Recordset is disposed for you.
@@ -1473,7 +1488,7 @@
 	{
 		$rs =& $this->CacheExecute($secs2cache,$sql,$inputarr);
 		if ($rs) {
-			$arr = false;
+			$arr = array();
 			if (!$rs->EOF) $arr = $rs->fields;
 			$rs->Close();
 			return $arr;
@@ -1574,7 +1589,7 @@
             $dir = $ADODB_CACHE_DIR;
             
          if ($this->debug) {
-            ADOConnection::outp( "CacheFlush: $dir<br><pre>\n", $this->_dirFlush($dir),"</pre>");
+            ADOConnection::outp( "CacheFlush: $dir<br><pre>\n". $this->_dirFlush($dir)."</pre>");
          } else {
             $this->_dirFlush($dir);
          }
@@ -1597,18 +1612,18 @@
    * Just specify the directory, and tell it if you want to delete the directory or just clear it out.
    * Note: $kill_top_level is used internally in the function to flush subdirectories.
    */
-   function _dirFlush($dir, $kill_top_level = false) {
+   function _dirFlush($dir, $kill_top_level = false) 
+   {
       if(!$dh = @opendir($dir)) return;
       
       while (($obj = readdir($dh))) {
-         if($obj=='.' || $obj=='..')
-            continue;
-			
-         if (!@unlink($dir.'/'.$obj))
-			  $this->_dirFlush($dir.'/'.$obj, true);
+         if($obj=='.' || $obj=='..') continue;
+		$f = $dir.'/'.$obj;
+		
+		if (strpos($obj,'.cache')) @unlink($f);
+		if (is_dir($f)) $this->_dirFlush($f, true);
       }
-      if ($kill_top_level === true)
-         @rmdir($dir);
+      if ($kill_top_level === true) @rmdir($dir);
       return true;
    }
    
@@ -1685,8 +1700,8 @@
 			
 		if ($createdir && $notSafeMode && !file_exists($dir)) {
 			$oldu = umask(0);
-			if (!mkdir($dir,0771)) 
-				if ($this->debug) ADOConnection::outp( "Unable to mkdir $dir for $sql");
+			if (!@mkdir($dir,0771)) 
+				 if(!is_dir($dir) && $this->debug) ADOConnection::outp( "Unable to mkdir $dir for $sql");
 			umask($oldu);
 		}
 		return $dir.'/adodb_'.$m.'.cache';
@@ -1759,17 +1774,27 @@
 						$fn($this->databaseType,'CacheExecute',-32000,"Cache write error",$md5file,$sql,$this);
 					if ($this->debug) ADOConnection::outp( " Cache write error");
 				}
-			} else
-			if ($rs) {
+			} else if ($rs) {
 				$eof = $rs->EOF;
 				$rs = &$this->_rs2rs($rs); // read entire recordset into memory immediately
 				$txt = _rs2serialize($rs,false,$sql); // serialize
 		
-				if (!adodb_write_file($md5file,$txt,$this->debug)) {
-					if ($fn = $this->raiseErrorFn) {
-						$fn($this->databaseType,'CacheExecute',-32000,"Cache write error",$md5file,$sql,$this);
+				$ok = adodb_write_file($md5file,$txt,$this->debug);
+				if (!$ok) {
+					if ($ok === false) {
+						$em = 'Cache write error';
+						$en = -32000;
+						
+						if ($fn = $this->raiseErrorFn) {
+							$fn($this->databaseType,'CacheExecute', $en, $em, $md5file,$sql,$this);
+						}
+					} else {
+						$em = 'Cache file locked warning';
+						$en = -32001;
+						// do not call error handling for just a warning
 					}
-					if ($this->debug) ADOConnection::outp( " Cache write error");
+					
+					if ($this->debug) ADOConnection::outp( " ".$em);
 				}
 				if ($rs->EOF && !$eof) {
 					$rs->MoveFirst();
@@ -1993,7 +2018,7 @@
 		
 		if (empty($this->_metars)) {
 			$rsclass = $this->rsPrefix.$this->databaseType;
-			$this->_metars =& new $rsclass(false,$this->fetchMode); 
+			$this->_metars = new $rsclass(false,$this->fetchMode); 
 			$this->_metars->connection =& $this;
 		}
 		return $this->_metars->MetaType($t,$len,$fieldobj);
@@ -2019,6 +2044,7 @@
 				$this->fmtTimeStamp = "'m-d-Y H:i:s'";
 				break;
 				
+			case 'PT_BR': 	
 			case 'NL':
 			case 'FR':
 			case 'RO':
@@ -2065,13 +2091,13 @@
 		$arr = array();
 		foreach($rows as $row) {
 		
-			$obj =& new $class($table,$primkeyArr,$this);
+			$obj = new $class($table,$primkeyArr,$this);
 			if ($obj->ErrorMsg()){
 				$this->_errorMsg = $obj->ErrorMsg();
 				return $false;
 			}
 			$obj->Set($row);
-			$arr[] =& $obj;
+			$arr[] = $obj;
 		}
 		return $arr;
 	}
@@ -2097,7 +2123,11 @@
 	 *
 	 * @return true if succeeded or false if database does not support transactions
 	 */
-	function BeginTrans() {return false;}
+	function BeginTrans() 
+	{
+		if ($this->debug) ADOConnection::outp("BeginTrans: Transactions not supported for this driver");
+		return false;
+	}
 	
 	/* set transaction mode */
 	function SetTransactionMode( $transaction_mode ) 
@@ -3387,9 +3417,12 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	 *
 	 * @return the ADOFieldObject for that column, or false.
 	 */
-	function &FetchField($fieldoffset) 
+	function &FetchField($fieldoffset = -1) 
 	{
 		// must be defined by child class
+		
+		$false = false;
+		return $false;
 	}	
 	
 	/**
@@ -3734,14 +3767,15 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 			$this->fetchMode = $ADODB_FETCH_MODE;
 		}
 		
-		function _transpose()
+		function _transpose($addfieldnames=true)
 		{
 		global $ADODB_INCLUDED_LIB;
 			
 			if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
 			$hdr = true;
 			
-			adodb_transpose($this->_array, $newarr, $hdr);
+			$fobjs = $addfieldnames ? $this->_fieldobjects : false;
+			adodb_transpose($this->_array, $newarr, $hdr, $fobjs);
 			//adodb_pr($newarr);
 			
 			$this->_skiprow1 = false;
@@ -3758,7 +3792,6 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 				$f->type = $this->_types[$k];
 				$f->max_length = -1;
 				$this->_fieldobjects[] = $f;
-				
 			}
 			$this->fields = reset($this->_array);
 			
@@ -3833,7 +3866,7 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 			$mode = isset($this->adodbFetchMode) ? $this->adodbFetchMode : $this->fetchMode;
 			
 			if ($mode & ADODB_FETCH_ASSOC) {
-				if (!isset($this->fields[$colname])) $colname = strtolower($colname);
+				if (!isset($this->fields[$colname]) && !is_null($this->fields[$colname])) $colname = strtolower($colname);
 				return $this->fields[$colname];
 			}
 			if (!$this->bind) {

lib/adodb/datadict/datadict-access.inc.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V4.93 10 Oct 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.98 13 Feb 2008  (c) 2000-2008 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.