Bump to 1.7.1

Fixes MDL-8207.

admin/lang.php

@@ -4,6 +4,9 @@
     *
     * CHANGES
     *
+    * 2006/11/07 mudrd8mz
+    * Fixed bug MDL-7361. Thanks to Dan Poltawski for the patch proposal.
+    *
     * 2006/06/08 mudrd8mz
     * 1) Fixed bug 5745 reported by Harry Smith so now can edit en_utf8_local pack
     * 2) More notification messages included
@@ -133,13 +136,14 @@
 
     // Get a list of all the root files in the English directory
 
+    $langbase = $CFG->dataroot . '/lang';
     $enlangdir = "$CFG->dirroot/lang/en_utf8";
     if ($currentlang == 'en_utf8') {
         $langdir = $enlangdir;
     } else {
-        $langdir = "$CFG->dataroot/lang/$currentlang";
+        $langdir = "$langbase/$currentlang";
     }
-    $locallangdir = "$CFG->dataroot/lang/{$currentlang}_local";
+    $locallangdir = "$langbase/{$currentlang}_local";
 
     if (! $stringfiles = get_directory_list($enlangdir, "", false)) {
         error("Could not find English language pack!");
@@ -256,6 +260,14 @@
 
     } else if ($mode == "compare") {
    
+        if (!file_exists($langbase) ){
+            if (!lang_make_directory($langbase) ){
+                error('ERROR: Could not create base lang directory ' . $langbase);
+            } else {
+                echo '<div class="notifysuccess" align="center">Created directory '.
+                                                     $langbase .'</div>'."<br />\n";
+            }
+        } 
         if (!$uselocal && !file_exists($langdir)) {
             if (!lang_make_directory($langdir)) {
                 error('ERROR: Could not create directory '.$langdir);
@@ -573,7 +585,7 @@ function lang_fix_value_from_file($value='') {
  * Try and create a new language directory.
  *
  * @uses $CFG
- * @param string $directory  directory name under $CFG->dataroot/lang eg cs_utf8_local
+ * @param string $directory full path to the directory under $langbase
  * @return string|false Returns full path to directory if successful, false if not
  */
 function lang_make_directory($dir, $shownotices=true) {

admin/report/courseoverview/reportsgraph.php

@@ -39,6 +39,8 @@
     $graph->parameter['legend_size'] = 10;
     $graph->parameter['x_axis_angle'] = 90;
     $graph->parameter['title'] = false; // moodle will do a nicer job.
+    $graph->y_tick_labels = null;
+    $graph->offset_relation = null;
     if ($report != STATS_REPORT_ACTIVE_COURSES) {
         $graph->parameter['y_decimal_left'] = 2;
     }

admin/roles/assign.php

@@ -157,8 +157,25 @@
 
         } else if ($remove and !empty($frm->removeselect) and confirm_sesskey()) {
 
+            $sitecontext = get_context_instance(CONTEXT_SYSTEM);
+            $topleveladmin = false;
+   
+            // we only worry about this if the role has doanything capability at site level
+            if ($adminroles = get_roles_with_capability('moodle/site:doanything', CAP_ALLOW, $sitecontext)) {
+                foreach ($adminroles as $adminrole) {
+                    if ($adminrole->id == $roleid) {
+                        $topleveladmin = true;
+                    }
+                }
+            }
+ 
             foreach ($frm->removeselect as $removeuser) {
                 $removeuser = clean_param($removeuser, PARAM_INT);
+
+                if ($topleveladmin && ($removeuser == $USER->id)) {   // Prevent unassigning oneself from being admin
+                    continue;
+                }
+
                 if (! role_unassign($roleid, $removeuser, 0, $context->id)) {
                     $errors[] = "Could not remove user with id $removeuser from this role!";
                 } else if ($inmeta) {

admin/roles/manage.php

@@ -224,9 +224,9 @@
             if (array_key_exists($roleid, $roles) and confirm_sesskey()) {
                 $role = $roles[$roleid];
                 if ($role->sortorder + 1 < $rolescount) {
-                    $bellow = $roles[$rolesort[$role->sortorder + 1]];
+                    $below = $roles[$rolesort[$role->sortorder + 1]];
 
-                    if (!switch_roles($role, $bellow)) {
+                    if (!switch_roles($role, $below)) {
                         error("Cannot move role with ID $roleid");
                     }
                 }

admin/search.php

@@ -18,17 +18,17 @@ $CFG->adminsearchquery = $query;  // So we can reference it in search boxes late
 $statusmsg = '';
 
 if ($data = data_submitted()) {
-    $data = (array)$data;
+    $unslashed = (array)stripslashes_recursive($data);
     if (confirm_sesskey()) {
         $olddbsessions = !empty($CFG->dbsessions);
         $changedsettings = search_settings(admin_get_root(), $query);
         $errors = '';
 
         foreach($changedsettings as $changedsetting) {
-            if (!isset($data['s_' . $changedsetting->name])) {
-                $data['s_' . $changedsetting->name] = ''; // needed for checkboxes
+            if (!isset($unslashed['s_' . $changedsetting->name])) {
+                $unslashed['s_' . $changedsetting->name] = ''; // needed for checkboxes
             }
-            $errors .= $changedsetting->write_setting($data['s_' . $changedsetting->name]);
+            $errors .= $changedsetting->write_setting($unslashed['s_' . $changedsetting->name]);
         }
 
         if ($olddbsessions != !empty($CFG->dbsessions)) {
@@ -69,6 +69,7 @@ if ($resultshtml != '') {
 } else {
     echo get_string('noresults','admin');
 }
+echo '</fieldset>';
 echo '</form>';
 
 admin_externalpage_print_footer($adminroot);

admin/settings.php

@@ -58,7 +58,8 @@ $statusmsg = '';
 if ($data = data_submitted()) {
     if (confirm_sesskey()) {
         $olddbsessions = !empty($CFG->dbsessions);
-        $errors = $root->write_settings((array)$data);
+        $unslashed = (array)stripslashes_recursive($data);
+        $errors = $root->write_settings($unslashed);
         //force logout if dbsession setting changes
         if ($olddbsessions != !empty($CFG->dbsessions)) {
             require_logout();

admin/settings/security.php

@@ -87,8 +87,8 @@ $ADMIN->add('security', $temp);
 // "antivirus" settingpage
 $temp = new admin_settingpage('antivirus', get_string('antivirus', 'admin'));
 $temp->add(new admin_setting_configcheckbox('runclamonupload', get_string('runclamavonupload', 'admin'), get_string('configrunclamavonupload', 'admin'), 0));
-$temp->add(new admin_setting_configtext('pathtoclam', get_string('pathtoclam', 'admin'), get_string('configpathtoclam', 'admin'), '', PARAM_PATH));
-$temp->add(new admin_setting_configtext('quarantinedir', get_string('quarantinedir', 'admin'), get_string('configquarantinedir', 'admin'), '', PARAM_PATH));
+$temp->add(new admin_setting_configtext('pathtoclam', get_string('pathtoclam', 'admin'), get_string('configpathtoclam', 'admin'), '', PARAM_RAW)); // TODO: add path validation
+$temp->add(new admin_setting_configtext('quarantinedir', get_string('quarantinedir', 'admin'), get_string('configquarantinedir', 'admin'), '', PARAM_RAW)); // TODO: add path validation
 $temp->add(new admin_setting_configselect('clamfailureonupload', get_string('clamfailureonupload', 'admin'), get_string('configclamfailureonupload', 'admin'), 'donothing', array('donothing' => get_string('configclamdonothing', 'admin'),
                                                                                                                                                                                   'actlikevirus' => get_string('configclamactlikevirus', 'admin'))));
 $ADMIN->add('security', $temp);

admin/settings/server.php

@@ -7,10 +7,10 @@ $temp = new admin_settingpage('systempaths', get_string('systempaths','admin'));
 $temp->add(new admin_setting_configselect('gdversion', get_string('gdversion','admin'), get_string('configgdversion', 'admin'), check_gd_version(), array('0' => get_string('gdnot'),
                                                                                                                                                           '1' => get_string('gd1'),
                                                                                                                                                           '2' => get_string('gd2'))));
-$temp->add(new admin_setting_configtext('zip', get_string('pathtozip','admin'), get_string('configzip', 'admin'), '', PARAM_PATH));
-$temp->add(new admin_setting_configtext('unzip', get_string('pathtounzip','admin'), get_string('configunzip', 'admin'), '', PARAM_PATH));
-$temp->add(new admin_setting_configtext('pathtodu', get_string('pathtodu', 'admin'), get_string('configpathtodu', 'admin'), '', PARAM_PATH));
-$temp->add(new admin_setting_configtext('aspellpath', get_string('aspellpath', 'admin'), get_string('edhelpaspellpath'), '', PARAM_PATH));
+$temp->add(new admin_setting_configtext('zip', get_string('pathtozip','admin'), get_string('configzip', 'admin'), '', PARAM_RAW)); // TODO: add path validation
+$temp->add(new admin_setting_configtext('unzip', get_string('pathtounzip','admin'), get_string('configunzip', 'admin'), '', PARAM_RAW)); // TODO: add path validation
+$temp->add(new admin_setting_configtext('pathtodu', get_string('pathtodu', 'admin'), get_string('configpathtodu', 'admin'), '', PARAM_RAW)); // TODO: add path validation
+$temp->add(new admin_setting_configtext('aspellpath', get_string('aspellpath', 'admin'), get_string('edhelpaspellpath'), '', PARAM_RAW)); // TODO: add path validation
 $ADMIN->add('server', $temp, 0);
 
 

admin/upgradesettings.php

@@ -24,14 +24,14 @@ if ($newsettingshtml == '') {
 
 // now we'll deal with the case that the admin has submitted the form with new settings
 if ($data = data_submitted()) {
-    $data = (array)$data;
+    $unslashed = (array)stripslashes_recursive($data);
     if (confirm_sesskey()) {
         $newsettings = find_new_settings(admin_get_root());
         $errors = '';
 
         foreach($newsettings as $newsetting) {
-            if (isset($data['s_' . $newsetting->name])) {
-                $errors .= $newsetting->write_setting($data['s_' . $newsetting->name]);
+            if (isset($unslashed['s_' . $newsetting->name])) {
+                $errors .= $newsetting->write_setting($unslashed['s_' . $newsetting->name]);
             } else {
                 $errors .= $newsetting->write_setting($newsetting->defaultsetting);
             }

admin/xmldb/actions/test/test.class.php

@@ -775,7 +775,7 @@ class test extends XMLDBAction {
                 if ($new = get_record('newnameforthetable', 'id', $rec->id)) {
                     delete_records('newnameforthetable', 'id', $new->id);
                     $newtextlen = $textlib->strlen($new->intro, current_charset());
-                    if ($rec->intro === $new->intro) {
+                    if ($fulltext === $new->intro) {
                         $test->sql = array($newtextlen . ' cc. (text) sent and received ok');
                         $test->status = true;
                     } else {
@@ -804,7 +804,7 @@ class test extends XMLDBAction {
             if ($rec->id = insert_record('newnameforthetable', $rec)) {
                 if ($new = get_record('newnameforthetable', 'id', $rec->id)) {
                     $newtextlen = strlen($new->avatar);
-                    if ($rec->avatar === $new->avatar) {
+                    if ($fulltext === $new->avatar) {
                         $test->sql = array($newtextlen . ' bytes (binary) sent and received ok');
                         $test->status = true;
                     } else {
@@ -837,7 +837,7 @@ class test extends XMLDBAction {
                 if ($new = get_record('newnameforthetable', 'id', $rec->id)) {
                     $newtextlen = $textlib->strlen($new->intro, current_charset());
                     $newimglen = strlen($new->avatar);
-                    if ($rec->avatar === $new->avatar && $rec->intro === $new->intro) {
+                    if ($basetext === $new->avatar && $basetext === $new->intro) {
                         $test->sql = array($newtextlen . ' cc. (text) sent and received ok',
                                            $newimglen . ' bytes (binary) sent and received ok');
                         $test->status = true;
@@ -874,7 +874,7 @@ class test extends XMLDBAction {
             if (set_field('newnameforthetable', 'intro', $rec->intro, 'name', $rec->name)) {
                 if ($new = get_record('newnameforthetable', 'id', $rec->id)) {
                     $newtextlen = $textlib->strlen($new->intro);
-                    if ($rec->intro === $new->intro) {
+                    if ($fulltext === $new->intro) {
                         $test->sql = array($newtextlen . ' cc. (text) sent and received ok');
                         $test->status = true;
                     } else {
@@ -904,7 +904,7 @@ class test extends XMLDBAction {
             if (set_field('newnameforthetable', 'avatar', $rec->avatar, 'name', $rec->name)) {
                 if ($new = get_record('newnameforthetable', 'id', $rec->id)) {
                     $newtextlen = strlen($new->avatar);
-                    if ($rec->avatar === $new->avatar) {
+                    if ($fulltext === $new->avatar) {
                         $test->sql = array($newtextlen . ' bytes (binary) sent and received ok');
                         $test->status = true;
                     } else {

admin/xmldb/actions/view_structure_php/view_structure_php.class.php

@@ -211,7 +211,7 @@ class view_structure_php extends XMLDBAction {
     /// Launch the proper DDL
         $result .= XMLDB_LINEFEED;
         $result .= '    /// Launch create table for ' . $table->getName() . XMLDB_LINEFEED;
-        $result .= '        $status = $status && create_table($table);' . XMLDB_LINEFEED;
+        $result .= '        $result = $result && create_table($table);' . XMLDB_LINEFEED;
 
     /// Add standard PHP footer
         $result .= XMLDB_PHP_FOOTER;
@@ -249,7 +249,7 @@ class view_structure_php extends XMLDBAction {
     /// Launch the proper DDL
         $result .= XMLDB_LINEFEED;
         $result .= '    /// Launch drop table for ' . $table->getName() . XMLDB_LINEFEED;
-        $result .= '        $status = $status && drop_table($table);' . XMLDB_LINEFEED;
+        $result .= '        $result = $result && drop_table($table);' . XMLDB_LINEFEED;
 
     /// Add standard PHP footer
         $result .= XMLDB_PHP_FOOTER;
@@ -287,7 +287,7 @@ class view_structure_php extends XMLDBAction {
     /// Launch the proper DDL
         $result .= XMLDB_LINEFEED;
         $result .= '    /// Launch rename table for ' . $table->getName() . XMLDB_LINEFEED;
-        $result .= '        $status = $status && rename_table($table, ' . "'NEWNAMEGOESHERE'" . ');' . XMLDB_LINEFEED;
+        $result .= '        $result = $result && rename_table($table, ' . "'NEWNAMEGOESHERE'" . ');' . XMLDB_LINEFEED;
 
     /// Add standard PHP footer
         $result .= XMLDB_PHP_FOOTER;

admin/xmldb/actions/view_table_php/view_table_php.class.php

@@ -336,7 +336,7 @@ class view_table_php extends XMLDBAction {
     /// Launch the proper DDL
         $result .= XMLDB_LINEFEED;
         $result .= '    /// Launch add field ' . $field->getName() . XMLDB_LINEFEED;
-        $result .= '        $status = $status && add_field($table, $field);' . XMLDB_LINEFEED;
+        $result .= '        $result = $result && add_field($table, $field);' . XMLDB_LINEFEED;
 
     /// Add standard PHP footer
         $result .= XMLDB_PHP_FOOTER;
@@ -379,7 +379,7 @@ class view_table_php extends XMLDBAction {
     /// Launch the proper DDL
         $result .= XMLDB_LINEFEED;
         $result .= '    /// Launch drop field ' . $field->getName() . XMLDB_LINEFEED;
-        $result .= '        $status = $status && drop_field($table, $field);' . XMLDB_LINEFEED;
+        $result .= '        $result = $result && drop_field($table, $field);' . XMLDB_LINEFEED;
 
     /// Add standard PHP footer
         $result .= XMLDB_PHP_FOOTER;
@@ -422,7 +422,7 @@ class view_table_php extends XMLDBAction {
     /// Launch the proper DDL
         $result .= XMLDB_LINEFEED;
         $result .= '    /// Launch rename field ' . $field->getName() . XMLDB_LINEFEED;
-        $result .= '        $status = $status && rename_field($table, $field, ' . "'" . 'NEWNAMEGOESHERE' . "'" . ');' . XMLDB_LINEFEED;
+        $result .= '        $result = $result && rename_field($table, $field, ' . "'" . 'NEWNAMEGOESHERE' . "'" . ');' . XMLDB_LINEFEED;
 
     /// Add standard PHP footer
         $result .= XMLDB_PHP_FOOTER;
@@ -475,7 +475,7 @@ class view_table_php extends XMLDBAction {
     /// Launch the proper DDL
         $result .= XMLDB_LINEFEED;
         $result .= '    /// Launch change of type for field ' . $field->getName() . XMLDB_LINEFEED;
-        $result .= '        $status = $status && change_field_type($table, $field);' . XMLDB_LINEFEED;
+        $result .= '        $result = $result && change_field_type($table, $field);' . XMLDB_LINEFEED;
 
     /// Add standard PHP footer
         $result .= XMLDB_PHP_FOOTER;
@@ -525,7 +525,7 @@ class view_table_php extends XMLDBAction {
     /// Launch the proper DDL
         $result .= XMLDB_LINEFEED;
         $result .= '    /// Launch change of precision for field ' . $field->getName() . XMLDB_LINEFEED;
-        $result .= '        $status = $status && change_field_precision($table, $field);' . XMLDB_LINEFEED;
+        $result .= '        $result = $result && change_field_precision($table, $field);' . XMLDB_LINEFEED;
 
     /// Add standard PHP footer
         $result .= XMLDB_PHP_FOOTER;
@@ -571,7 +571,7 @@ class view_table_php extends XMLDBAction {
     /// Launch the proper DDL
         $result .= XMLDB_LINEFEED;
         $result .= '    /// Launch change of sign for field ' . $field->getName() . XMLDB_LINEFEED;
-        $result .= '        $status = $status && change_field_unsigned($table, $field);' . XMLDB_LINEFEED;
+        $result .= '        $result = $result && change_field_unsigned($table, $field);' . XMLDB_LINEFEED;
 
     /// Add standard PHP footer
         $result .= XMLDB_PHP_FOOTER;
@@ -617,7 +617,7 @@ class view_table_php extends XMLDBAction {
     /// Launch the proper DDL
         $result .= XMLDB_LINEFEED;
         $result .= '    /// Launch change of nullability for field ' . $field->getName() . XMLDB_LINEFEED;
-        $result .= '        $status = $status && change_field_notnull($table, $field);' . XMLDB_LINEFEED;
+        $result .= '        $result = $result && change_field_notnull($table, $field);' . XMLDB_LINEFEED;
 
     /// Add standard PHP footer
         $result .= XMLDB_PHP_FOOTER;
@@ -664,7 +664,7 @@ class view_table_php extends XMLDBAction {
     /// Launch the proper DDL
         $result .= XMLDB_LINEFEED;
         $result .= '    /// Launch change of list of values for field ' . $field->getName() . XMLDB_LINEFEED;
-        $result .= '        $status = $status && change_field_enum($table, $field);' . XMLDB_LINEFEED;
+        $result .= '        $result = $result && change_field_enum($table, $field);' . XMLDB_LINEFEED;
 
     /// Add standard PHP footer
         $result .= XMLDB_PHP_FOOTER;
@@ -710,7 +710,7 @@ class view_table_php extends XMLDBAction {
     /// Launch the proper DDL
         $result .= XMLDB_LINEFEED;
         $result .= '    /// Launch change of default for field ' . $field->getName() . XMLDB_LINEFEED;
-        $result .= '        $status = $status && change_field_default($table, $field);' . XMLDB_LINEFEED;
+        $result .= '        $result = $result && change_field_default($table, $field);' . XMLDB_LINEFEED;
 
     /// Add standard PHP footer
         $result .= XMLDB_PHP_FOOTER;
@@ -754,7 +754,7 @@ class view_table_php extends XMLDBAction {
     /// Launch the proper DDL
         $result .= XMLDB_LINEFEED;
         $result .= '    /// Launch add key ' . $key->getName() . XMLDB_LINEFEED;
-        $result .= '        $status = $status && add_key($table, $key);' . XMLDB_LINEFEED;
+        $result .= '        $result = $result && add_key($table, $key);' . XMLDB_LINEFEED;
 
     /// Add standard PHP footer
         $result .= XMLDB_PHP_FOOTER;
@@ -798,7 +798,7 @@ class view_table_php extends XMLDBAction {
     /// Launch the proper DDL
         $result .= XMLDB_LINEFEED;
         $result .= '    /// Launch drop key ' . $key->getName() . XMLDB_LINEFEED;
-        $result .= '        $status = $status && drop_key($table, $key);' . XMLDB_LINEFEED;
+        $result .= '        $result = $result && drop_key($table, $key);' . XMLDB_LINEFEED;
 
     /// Add standard PHP footer
         $result .= XMLDB_PHP_FOOTER;
@@ -845,7 +845,7 @@ class view_table_php extends XMLDBAction {
     /// Launch the proper DDL
         $result .= XMLDB_LINEFEED;
         $result .= '    /// Launch rename key ' . $key->getName() . XMLDB_LINEFEED;
-        $result .= '        $status = $status && rename_key($table, $key, ' . "'" . 'NEWNAMEGOESHERE' . "'" . ');' . XMLDB_LINEFEED;
+        $result .= '        $result = $result && rename_key($table, $key, ' . "'" . 'NEWNAMEGOESHERE' . "'" . ');' . XMLDB_LINEFEED;
 
     /// Add standard PHP footer
         $result .= XMLDB_PHP_FOOTER;
@@ -889,7 +889,7 @@ class view_table_php extends XMLDBAction {
     /// Launch the proper DDL
         $result .= XMLDB_LINEFEED;
         $result .= '    /// Launch add index ' . $index->getName() . XMLDB_LINEFEED;
-        $result .= '        $status = $status && add_index($table, $index);' . XMLDB_LINEFEED;
+        $result .= '        $result = $result && add_index($table, $index);' . XMLDB_LINEFEED;
 
     /// Add standard PHP footer
         $result .= XMLDB_PHP_FOOTER;
@@ -933,7 +933,7 @@ class view_table_php extends XMLDBAction {
     /// Launch the proper DDL
         $result .= XMLDB_LINEFEED;
         $result .= '    /// Launch drop index ' . $index->getName() . XMLDB_LINEFEED;
-        $result .= '        $status = $status && drop_index($table, $index);' . XMLDB_LINEFEED;
+        $result .= '        $result = $result && drop_index($table, $index);' . XMLDB_LINEFEED;
 
     /// Add standard PHP footer
         $result .= XMLDB_PHP_FOOTER;
@@ -980,7 +980,7 @@ class view_table_php extends XMLDBAction {
     /// Launch the proper DDL
         $result .= XMLDB_LINEFEED;
         $result .= '    /// Launch rename index ' . $index->getName() . XMLDB_LINEFEED;
-        $result .= '        $status = $status && rename_index($table, $index, ' . "'" . 'NEWNAMEGOESHERE' . "'" . ');' . XMLDB_LINEFEED;
+        $result .= '        $result = $result && rename_index($table, $index, ' . "'" . 'NEWNAMEGOESHERE' . "'" . ');' . XMLDB_LINEFEED;
 
     /// Add standard PHP footer
         $result .= XMLDB_PHP_FOOTER;

auth/db/lib.php

@@ -22,7 +22,8 @@ function auth_user_login ($username, $password) {
 
     // Connect to the external database
     $authdb = &ADONewConnection($CFG->auth_dbtype); 
-    $authdb->PConnect($CFG->auth_dbhost,$CFG->auth_dbuser,$CFG->auth_dbpass,$CFG->auth_dbname); 
+    $authdb->PConnect($CFG->auth_dbhost,$CFG->auth_dbuser,$CFG->auth_dbpass,$CFG->auth_dbname);
+    $authdb->SetFetchMode(ADODB_FETCH_ASSOC); ///Set Assoc mode always after DB connection
 
     if ($CFG->auth_dbpasstype === 'internal') { 
         // lookup username externally, but resolve
@@ -92,6 +93,7 @@ function auth_get_userinfo($username){
     ADOLoadCode($CFG->auth_dbtype);          
     $authdb = &ADONewConnection();         
     $authdb->PConnect($CFG->auth_dbhost,$CFG->auth_dbuser,$CFG->auth_dbpass,$CFG->auth_dbname); 
+    $authdb->SetFetchMode(ADODB_FETCH_ASSOC); ///Set Assoc mode always after DB connection
 
     $fields = array("firstname", "lastname", "email", "phone1", "phone2", 
                     "department", "address", "city", "country", "description", 
@@ -101,13 +103,13 @@ function auth_get_userinfo($username){
 
     foreach ($fields as $field) {
         if ($pcfg["field_map_$field"]) {
-            if ($rs = $authdb->Execute("SELECT ".$pcfg["field_map_$field"]." FROM $CFG->auth_dbtable
+            if ($rs = $authdb->Execute("SELECT ".$pcfg["field_map_$field"]." as myfield FROM $CFG->auth_dbtable
                                         WHERE $CFG->auth_dbfielduser = '$username'")) {
                 if ( $rs->RecordCount() == 1 ) {
                     if (!empty($CFG->unicodedb)) {
-                        $result["$field"] = addslashes(stripslashes($rs->fields[0]));
+                        $result["$field"] = addslashes(stripslashes($rs->fields['myfield']));
                     } else {
-                        $result["$field"] = addslashes(stripslashes(utf8_decode($rs->fields[0])));
+                        $result["$field"] = addslashes(stripslashes(utf8_decode($rs->fields['myfield'])));
                     }
                 }
             }
@@ -302,6 +304,7 @@ function auth_user_exists ($username) {
     global $CFG;
     $authdb = &ADONewConnection($CFG->auth_dbtype); 
     $authdb->PConnect($CFG->auth_dbhost,$CFG->auth_dbuser,$CFG->auth_dbpass,$CFG->auth_dbname); 
+    $authdb->SetFetchMode(ADODB_FETCH_ASSOC); ///Set Assoc mode always after DB connection
 
     $rs = $authdb->Execute("SELECT * FROM $CFG->auth_dbtable 
                                  WHERE $CFG->auth_dbfielduser = '$username' ");
@@ -334,6 +337,7 @@ function auth_get_userlist() {
     // Connect to the external database
     $authdb = &ADONewConnection($CFG->auth_dbtype); 
     $authdb->PConnect($CFG->auth_dbhost,$CFG->auth_dbuser,$CFG->auth_dbpass,$CFG->auth_dbname); 
+    $authdb->SetFetchMode(ADODB_FETCH_ASSOC); ///Set Assoc mode always after DB connection
 
     // fetch userlist
     $rs = $authdb->Execute("SELECT $CFG->auth_dbfielduser AS username
@@ -459,4 +463,4 @@ function auth_validate_form(&$form, &$err) {
     return true;
 }
 
-?>
+?>

auth/ldap/lib.php

@@ -713,7 +713,7 @@ function auth_ldap_bulk_insert($users){
     // bulk insert -- superfast with $bulk_insert_records
     $sql = 'INSERT INTO '.$CFG->prefix.'extuser (idnumber) VALUES ';
     // make those values safe
-    array_map('addslashes', $users);
+    $users = array_map('addslashes', $users);
     // join and quote the whole lot
     $sql = $sql . '(\'' . join('\'),(\'', $users) . '\')';
     print "+ " . count($users) . " users\n";

auth/shibboleth/README.txt

@@ -14,7 +14,7 @@ Changes:
 - 10. 2005: Added better error messages and moved text to language directories
 - 02. 2006: Simplified authentication so that authorization works properly
             Added instructions for IIS
-            
+- 11. 2006: User capabilities are now loaded properly as of Moodle 1.7+
 
 
 Moodle Configuration with Dual login
@@ -164,11 +164,6 @@ Example file:
 ?>
 --
 
-Bugs
---------------------------------------------------------------------------------
-Please send bug reports concerning the Shibboleth part to 
-Lukas Haemmerle <haemmerle@switch.ch>
-
 --------------------------------------------------------------------------------
 In case of problems and questions with Shibboleth authentication, contact 
 Lukas Haemmerle <haemmerle@switch.ch> or Markus Hagman <hagman@hytti.uku.fi>

auth/shibboleth/index.php

@@ -56,6 +56,15 @@
                 $urltogo = $CFG->wwwroot.'/';      /// Go to the standard home page
                 unset($SESSION->wantsurl);         /// Just in case
             }
+            
+            /// Go to my-moodle page instead of homepage if mymoodleredirect enabled
+            if (!has_capability('moodle/site:config',get_context_instance(CONTEXT_SYSTEM, SITEID)) and !empty($CFG->mymoodleredirect) and !isguest()) {
+                if ($urltogo == $CFG->wwwroot or $urltogo == $CFG->wwwroot.'/' or $urltogo == $CFG->wwwroot.'/index.php') {
+                    $urltogo = $CFG->wwwroot.'/my/';
+                }
+            }
+            
+            load_all_capabilities();     /// This is what lets the user do anything on the site  :-)
 
             redirect($urltogo);
         }

backup/backuplib.php

@@ -170,25 +170,10 @@
         return get_users_by_capability(get_context_instance(CONTEXT_COURSE, $courseid), 'moodle/course:view');
     }
 
-    //Returns all users (every record in users table)
-
+    //Returns all users ids (every record in users table)
     function backup_get_all_users() {
 
-        global $CFG;
-
-        $result = false;
-
-        //Get users
-        $users = get_records_sql("SELECT DISTINCT id,id
-                                  FROM {$CFG->prefix}user");
-        //Add users
-        if ($users) {
-            foreach ($users as $user) {
-                $result[$user->id]->id = $user->id;
-            }
-        }
-
-        return $result;
+        return get_records('user', '', '', '', 'id, id'); 
     }
 
     //Calculate the number of log entries to backup
@@ -2222,4 +2207,4 @@
         }   
         fwrite ($bf, end_tag("ROLES_ASSIGNMENTS", $startlevel, true));     
     }
-?>
+?>

backup/restore_form.html

@@ -169,15 +169,16 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
     echo "<td align=\"right\"><b>";
     echo get_string("restoreto").":</b>";
     echo "</td><td colspan=\"3\">";
-    if (!has_capability('moodle/course:create', get_context_instance(CONTEXT_COURSE, $id))) {
-        $restore_restoreto_options[0] = get_string("currentcoursedeleting");
-        $restore_restoreto_options[1] = get_string("currentcourseadding");
-    } 
+    
     if (has_capability('moodle/course:create', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
         $restore_restoreto_options[0] = get_string("existingcoursedeleting");
         $restore_restoreto_options[1] = get_string("existingcourseadding");
         $restore_restoreto_options[2] = get_string("newcourse"); 
+    } else { // fix for MDL-7773
+        $restore_restoreto_options[0] = get_string("currentcoursedeleting");
+        $restore_restoreto_options[1] = get_string("currentcourseadding");
     }
+   
     choose_from_menu($restore_restoreto_options, "restore_restoreto", $restore_restoreto, "");
     echo "</td></tr>";
     if (iscreator()) {  //display these fields conditionally

backup/restorelib.php

@@ -6012,9 +6012,12 @@
         // the following code creates new roles
         // but we could use more intelligent detection, and role mapping
         // get role mapping info from $restore
+        $rolemappings = array();
 
-        $rolemappings = $restore->rolesmapping; // an array
-        if ($info->roles) {
+        if (!empty($restore->rolesmapping)) {
+            $rolemappings = $restore->rolesmapping;
+        }
+        if (isset($info->roles) && $info->roles) {
             foreach ($info->roles as $oldroleid=>$roledata) {
             
             /// first we check if the roles are in the mappings
@@ -6053,7 +6056,7 @@
             
                     // done finding a unique name
             
-                    $newroleid = create_role($roledata->name,$roledata->shortname,'');
+                    $newroleid = create_role(addslashes($roledata->name),addslashes($roledata->shortname),'');
                     $status = backup_putid($restore->backup_unique_code,"role",$oldroleid,
                                      $newroleid); // adding a new id
                     foreach ($roledata->capabilities as $capability) {
@@ -6069,7 +6072,6 @@
                 }
             }
         }
-    
         return true;
     }
     
@@ -6102,12 +6104,10 @@
         
         if (!empty($course->roleoverrides)) {
             $courseoverrides = $course->roleoverrides;
-            $rolemappings = $restore->rolesmapping;
             foreach ($courseoverrides as $oldroleid => $courseoverride) {
-            
                 // if not importing into exiting course, or creating new role, we are ok
                 // local course overrides to be respected (i.e. restored course overrides ignored)
-                if ($restore->restoreto != 1 || empty($rolemappings[$oldroleid])) {
+                if ($restore->restoreto != 1 || empty($restore->rolesmapping[$oldroleid])) {
                     restore_write_roleoverrides($restore, $courseoverride->overrides, "course", CONTEXT_COURSE, $course->course_id, $oldroleid);
                 }
             }

blocks/moodleblock.class.php

@@ -245,11 +245,6 @@ class block_base {
                 // The full treatment, please. Include the title text.
                 print_side_block($this->_title_html(), $this->content->text, NULL, NULL, $this->content->footer, $this->html_attributes(), $this->title);
             }
-            
-            //make a record of the block for the ajax course format to use
-            if (!empty($COURSE->javascriptportal)) {
-                $COURSE->javascriptportal->block_add('inst'.$this->instance->id,!$this->instance->visible);    
-            }
         }
     }
 
@@ -358,7 +353,7 @@ class block_base {
      
          // place holder for roles button
          $movebuttons .= '<a class="icon roles" title="'. $this->str->assignroles .'" href="'.$CFG->wwwroot.'/'.$CFG->admin.'/roles/assign.php?contextid='.$blockcontext->id.'">' .
-                        '<img src="'.$CFG->pixpath.'/i/roles.gif" alt="'.$this->str->assignroles.'" /></a>';
+                        '<img src="'.$CFG->pixpath.'/i/roles.gif" alt="'.$this->str->assignroles.'" height="11" width="11" border="0"/></a>';
      
         $movebuttons .= '<a class="icon hide" title="'. $title .'" href="'.$script.'&amp;blockaction=toggle">' .
                         '<img src="'. $CFG->pixpath.$icon .'" alt="'.$title.'" /></a>';
@@ -706,11 +701,6 @@ class block_list extends block_base {
                 print_side_block($this->_title_html(), '', $this->content->items, $this->content->icons, 
                                  $this->content->footer, $this->html_attributes(), $this->title);
             }
-            
-            //make a record of the block for the ajax course format to use
-            if (!empty($COURSE->javascriptportal)) {
-                $COURSE->javascriptportal->block_add('inst'.$this->instance->id,!$this->instance->visible);    
-            }
         }
     }
 

blocks/social_activities/block_social_activities.php

@@ -38,7 +38,7 @@ class block_social_activities extends block_list {
         $groupbuttons = $course->groupmode;
         $groupbuttonslink = (!$course->groupmodeforce);
         $viewhiddenactivities = has_capability('moodle/course:viewhiddenactivities', $context);
-        $manageactivities = has_capability('moodle/course:manageactivities', $context);
+        $isediting = isediting($this->instance->pageid);
         $ismoving = ismoving($this->instance->pageid);
         if ($ismoving) {
             $strmovehere = get_string('movehere');
@@ -62,7 +62,7 @@ class block_social_activities extends block_list {
                     continue;
                 }
                 $mod = $mods[$modnumber];
-                if ($manageactivities && !$ismoving) {
+                if ($isediting && !$ismoving) {
                     if ($groupbuttons) {
                         if (! $mod->groupmodelink = $groupbuttonslink) {
                             $mod->groupmode = $course->groupmode;
@@ -116,7 +116,7 @@ class block_social_activities extends block_list {
             $this->content->icons[] = '';
         }
 
-        if ($manageactivities && $modnames) {
+        if ($isediting && $modnames) {
             $this->content->footer = print_section_add_menus($course, 0, $modnames, true, true);
         } else {
             $this->content->footer = '';

blog/edit.html

@@ -37,17 +37,44 @@
     </td>
 </tr>
 <tr valign="top">
-    <td align="right">
-        <strong><?php print_string('publishto', 'blog'); ?>:</strong>
-    </td>
-    <td colspan="2">
-     <?php
-        $options = blog_applicable_publish_states(); //$blogEntry may be null
-        choose_from_menu($options, 'publishstate', $post->publishstate, '');
-     ?>
+    <td align="right"><strong>
     <?php
-        helpbutton('publish_state', get_string('helppublish', 'blog'), 'blog');
+            print_string('entrybody', 'blog');
+    ?>:
+    </strong><br /><br />
+    <small><small>
+    <?php
+        helpbutton('writing', get_string('helpwriting'), 'moodle', true, true);
+        echo '<br />';
+        if ($usehtmleditor) {
+           helpbutton('richtext', get_string('helprichtext'), 'moodle', true, true);
+        } else {
+           emoticonhelpbutton('entry', 'body');
+        }
+    ?>
+    </small></small>
+    </td>
+    <td align="left" colspan="2">
+    <?php print_textarea($usehtmleditor, 25, 62, 500, 600, 'summary', $post->summary); ?>
+    </td>
+</tr>
+<tr valign="top">
+    <td align="right"><strong><?php print_string('formattexttype'); ?>:</strong></td>
+    <td colspan="2">
+    <?php
+        if ($usehtmleditor) {   /// Trying this out for a while
+            print_string('formathtml');
+            echo '<input type="hidden" name="format" value="'.FORMAT_HTML.'" />';
+        } else {
+            choose_from_menu(format_text_menu(), 'format', $post->format, '');
+        }
      ?>
+    <small><small>
+    <?php
+        helpbutton('textformat', get_string('helpformatting'));
+     ?>
+    </small></small>
+    <?php  if (isset($errors["summary"])) formerr($errors["summary"]); ?>
     </td>
 </tr>
 <tr valign="top">
@@ -100,48 +127,18 @@
         </table>
     </td>
 </tr>
-
-
-
 <tr valign="top">
-    <td align="right"><strong>
-    <?php
-            print_string('entrybody', 'blog');
-    ?>:
-    </strong><br /><br />
-    <small><small>
-    <?php
-        helpbutton('writing', get_string('helpwriting'), 'moodle', true, true);
-        echo '<br />';
-        if ($usehtmleditor) {
-           helpbutton('richtext', get_string('helprichtext'), 'moodle', true, true);
-        } else {
-           emoticonhelpbutton('entry', 'body');
-        }
-    ?>
-    </small></small>
+    <td align="right">
+        <strong><?php print_string('publishto', 'blog'); ?>:</strong>
     </td>
-    <td align="left" colspan="2">
-    <?php print_textarea($usehtmleditor, 25, 62, 500, 600, 'summary', $post->summary); ?>
-    </td>
-</tr>
-<tr valign="top">
-    <td align="right"><strong><?php print_string('formattexttype'); ?>:</strong></td>
     <td colspan="2">
-    <?php
-        if ($usehtmleditor) {   /// Trying this out for a while
-            print_string('formathtml');
-            echo '<input type="hidden" name="format" value="'.FORMAT_HTML.'" />';
-        } else {
-            choose_from_menu(format_text_menu(), 'format', $post->format, '');
-        }
+     <?php
+        $options = blog_applicable_publish_states(); //$blogEntry may be null
+        choose_from_menu($options, 'publishstate', $post->publishstate, '');
      ?>
-    <small><small>
     <?php
-        helpbutton('textformat', get_string('helpformatting'));
+        helpbutton('publish_state', get_string('helppublish', 'blog'), 'blog');
      ?>
-    </small></small>
-    <?php  if (isset($errors["summary"])) formerr($errors["summary"]); ?>
     </td>
 </tr>
 <tr>

calendar/lib.php

@@ -1212,18 +1212,27 @@ function calendar_get_default_courses($ignoreref = false) {
     }
 
     $courses = array();
-    if(has_capability('moodle/calendar:manageentries', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
-        if(!empty($CFG->calendar_adminseesall)) {
+    if (has_capability('moodle/calendar:manageentries', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
+        if (!empty($CFG->calendar_adminseesall)) {
             $courses = get_records_sql('SELECT id, 1 FROM '.$CFG->prefix.'course');
             return $courses;
         }
     }
-    if(isset($USER->student) && is_array($USER->student)) {
-        $courses = $courses + $USER->student;
-    }
-    if(isset($USER->teacher) && is_array($USER->teacher)) {
-        $courses = $courses + $USER->teacher;
+    
+    // find all course this student can view
+    if ($allcourses = get_my_courses($USER->id,'visible DESC,sortorder ASC', '*', true)) {
+        foreach ($allcourses as $courseid=>$acourse) {
+            $context = get_context_instance(CONTEXT_COURSE, $courseid);
+            // let's try to see if there is any direct assignments on tihs context
+            if ($roleassign = get_record('role_assignments', 'contextid', $context->id, 'userid', $USER->id)) {
+                $auth = $roleassign->enrol;
+            } else {
+                $auth = '';
+            }              
+            $courses[$courseid] = $auth;           
+        }  
     }
+
     return $courses;
 }
 

course/category.php

@@ -32,12 +32,11 @@
         error("Category not known!");
     }
 
-    if (has_capability('moodle/course:create', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
+    if (has_capability('moodle/course:create', $context)) {
         if ($categoryedit !== -1) {
             $USER->categoryediting = $categoryedit;
         }
         $navbaritem = update_category_button($category->id);
-
         $creatorediting = !empty($USER->categoryediting);
         $adminediting = (has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID)) and $creatorediting);
 
@@ -51,7 +50,7 @@
     }
 
 
-    if (has_capability('moodle/category:update', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
+    if (has_capability('moodle/category:update', $context)) {
         /// Rename the category if requested
         if (!empty($rename) and confirm_sesskey()) {
             $category->name = $rename;
@@ -218,7 +217,7 @@
     if ($subcategories = get_records("course_categories", "parent", $category->id, "sortorder ASC")) {
         $firstentry = true;
         foreach ($subcategories as $subcategory) {
-            if ($subcategory->visible or has_capability('moodle/course:create', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
+            if ($subcategory->visible or has_capability('moodle/course:create', $context)) {
                 $subcategorieswereshown = true;
                 if ($firstentry) {
                     echo '<table align="center" border="0" cellspacing="2" cellpadding="4" class="generalbox">';
@@ -305,7 +304,7 @@
 
         foreach ($courses as $acourse) {
           
-            $context = get_context_instance(CONTEXT_COURSE, $acourse->id);
+            $coursecontext = get_context_instance(CONTEXT_COURSE, $acourse->id);
           
             $count++;
             $up = ($count > 1 || !$atfirstpage);
@@ -315,44 +314,46 @@
             echo '<tr>';
             echo '<td><a '.$linkcss.' href="view.php?id='.$acourse->id.'">'.$acourse->fullname.'</a></td>';
             if ($creatorediting) {
-                if ($adminediting) {
-                    echo "<td>";
+                echo "<td>";
+                if (has_capability('moodle/course:update', $coursecontext)) {
                     echo '<a title="'.$strsettings.'" href="'.$CFG->wwwroot.'/course/edit.php?id='.
                          $acourse->id.'">'.
-                         '<img src="'.$CFG->pixpath.'/t/edit.gif" height="11" width="11" border="0" alt="'.$stredit.'" /></a> ';
-                    // role assignment link     
-                    if (has_capability('moodle/role:assign', $context)) { 
-                        echo'<a title="'.get_string('assignroles', 'role').'" href="'.$CFG->wwwroot.'/'.$CFG->admin.'/roles/assign.php?contextid='.$context->id.'"><img src="'.$CFG->pixpath.'/i/roles.gif" height="11" width="11" alt="'.get_string('assignroles', 'role').'" /></a>';
-                    }                       
+                         '<img src="'.$CFG->pixpath.'/t/edit.gif" height="11" width="11" border="0" alt="'.$stredit.'" /></a> ';        }
+                
+                // role assignment link     
+                if (has_capability('moodle/role:assign', $coursecontext)) { 
+                    echo'<a title="'.get_string('assignroles', 'role').'" href="'.$CFG->wwwroot.'/'.$CFG->admin.'/roles/assign.php?contextid='.$coursecontext->id.'"><img src="'.$CFG->pixpath.'/i/roles.gif" height="11" width="11" alt="'.get_string('assignroles', 'role').'" /></a>';
+                }                       
                          
-                    if (has_capability('moodle/course:delete', $context)) {
-                        echo '<a title="'.$strdelete.'" href="delete.php?id='.$acourse->id.'">'.
-                             '<img src="'.$CFG->pixpath.'/t/delete.gif" height="11" width="11" border="0" alt="'.$strdelete.'" /></a> ';
-                    }
+                if (has_capability('moodle/course:delete', $coursecontext)) {
+                    echo '<a title="'.$strdelete.'" href="delete.php?id='.$acourse->id.'">'.
+                            '<img src="'.$CFG->pixpath.'/t/delete.gif" height="11" width="11" border="0" alt="'.$strdelete.'" /></a> ';
+                }
 
-                    if (has_capability('moodle/course:visibility', $context)) {
-                        if (!empty($acourse->visible)) {
-                            echo '<a title="'.$strhide.'" href="category.php?id='.$category->id.'&amp;page='.$page.
-                                '&amp;perpage='.$perpage.'&amp;hide='.$acourse->id.'&amp;sesskey='.$USER->sesskey.'">'.
-                                '<img src="'.$CFG->pixpath.'/t/hide.gif" height="11" width="11" border="0" alt="'.$strhide.'" /></a> ';
-                        } else {
-                            echo '<a title="'.$strshow.'" href="category.php?id='.$category->id.'&amp;page='.$page.
-                                '&amp;perpage='.$perpage.'&amp;show='.$acourse->id.'&amp;sesskey='.$USER->sesskey.'">'.
-                                '<img src="'.$CFG->pixpath.'/t/show.gif" height="11" width="11" border="0" alt="'.$strshow.'" /></a> ';
-                        }
+                if (has_capability('moodle/course:visibility', $coursecontext)) {
+                    if (!empty($acourse->visible)) {
+                        echo '<a title="'.$strhide.'" href="category.php?id='.$category->id.'&amp;page='.$page.
+                            '&amp;perpage='.$perpage.'&amp;hide='.$acourse->id.'&amp;sesskey='.$USER->sesskey.'">'.
+                            '<img src="'.$CFG->pixpath.'/t/hide.gif" height="11" width="11" border="0" alt="'.$strhide.'" /></a> ';
+                    } else {
+                        echo '<a title="'.$strshow.'" href="category.php?id='.$category->id.'&amp;page='.$page.
+                            '&amp;perpage='.$perpage.'&amp;show='.$acourse->id.'&amp;sesskey='.$USER->sesskey.'">'.
+                            '<img src="'.$CFG->pixpath.'/t/show.gif" height="11" width="11" border="0" alt="'.$strshow.'" /></a> ';
                     }
+                }
 
-                    if (has_capability('moodle/site:backup', $context)) {
-                        echo '<a title="'.$strbackup.'" href="../backup/backup.php?id='.$acourse->id.'">'.
-                             '<img src="'.$CFG->pixpath.'/t/backup.gif" height="11" width="11" border="0" alt="" /></a> ';
-                    }
+                if (has_capability('moodle/site:backup', $coursecontext)) {
+                    echo '<a title="'.$strbackup.'" href="../backup/backup.php?id='.$acourse->id.'">'.
+                            '<img src="'.$CFG->pixpath.'/t/backup.gif" height="11" width="11" border="0" alt="" /></a> ';
+                }
                     
-                    if (has_capability('moodle/site:restore', $context)) {
-                        echo '<a title="'.$strrestore.'" href="../files/index.php?id='.$acourse->id.
-                                 '&amp;wdir=/backupdata">'.
-                                 '<img src="'.$CFG->pixpath.'/t/restore.gif" height="11" width="11" border="0" alt="" /></a> ';
-                    }
+                if (has_capability('moodle/site:restore', $coursecontext)) {
+                    echo '<a title="'.$strrestore.'" href="../files/index.php?id='.$acourse->id.
+                         '&amp;wdir=/backupdata">'.
+                         '<img src="'.$CFG->pixpath.'/t/restore.gif" height="11" width="11" border="0" alt="" /></a> ';
+                }
 
+                if (has_capability('moodle/category:update', $context)) {
                     if ($up) {
                         echo '<a title="'.$strmoveup.'" href="category.php?id='.$category->id.'&amp;page='.$page.
                              '&amp;perpage='.$perpage.'&amp;moveup='.$acourse->id.'&amp;sesskey='.$USER->sesskey.'">'.
@@ -368,20 +369,13 @@
                     } else {
                         echo '<img src="'.$CFG->wwwroot.'/pix/spacer.gif" height="11" width="11" border="0" alt="" /> ';
                     }
-
-                    echo '</td>';
-                    echo '<td align="center">';
-                    echo '<input type="checkbox" name="c'.$acourse->id.'" />';
                     $abletomovecourses = true;
-
-                } else if (has_capability('moodle/course:update', get_context_instance(CONTEXT_COURSE, $acourse->id))) {
-                    echo '<td>';
-                    echo '<a title="'.$strsettings.'" href="'.$CFG->wwwroot.'/course/edit.php?id='.$acourse->id.'">'.
-                         '<img src="'.$CFG->pixpath.'/t/edit.gif" height="11" width="11" border="0" alt="'.$strsettings.'" /></a> ';
-                    echo '<a title="'.$strassignteachers.'" href="'.$CFG->wwwroot.'/course/teacher.php?id='.$acourse->id.'">'.
-                         '<img src="'.$CFG->pixpath.'/t/user.gif" height="11" width="11" border="0" alt="'.$strassignteachers.'" /></a> ';
                 }
+                
                 echo '</td>';
+                echo '<td align="center">';
+                echo '<input type="checkbox" name="c'.$acourse->id.'" />';
+                            
             } else {
                 echo '<td align="right">';
                 if (!empty($acourse->guest)) {
@@ -417,8 +411,7 @@
         echo '</form>';
         echo '<br />';
     }
-
-
+    
     echo '<center>';
     if (has_capability('moodle/category:update', get_context_instance(CONTEXT_SYSTEM, SITEID)) and $numcourses > 1) {           /// Print button to re-sort courses by name
         unset($options);
@@ -428,7 +421,6 @@
         print_single_button('category.php', $options, get_string('resortcoursesbyname'), 'get');
     }
 
-    $context = get_context_instance(CONTEXT_SYSTEM, SITEID);
     if (has_capability('moodle/course:create', $context)) {         /// Print button to create a new course
         unset($options);
         $options['category'] = $category->id;
@@ -436,7 +428,6 @@
         echo '<br />';
     }
 
-    $context = get_context_instance(CONTEXT_COURSECAT, $id);
     if (has_capability('moodle/category:update', $context)) {           /// Print form to rename the category
         $strrename= get_string('rename');
         echo '<form name="renameform" action="category.php" method="post">';

course/edit.php

@@ -42,9 +42,13 @@
         }
     } else {  // Admin is creating a new course
 
-        $context = get_context_instance(CONTEXT_SYSTEM, SITEID);
-        if (!has_capability('moodle/course:create',$context)) {
-            error("You do not currently have course creation privileges!");
+        $context = get_context_instance(CONTEXT_COURSECAT, $category);
+        // first check to see if user has site level course creation. 
+        // This is because it is possible that coursecat = 0 when an admin is adding a course
+        if (!has_capability('moodle/course:create', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
+            if (!has_capability('moodle/course:create',$context)) {
+                error("You do not currently have course creation privileges!");
+            }
         }
 
         $course = NULL;

course/enrol.php

@@ -8,12 +8,15 @@
     require_once("$CFG->dirroot/enrol/enrol.class.php");
 
     $id           = required_param('id', PARAM_INT);
-    $loginasguest = optional_param('loginasguest', 0, PARAM_BOOL);
+    $loginasguest = optional_param('loginasguest', 0, PARAM_BOOL); // hmm, is this still needed?
 
-    require_login();
-
-    if ($USER->username == 'guest') {                      // Guests can't enrol in anything!
-        redirect($CFG->wwwroot.'/login/index.php');
+    if (!isloggedin()) {
+        $wwwroot = $CFG->wwwroot;
+        if (!empty($CFG->loginhttps)) {
+            $wwwroot = str_replace('http:','https:', $wwwroot);
+        }
+        // do not use require_login here because we are usually comming from it 
+        redirect($wwwroot.'/login/index.php');
     }
 
     if (! $course = get_record('course', 'id', $id) ) {
@@ -24,9 +27,7 @@
         error("That's an invalid course id");
     }
 
-    if (! $enrol = enrolment_factory::factory($course->enrol)) {
-        error("Could not determine course enrolment method!");
-    }
+    $enrol = enrolment_factory::factory($course->enrol); // do not use if (!$enrol... here, it can not work in PHP4 - see MDL-7529 
 
 /// Refreshing all current role assignments for the current user
 
@@ -36,7 +37,7 @@
 /// thus got to this script by mistake.  This might occur if enrolments 
 /// changed during this session or something
 
-    if (has_capability('moodle/course:view', $context) and !has_capability('moodle/legacy:guest', $context)) {
+    if (has_capability('moodle/course:view', $context) and !has_capability('moodle/legacy:guest', $context, NULL, false)) {
         if ($SESSION->wantsurl) {
             $destination = $SESSION->wantsurl;
             unset($SESSION->wantsurl);

course/format/weeks/format.php

@@ -173,7 +173,8 @@
             echo '<tr id="section-'.$section.'" class="section main'.$sectionstyle.'">';
             echo '<td class="left side">&nbsp;</td>';
 
-            if (!empty($USER->ajax) && $editing) {
+
+            if (ajaxenabled() && $editing) {
                 // Temporarily hide the dates for the weeks. We do it this way
                 // for now. Eventually, we'll have to modify the javascript code
                 // to handle re-calculation of dates when sections are moved
@@ -183,6 +184,7 @@
                 $weekperiod = $weekday.' '.$endweekday;
             }
 
+
             echo '<td class="content">';
             if (!has_capability('moodle/course:viewhiddensections', $context) and !$thissection->visible) {   // Hidden for students
                 echo '<div class="weekdates">'.$weekperiod.' ('.get_string('notavailable').')</div>';

course/importstudents.php

@@ -110,13 +110,12 @@
 
 /// If no search results then get potential students for this course excluding users already in course
     if (empty($searchcourses)) {
+        $numcourses = count_courses_notin_metacourse($course->id);
 
-        $numcourses = get_courses_notin_metacourse($course->id,true);
-
-        $courses = array();
-
-        if ($numcourses <= MAX_COURSES_PER_PAGE) {
+        if ($numcourses > 0 and $numcourses <= MAX_COURSES_PER_PAGE) {
             $courses = get_courses_notin_metacourse($course->id);
+        } else {
+            $courses = array();
         }
     }
 

course/lib.php

@@ -532,7 +532,8 @@ function print_log_xls($course, $user, $date, $order='l.time DESC', $modname,
                        $modname, $modid, $modaction, $groupid)) {
         return false;
     }
-    
+
+    $courses = array();
     if ($course->id == SITEID) {
         $courses[0] = '';
         if ($ccc = get_courses('all', 'c.id ASC', 'c.id,c.shortname')) {
@@ -540,6 +541,8 @@ function print_log_xls($course, $user, $date, $order='l.time DESC', $modname,
                 $courses[$cc->id] = $cc->shortname;
             }
         }
+    } else {
+        $courses[$course->id] = $course->shortname;
     }
     
     $count=0;
@@ -1027,15 +1030,13 @@ function get_all_sections($courseid) {
 function course_set_display($courseid, $display=0) {
     global $USER;
 
-    if (empty($USER->id)) {
-        return false;
-    }
-
     if ($display == "all" or empty($display)) {
         $display = 0;
     }
 
-    if (record_exists("course_display", "userid", $USER->id, "course", $courseid)) {
+    if (empty($USER->id) or $USER->username == 'guest') {
+        //do not store settings in db for guests
+    } else if (record_exists("course_display", "userid", $USER->id, "course", $courseid)) {
         set_field("course_display", "display", $display, "userid", $USER->id, "course", $courseid);
     } else {
         $record->userid = $USER->id;
@@ -1556,7 +1557,7 @@ function print_course($course, $width="100%") {
         $namesarray = array();
         foreach ($teachers as $teacher) {
             if (!$teacher->hidden || $canseehidden) {
-                $roles = get_user_roles($context, $teacher->id);
+                $roles = get_user_roles($context, $teacher->id, true, 'r.sortorder ASC');
                 $role = array_shift($roles);  // First one
                 $fullname = fullname($teacher, has_capability('moodle/site:viewfullnames', $context));
                 $namesarray[] = format_string($role->name).': <a href="'.$CFG->wwwroot.'/user/view.php?id='.
@@ -1882,16 +1883,16 @@ function make_editing_buttons($mod, $absolute=false, $moveselect=true, $indent=-
     static $sesskey;
 
     if (!isset($str)) {
-        $str->delete    = get_string("delete");
-        $str->move      = get_string("move");
-        $str->moveup    = get_string("moveup");
-        $str->movedown  = get_string("movedown");
-        $str->moveright = get_string("moveright");
-        $str->moveleft  = get_string("moveleft");
-        $str->update    = get_string("update");
-        $str->duplicate    = get_string("duplicate");
-        $str->hide      = get_string("hide");
-        $str->show      = get_string("show");
+        $str->delete         = get_string("delete");
+        $str->move           = get_string("move");
+        $str->moveup         = get_string("moveup");
+        $str->movedown       = get_string("movedown");
+        $str->moveright      = get_string("moveright");
+        $str->moveleft       = get_string("moveleft");
+        $str->update         = get_string("update");
+        $str->duplicate      = get_string("duplicate");
+        $str->hide           = get_string("hide");
+        $str->show           = get_string("show");
         $str->clicktochange  = get_string("clicktochange");
         $str->forcedmode     = get_string("forcedmode");
         $str->groupsnone     = get_string("groupsnone");
@@ -1913,32 +1914,35 @@ function make_editing_buttons($mod, $absolute=false, $moveselect=true, $indent=-
     }
 
     if ($mod->visible) {
-        $hideshow = '<a title="'.$str->hide.'" href="'.$path.'/mod.php?hide='.$mod->id.
+        $hideshow = '<a class="editing_hide" title="'.$str->hide.'" href="'.$path.'/mod.php?hide='.$mod->id.
                     '&amp;sesskey='.$sesskey.$section.'"><img'.
                     ' src="'.$CFG->pixpath.'/t/hide.gif" hspace="2" height="11" width="11" '.
-                    ' border="0" alt="'.$str->hide.'" /></a> ';
+                    ' border="0" alt="'.$str->hide.'" /></a>'."\n";
     } else {
-        $hideshow = '<a title="'.$str->show.'" href="'.$path.'/mod.php?show='.$mod->id.
+        $hideshow = '<a class="editing_show" title="'.$str->show.'" href="'.$path.'/mod.php?show='.$mod->id.
                     '&amp;sesskey='.$sesskey.$section.'"><img'.
                     ' src="'.$CFG->pixpath.'/t/show.gif" hspace="2" height="11" width="11" '.
-                    ' border="0" alt="'.$str->show.'" /></a> ';
+                    ' border="0" alt="'.$str->show.'" /></a>'."\n";
     }
     if ($mod->groupmode !== false) {
         if ($mod->groupmode == SEPARATEGROUPS) {
             $grouptitle = $str->groupsseparate;
+            $groupclass = 'editing_groupseparate';
             $groupimage = $CFG->pixpath.'/t/groups.gif';
             $grouplink  = $path.'/mod.php?id='.$mod->id.'&amp;groupmode=0&amp;sesskey='.$sesskey;
         } else if ($mod->groupmode == VISIBLEGROUPS) {
             $grouptitle = $str->groupsvisible;
+            $groupclass = 'editing_groupvisible';
             $groupimage = $CFG->pixpath.'/t/groupv.gif';
             $grouplink  = $path.'/mod.php?id='.$mod->id.'&amp;groupmode=1&amp;sesskey='.$sesskey;
         } else {
             $grouptitle = $str->groupsnone;
+            $groupclass = 'editing_groupsnone';
             $groupimage = $CFG->pixpath.'/t/groupn.gif';
             $grouplink  = $path.'/mod.php?id='.$mod->id.'&amp;groupmode=2&amp;sesskey='.$sesskey;
         }
         if ($mod->groupmodelink) {
-            $groupmode = '<a title="'.$grouptitle.' ('.$str->clicktochange.')" href="'.$grouplink.'">'.
+            $groupmode = '<a class="'.$groupclass.'" title="'.$grouptitle.' ('.$str->clicktochange.')" href="'.$grouplink.'">'.
                          '<img src="'.$groupimage.'" hspace="2" height="11" width="11" '.
                          'border="0" alt="'.$grouptitle.'" /></a>';
         } else {
@@ -1951,44 +1955,44 @@ function make_editing_buttons($mod, $absolute=false, $moveselect=true, $indent=-
     }
 
     if ($moveselect) {
-        $move =     '<a title="'.$str->move.'" href="'.$path.'/mod.php?copy='.$mod->id.
+        $move =     '<a class="editing_move" title="'.$str->move.'" href="'.$path.'/mod.php?copy='.$mod->id.
                     '&amp;sesskey='.$sesskey.$section.'"><img'.
                     ' src="'.$CFG->pixpath.'/t/move.gif" hspace="2" height="11" width="11" '.
-                    ' border="0" alt="'.$str->move.'" /></a>';
+                    ' border="0" alt="'.$str->move.'" /></a>'."\n";
     } else {
-        $move =     '<a title="'.$str->moveup.'" href="'.$path.'/mod.php?id='.$mod->id.
+        $move =     '<a class="editing_moveup" title="'.$str->moveup.'" href="'.$path.'/mod.php?id='.$mod->id.
                     '&amp;move=-1&amp;sesskey='.$sesskey.$section.'"><img'.
                     ' src="'.$CFG->pixpath.'/t/up.gif" hspace="2" height="11" width="11" '.
-                    ' border="0" alt="'.$str->moveup.'" /></a>'.
-                    '<a title="'.$str->movedown.'" href="'.$path.'/mod.php?id='.$mod->id.
+                    ' border="0" alt="'.$str->moveup.'" /></a>'."\n".
+                    '<a class="editing_movedown" title="'.$str->movedown.'" href="'.$path.'/mod.php?id='.$mod->id.
                     '&amp;move=1&amp;sesskey='.$sesskey.$section.'"><img'.
                     ' src="'.$CFG->pixpath.'/t/down.gif" hspace="2" height="11" width="11" '.
-                    ' border="0" alt="'.$str->movedown.'" /></a>';
+                    ' border="0" alt="'.$str->movedown.'" /></a>'."\n";
     }
 
     $leftright = "";
     if ($indent > 0) {
-        $leftright .= '<a title="'.$str->moveleft.'" href="'.$path.'/mod.php?id='.$mod->id.
+        $leftright .= '<a class="editing_moveleft" title="'.$str->moveleft.'" href="'.$path.'/mod.php?id='.$mod->id.
                       '&amp;indent=-1&amp;sesskey='.$sesskey.$section.'"><img'.
                       ' src="'.$CFG->pixpath.'/t/left.gif" hspace="2" height="11" width="11" '.
-                      ' border="0" alt="'.$str->moveleft.'" /></a>';
+                      ' border="0" alt="'.$str->moveleft.'" /></a>'."\n";
     }
     if ($indent >= 0) {
-        $leftright .= '<a title="'.$str->moveright.'" href="'.$path.'/mod.php?id='.$mod->id.
+        $leftright .= '<a class="editing_moveright" title="'.$str->moveright.'" href="'.$path.'/mod.php?id='.$mod->id.
                       '&amp;indent=1&amp;sesskey='.$sesskey.$section.'"><img'.
                       ' src="'.$CFG->pixpath.'/t/right.gif" hspace="2" height="11" width="11" '.
-                      ' border="0" alt="'.$str->moveright.'" /></a>';
+                      ' border="0" alt="'.$str->moveright.'" /></a>'."\n";
     }
 
-    return '<span class="commands">'.$leftright.$move.
-           '<a title="'.$str->update.'" href="'.$path.'/mod.php?update='.$mod->id.
+    return '<span class="commands">'."\n".$leftright.$move.
+           '<a class="editing_update" title="'.$str->update.'" href="'.$path.'/mod.php?update='.$mod->id.
            '&amp;sesskey='.$sesskey.$section.'"><img'.
            ' src="'.$CFG->pixpath.'/t/edit.gif" hspace="2" height="11" width="11" border="0" '.
-           ' alt="'.$str->update.'" /></a>'.
-           '<a title="'.$str->delete.'" href="'.$path.'/mod.php?delete='.$mod->id.
+           ' alt="'.$str->update.'" /></a>'."\n".
+           '<a class="editing_delete" title="'.$str->delete.'" href="'.$path.'/mod.php?delete='.$mod->id.
            '&amp;sesskey='.$sesskey.$section.'"><img'.
            ' src="'.$CFG->pixpath.'/t/delete.gif" hspace="2" height="11" width="11" border="0" '.
-           ' alt="'.$str->delete.'" /></a>'.$hideshow.$groupmode.'</span>';
+           ' alt="'.$str->delete.'" /></a>'."\n".$hideshow.$groupmode."\n".'</span>';
 }
 
 /**

course/rest.php

@@ -6,11 +6,10 @@ require_once($CFG->dirroot.'/course/lib.php');
 require_once($CFG->libdir .'/pagelib.php');
 require_once($CFG->libdir .'/blocklib.php');
 
+
 // Initialise ALL the incoming parameters here, up front.
-
-$courseid = required_param('courseId', PARAM_INT);
-$class    = required_param('class', PARAM_ALPHA);
-
+$courseid   = required_param('courseId', PARAM_INT);
+$class      = required_param('class', PARAM_ALPHA);
 $field      = optional_param('field', '', PARAM_ALPHA);
 $instanceid = optional_param('instanceId', 0, PARAM_INT);
 $sectionid  = optional_param('sectionId', 0, PARAM_INT);
@@ -22,46 +21,51 @@ $summary    = optional_param('summary', '', PARAM_RAW);
 $sequence   = optional_param('sequence', '', PARAM_SEQUENCE);
 $visible    = optional_param('visible', 0, PARAM_INT);
 
-// Authorise the user and verify some incoming data
 
+// Authorise the user and verify some incoming data
 if (!$course = get_record('course', 'id', $courseid)) {
     error_log('AJAX commands.php: Course does not exist');
     die;
 }
 
 $PAGE = page_create_object(PAGE_COURSE_VIEW, $course->id);
-$pageblocks = blocks_setup($PAGE,BLOCKS_PINNED_BOTH);
+$pageblocks = blocks_setup($PAGE, BLOCKS_PINNED_BOTH);
+
 if (!empty($instanceid)) {
     $blockinstance = blocks_find_instance($instanceid, $pageblocks);
-    if (!$blockinstance || $blockinstance->pageid != $course->id || $blockinstance->pagetype != 'course-view') {
+    if (!$blockinstance || $blockinstance->pageid != $course->id
+                        || $blockinstance->pagetype != 'course-view') {
         error_log('AJAX commands.php: Bad block ID '.$instanceid);
         die;
     }
 }
 
 $context = get_context_instance(CONTEXT_COURSE, $course->id);
-
 require_login($course->id);
 require_capability('moodle/course:update', $context);
 
-// OK, now let's process the parameters and do stuff
 
+
+// OK, now let's process the parameters and do stuff
 switch($_SERVER['REQUEST_METHOD']) {
     case 'POST':
+
         switch ($class) {
-            case 'block':                  
-            switch ($field) {
-                case 'visible':   
-                    blocks_execute_action($PAGE, $pageblocks, 'toggle', $blockinstance);
-                    break;
-     
-                case 'position':  
-                    //while not entirely restful this will handle all the details of moving a block                    
-                    blocks_execute_repositioning_atomic($blockinstance, $column, $value);                    
-                    break;
-            }
-            break;
- 
+            case 'block':
+
+                switch ($field) {
+                    case 'visible':   
+                        blocks_execute_action($PAGE, $pageblocks, 'toggle', $blockinstance);
+                        break;
+
+                    case 'position':  // Misleading case. Should probably call it 'move'.
+                        // We want to move the block around. This means changing
+                        // the column (position field) and/or block sort order
+                        // (weight field).
+                        blocks_move_block($PAGE, $blockinstance, $column, $value);
+                        break;
+                }
+                break;
 
             case 'section':
  
@@ -95,6 +99,18 @@ switch($_SERVER['REQUEST_METHOD']) {
                         set_coursemodule_groupmode($mod->id, $value);
                         break;
 
+                    case 'indentleft':
+                        if ($mod->indent > 0) {
+                            $mod->indent--;
+                            update_record('course_modules', $mod);
+                        }
+                        break;
+
+                    case 'indentright':
+                        $mod->indent++;
+                        update_record('course_modules', $mod);
+                        break;
+
                     case 'move':
                         if (!$section = get_record('course_sections','course',$course->id,'section',$sectionid)) {
                             error_log('AJAX commands.php: Bad section ID '.$sectionid);

course/search.php

@@ -163,14 +163,25 @@
             echo "<th>$strcategory</th>";
             echo "<th>$strselect</th>";
             echo "<th>$stredit</th>";
-            foreach ($courses as $course) {
+            foreach ($courses as $course) {    		    
+                
+                $coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);
+                
                 $course->fullname = highlight("$search", $course->fullname);
                 $linkcss = $course->visible ? "" : " class=\"dimmed\" ";
                 echo "<tr>";
                 echo "<td><a $linkcss href=\"view.php?id=$course->id\">$course->fullname</a></td>";
                 echo "<td>".$displaylist[$course->category]."</td>";
                 echo "<td align=\"center\">";
-                echo "<input type=\"checkbox\" name=\"c$course->id\">";
+                
+                // this is ok since this will get inherited from course category context
+                // if it is set
+                if (has_capability('moodle/category:update', $coursecontext)) {
+                    echo "<input type=\"checkbox\" name=\"c$course->id\">";
+                } else {
+                    echo "<input type=\"checkbox\" name=\"c$course->id\" disabled=\"disabled\">";
+                }
+                
                 echo "</td>";
                 echo "<td>";
                 if (empty($THEME->custompix)) {
@@ -178,25 +189,48 @@
                 } else {
                     $pixpath = "$CFG->themedir/$CFG->theme/pix";
                 }
-                echo "<a title=\"".get_string("settings")."\" href=\"$CFG->wwwroot/course/edit.php?id=$course->id\"><img".
-                    " src=\"$pixpath/t/edit.gif\" height=\"11\" width=\"11\" border=\"0\"></a> ";
-                echo "<a title=\"".get_string("assignteachers")."\" href=\"$CFG->wwwroot/course/teacher.php?id=$course->id\"><img".
-                    " src=\"$pixpath/t/user.gif\" height=\"11\" width=\"11\" border=\"0\"></a> ";
-                echo "<a title=\"".get_string("delete")."\" href=\"delete.php?id=$course->id\"><img".
-                    " src=\"$pixpath/t/delete.gif\" height=\"11\" width=\"11\" border=\"0\"></a> ";
-                if (!empty($course->visible)) {
-                    echo "<a title=\"".get_string("hide")."\" href=\"search.php?search=$encodedsearch&amp;perpage=$perpage&amp;page=$page&amp;hide=$course->id&amp;sesskey=$USER->sesskey\"><img".
-                        " src=\"$pixpath/t/hide.gif\" height=\"11\" width=\"11\" border=\"0\"></a> ";
-                } else {
-                    echo "<a title=\"".get_string("show")."\" href=\"search.php?search=$encodedsearch&amp;perpage=$perpage&amp;page=$page&amp;show=$course->id&amp;sesskey=$USER->sesskey\"><img".
-                        " src=\"$pixpath/t/show.gif\" height=\"11\" width=\"11\" border=\"0\"></a> ";
+                
+                // checks whether user can update course settings
+                if (has_capability('moodle/course:update', $coursecontext)) {
+                    echo "<a title=\"".get_string("settings")."\" href=\"$CFG->wwwroot/course/edit.php?id=$course->id\"><img".
+                        " src=\"$pixpath/t/edit.gif\" height=\"11\" width=\"11\" border=\"0\"></a> ";
+                }
+
+                // checks whether user can do role assignment
+    		    if (has_capability('moodle/role:assign', $coursecontext)) {
+                    echo'<a title="'.get_string('assignroles', 'role').'" href="'.$CFG->wwwroot.'/'.$CFG->admin.'/roles/assign.php?contextid='.$coursecontext->id.'">';
+    		        echo '<img src="'.$CFG->pixpath.'/i/roles.gif" height="11" width="11" alt="'.get_string('assignroles', 'role').'" /></a>';
+    		    }                
+
+                // checks whether user can delete course
+                if (has_capability('moodle/course:delete', $coursecontext)) {  
+                    echo "<a title=\"".get_string("delete")."\" href=\"delete.php?id=$course->id\"><img".
+                        " src=\"$pixpath/t/delete.gif\" height=\"11\" width=\"11\" border=\"0\"></a> ";
+                }  
+
+                // checks whether user can change visibility
+                if (has_capability('moodle/course:visibility', $coursecontext)) {
+                    if (!empty($course->visible)) {
+                        echo "<a title=\"".get_string("hide")."\" href=\"search.php?search=$encodedsearch&amp;perpage=$perpage&amp;page=$page&amp;hide=$course->id&amp;sesskey=$USER->sesskey\"><img".
+                            " src=\"$pixpath/t/hide.gif\" height=\"11\" width=\"11\" border=\"0\"></a> ";
+                    } else {
+                        echo "<a title=\"".get_string("show")."\" href=\"search.php?search=$encodedsearch&amp;perpage=$perpage&amp;page=$page&amp;show=$course->id&amp;sesskey=$USER->sesskey\"><img".
+                            " src=\"$pixpath/t/show.gif\" height=\"11\" width=\"11\" border=\"0\"></a> ";
+                    }
+                }              
+
+                // checks whether user can do site backup
+                if (has_capability('moodle/site:backup', $coursecontext)) {
+                    echo "<a title=\"".get_string("backup")."\" href=\"../backup/backup.php?id=$course->id\"><img".
+                        " src=\"$pixpath/t/backup.gif\" height=\"11\" width=\"11\" border=\"0\"></a> ";
                 }
                 
-                echo "<a title=\"".get_string("backup")."\" href=\"../backup/backup.php?id=$course->id\"><img".
-                    " src=\"$pixpath/t/backup.gif\" height=\"11\" width=\"11\" border=\"0\"></a> ";
-                
-                echo "<a title=\"".get_string("restore")."\" href=\"../files/index.php?id=$course->id&wdir=/backupdata\"><img".
-                    " src=\"$pixpath/t/restore.gif\" height=\"11\" width=\"11\" border=\"0\"></a> ";
+                // checks whether user can do restore
+                if (has_capability('moodle/site:restore', $coursecontext)) {
+                    echo "<a title=\"".get_string("restore")."\" href=\"../files/index.php?id=$course->id&wdir=/backupdata\"><img".
+                        " src=\"$pixpath/t/restore.gif\" height=\"11\" width=\"11\" border=\"0\"></a> ";
+                }
+
                 echo "</td></tr>";
             }
             echo "<tr><td colspan=\"4\" align=\"center\">";

enrol/authorize/authorizenetlib.php

@@ -97,21 +97,22 @@ function authorize_action(&$order, &$message, &$extra, $action=AN_ACTION_NONE, $
     static $conststring;
 
     if (!isset($conststring)) {
+        $mconfig = get_config('enrol/authorize');
         $constdata = array(
              'x_version'         => '3.1',
              'x_delim_data'      => 'True',
              'x_delim_char'      => AN_DELIM,
              'x_encap_char'      => AN_ENCAP,
              'x_relay_response'  => 'FALSE',
-             'x_login'           => $CFG->an_login
+             'x_login'           => rc4decrypt($mconfig->an_login)
         );
         $str = '';
         foreach($constdata as $ky => $vl) {
             $str .= $ky . '=' . urlencode($vl) . '&';
         }
-        $str .= (!empty($CFG->an_tran_key)) ?
-                'x_tran_key=' . urlencode($CFG->an_tran_key):
-                'x_password=' . urlencode($CFG->an_password);
+        $str .= (!empty($mconfig->an_tran_key)) ?
+                'x_tran_key=' . urlencode(rc4decrypt($mconfig->an_tran_key)):
+                'x_password=' . urlencode(rc4decrypt($mconfig->an_password));
 
         $conststring = $str;
         $str = '';
@@ -133,8 +134,8 @@ function authorize_action(&$order, &$message, &$extra, $action=AN_ACTION_NONE, $
 
     $action = intval($action);
     if ($method == AN_METHOD_ECHECK) {
-        if ($action != AN_ACTION_AUTH_CAPTURE /*&& $action != AN_ACTION_CREDIT*/) {
-            $message = "Please perform only AUTH_CAPTURE for echecks";
+        if ($action != AN_ACTION_AUTH_CAPTURE && $action != AN_ACTION_CREDIT) {
+            $message = "Please perform AUTH_CAPTURE or CREDIT for echecks";
             return AN_RETURNZERO;
         }
     }
@@ -222,7 +223,11 @@ function authorize_action(&$order, &$message, &$extra, $action=AN_ACTION_NONE, $
             $poststring .= '&x_invoice_num=' . urlencode($extra->orderid);
             $poststring .= '&x_amount=' . urlencode($extra->amount);
             if ($method == AN_METHOD_CC) {
-                $poststring .= '&x_card_num=' . sprintf("%04d", intval($order->cclastfour));
+                $poststring .= '&x_card_num=' . sprintf("%04d", intval($order->refundinfo));
+            }
+            elseif ($method == AN_METHOD_ECHECK && empty($order->refundinfo)) {
+                $message = "Business checkings can be refunded only.";
+                return AN_RETURNZERO;
             }
             break;
         }
@@ -248,6 +253,7 @@ function authorize_action(&$order, &$message, &$extra, $action=AN_ACTION_NONE, $
         $referer = "Referer: $CFG->an_referer\r\n";
     }
 
+    $errno = 0; $errstr = '';
     $host = $test ? 'certification.authorize.net' : 'secure.authorize.net';
     $fp = fsockopen("ssl://$host", 443, $errno, $errstr, 60);
     if (!$fp) {

enrol/authorize/config.html

@@ -83,37 +83,34 @@ if (!isset($frm->acceptechecktypes)) {
 <tr valign="top"><td colspan="2"><h4><?php print_string("adminauthorizesettings", "enrol_authorize") ?></h4></td></tr>
 
 <tr valign="top">
-    <td align="right">an_login:</td>
-    <td><input type="text" name="an_login" value="<?php p($frm->an_login) ?>" /><br />
-        <?php print_string("anlogin", "enrol_authorize") ?></td>
+    <td align="right">&nbsp;&nbsp;</td>
+    <td><?php print_string("logininfo", "enrol_authorize") ?></td>
 </tr>
 
 <tr valign="top">
-    <td align="right">#&nbsp;#&nbsp;</td>
-    <td><?php print_string("chooseone", "enrol_authorize") ?></td>
+    <td align="right">an_login:<br /><?php echo (isset($mconfig->an_login)) ? '<font color=green>'.get_string('ok').'</font>' : ''; ?></td>
+    <td><?php print_string("anlogin", "enrol_authorize") ?><br /><input type="text" name="an_login" size="26" value="" /><sup>*</sup></td>
 </tr>
 
 <tr valign="top">
-    <td align="right">an_tran_key:</td>
-    <td><input type="text" name="an_tran_key" value="<?php p($frm->an_tran_key) ?>" /><sup>#1</sup><br />
-        <?php print_string("antrankey", "enrol_authorize") ?></td>
+    <td align="right">an_tran_key:<br /><?php echo (isset($mconfig->an_tran_key)) ? '<font color=green>'.get_string('ok').'</font>' : ''; ?></td>
+    <td><?php print_string("antrankey", "enrol_authorize") ?><br /><input type="text" name="an_tran_key" size="26" value="" /><sup>#1</sup></td>
 </tr>
 
 <tr valign="top">
-    <td align="right">an_password:</td>
-    <td><input type="text" name="an_password" value="" /><sup>#2</sup><br />
-        <?php print_string("anpassword", "enrol_authorize") ?><br />(<?php print_string("leavetokeep") ?>)</td>
+    <td align="right">an_password:<br /><?php echo (isset($mconfig->an_password)) ? '<font color=green>'.get_string('ok').'</font>' : ''; ?></td>
+    <td><?php print_string("anpassword", "enrol_authorize") ?><br /><input type="text" name="an_password" size="26" value="" /><sup>#2</sup></td>
 </tr>
 
 <tr valign="top">
     <td align="right">delete_current:</td>
     <td><?php print_checkbox('delete_current', '1', !empty($frm->delete_current)) ?> <br />
-        <?php print_string("deletecheck", "moodle", get_string('oldpassword')) ?><br /><br /></td>
+        <?php print_string("deletecheck", "moodle", get_string('oldpassword')) ?><br /><hr size="1" width="100%" noshade /></td>
 </tr>
 
 <tr valign="top">
     <td align="right">an_referer:</td>
-    <td><input type="text" name="an_referer" value="<?php p($frm->an_referer) ?>" /><br />
+    <td><input type="text" name="an_referer" size="35" value="<?php p($frm->an_referer) ?>" /><br />
         <?php print_string("anreferer", "enrol_authorize") ?></td>
 </tr>
 

enrol/authorize/db/install.xml

@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<XMLDB PATH="enrol/authorize/db" VERSION="20060809" COMMENT="XMLDB file for Moodle enrol/authorize">
+<XMLDB PATH="enrol/authorize/db" VERSION="20061117" COMMENT="XMLDB file for Moodle enrol/authorize"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="../../../lib/xmldb/xmldb.xsd"
+>
   <TABLES>
     <TABLE NAME="enrol_authorize" COMMENT="Holds all known information about authorize.net transactions" NEXT="enrol_authorize_refunds">
       <FIELDS>
         <FIELD NAME="id" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" SEQUENCE="true" ENUM="false" NEXT="paymentmethod"/>
-        <FIELD NAME="paymentmethod" TYPE="char" LENGTH="6" NOTNULL="true" DEFAULT="cc" SEQUENCE="false" ENUM="true" ENUMVALUES="'cc', 'echeck'" PREVIOUS="id" NEXT="cclastfour"/>
-        <FIELD NAME="cclastfour" TYPE="int" LENGTH="4" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="paymentmethod" NEXT="ccname"/>
-        <FIELD NAME="ccname" TYPE="char" LENGTH="255" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="cclastfour" NEXT="courseid"/>
+        <FIELD NAME="paymentmethod" TYPE="char" LENGTH="6" NOTNULL="true" DEFAULT="cc" SEQUENCE="false" ENUM="true" ENUMVALUES="'cc', 'echeck'" PREVIOUS="id" NEXT="refundinfo"/>
+        <FIELD NAME="refundinfo" TYPE="int" LENGTH="4" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="paymentmethod" NEXT="ccname"/>
+        <FIELD NAME="ccname" TYPE="char" LENGTH="255" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="refundinfo" NEXT="courseid"/>
         <FIELD NAME="courseid" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="ccname" NEXT="userid"/>
         <FIELD NAME="userid" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="courseid" NEXT="transid"/>
         <FIELD NAME="transid" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="userid" NEXT="status"/>

enrol/authorize/db/upgrade.php

@@ -23,14 +23,41 @@ function xmldb_enrol_authorize_upgrade($oldversion=0) {
 
     $result = true;
 
-/// And upgrade begins here. For each one, you'll need one 
-/// block of code similar to the next one. Please, delete 
-/// this comment lines once this file start handling proper
-/// upgrade code.
+    if ($result && $oldversion < 2006101701) {
+        $table = new XMLDBTable('enrol_authorize');
+        if (!field_exists($table, new XMLDBField('refundinfo'))) {
+            $field = new XMLDBField('cclastfour');
+            $field->setAttributes(XMLDB_TYPE_INTEGER, '4', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, '0', 'paymentmethod');
+            $result = $result && rename_field($table, $field, 'refundinfo');
+        }
+    }
 
-/// if ($result && $oldversion < YYYYMMDD00) { //New version in version.php
-///     $result = result of "/lib/ddllib.php" function calls
-/// }
+    if ($result && $oldversion < 2006101702) {
+        if (isset($CFG->an_login)) {
+            if (empty($CFG->an_login)) {
+            	unset_config('an_login');
+            }
+            else {
+            	$result = $result && set_config('an_login', rc4encrypt($CFG->an_login), 'enrol/authorize') && unset_config('an_login');
+            }
+        }
+        if (isset($CFG->an_tran_key)) {
+            if (empty($CFG->an_tran_key)) {
+            	unset_config('an_tran_key');
+            }
+            else {
+            	$result = $result && set_config('an_tran_key', rc4encrypt($CFG->an_tran_key), 'enrol/authorize') && unset_config('an_tran_key');
+            }
+        }
+        if (isset($CFG->an_password)) {
+            if (empty($CFG->an_password)) {
+            	unset_config('an_password');
+            }
+            else {
+                $result = $result && set_config('an_password', rc4encrypt($CFG->an_password), 'enrol/authorize') && unset_config('an_password');
+            }
+        }
+    }
 
     return $result;
 }

enrol/authorize/enrol.html

@@ -33,7 +33,7 @@ function print_cc_form($classreference)
 
     $formvars = array(
         'ccaddress', 'cccity', 'ccstate', 'cccountry', 'cczip',
-        'ccfirstname', 'cclastname', 'cc', 'ccexpiremm', 'ccexpireyyyy', 'cctype', 'cvv'
+        'firstname', 'lastname', 'cc', 'ccexpiremm', 'ccexpireyyyy', 'cctype', 'cvv'
     );
     foreach ($formvars as $var) {
         if (!isset($form->$var)) {
@@ -42,8 +42,8 @@ function print_cc_form($classreference)
     }
 
     $curcost = get_course_cost($course);
-    $userfirstname = empty($form->ccfirstname) ? $USER->firstname : $form->ccfirstname;
-    $userlastname = empty($form->cclastname) ? $USER->lastname : $form->cclastname;
+    $userfirstname = empty($form->firstname) ? $USER->firstname : $form->firstname;
+    $userlastname = empty($form->lastname) ? $USER->lastname : $form->lastname;
     $useraddress = empty($form->ccaddress) ? $USER->address : $form->ccaddress;
     $usercity = empty($form->cccity) ? $USER->city : $form->cccity;
     $usercountry = empty($form->cccountry) ? $USER->country : $form->cccountry;
@@ -68,8 +68,8 @@ function print_cc_form($classreference)
     </tr>
     <tr>
       <td align="right"><?php print_string("nameoncard", "enrol_authorize") ?>: </td>
-      <td align="left"><input type="text" name="ccfirstname" size="8" value="<?php p($userfirstname) ?>" />
-      <input type="text" name="cclastname" size="8" value="<?php p($userlastname) ?>" />
+      <td align="left"><input type="text" name="firstname" size="8" value="<?php p($userfirstname) ?>" />
+      <input type="text" name="lastname" size="8" value="<?php p($userlastname) ?>" />
       <?php if (!empty($classreference->authorizeerrors['ccfirstlast'])) { formerr($classreference->authorizeerrors['ccfirstlast']); } ?></td>
     </tr>
     <tr>

enrol/authorize/enrol.php

@@ -70,7 +70,7 @@ class enrolment_plugin_authorize
         }
 
         print_simple_box_start('center');
-        if (has_capability('moodle/legacy:guest', get_context_instance(CONTEXT_SYSTEM), $USER->id, false)) {
+        if ($USER->username == 'guest') { // only real guest user, not for users with guest role
             $curcost = get_course_cost($course);
             echo '<div align="center">';
             echo '<p>'.get_string('paymentrequired').'</p>';
@@ -143,8 +143,8 @@ class enrolment_plugin_authorize
         $timenow = time();
         $order = new stdClass();
         $order->paymentmethod = AN_METHOD_CC;
-        $order->cclastfour = substr($form->cc, -4);
-        $order->ccname = $form->ccfirstname . " " . $form->cclastname;
+        $order->refundinfo = substr($form->cc, -4);
+        $order->ccname = $form->firstname . " " . $form->lastname;
         $order->courseid = $course->id;
         $order->userid = $USER->id;
         $order->status = AN_STATUS_NONE; // it will be changed...
@@ -166,8 +166,8 @@ class enrolment_plugin_authorize
         $extra->x_exp_date = $exp_date;
         $extra->x_currency_code = $curcost['currency'];
         $extra->x_amount = $curcost['cost'];
-        $extra->x_first_name = $form->ccfirstname;
-        $extra->x_last_name = $form->cclastname;
+        $extra->x_first_name = $form->firstname;
+        $extra->x_last_name = $form->lastname;
         $extra->x_country = $form->cccountry;
         $extra->x_address = $form->ccaddress;
         $extra->x_state = $form->ccstate;
@@ -290,12 +290,13 @@ class enrolment_plugin_authorize
 
         $useripno = getremoteaddr();
         $curcost = get_course_cost($course);
+        $isbusinesschecking = ($form->acctype == 'BUSINESSCHECKING');
 
         // NEW ECHECK ORDER
         $timenow = time();
         $order = new stdClass();
         $order->paymentmethod = AN_METHOD_ECHECK;
-        $order->cclastfour = 0;
+        $order->refundinfo = $isbusinesschecking ? 1 : 0;
         $order->ccname = $form->firstname . ' ' . $form->lastname;
         $order->courseid = $course->id;
         $order->userid = $USER->id;
@@ -316,7 +317,7 @@ class enrolment_plugin_authorize
         $extra->x_bank_aba_code = $form->abacode;
         $extra->x_bank_acct_num = $form->accnum;
         $extra->x_bank_acct_type = $form->acctype;
-        $extra->x_echeck_type = ($form->acctype == 'BUSINESSCHECKING') ? 'CCD' : 'WEB';
+        $extra->x_echeck_type = $isbusinesschecking ? 'CCD' : 'WEB';
         $extra->x_bank_name = $form->bankname;
         $extra->x_currency_code = $curcost['currency'];
         $extra->x_amount = $curcost['cost'];
@@ -393,6 +394,7 @@ class enrolment_plugin_authorize
     function config_form($frm)
     {
         global $CFG;
+        $mconfig = get_config('enrol/authorize');
 
         if (! check_openssl_loaded()) {
             notify('PHP must be compiled with SSL support (--with-openssl)');
@@ -415,7 +417,6 @@ class enrolment_plugin_authorize
             $captureday = intval($frm->an_capture_day);
             $emailexpired = intval($frm->an_emailexpired);
             if ($captureday > 0 || $emailexpired > 0) {
-                $mconfig = get_config('enrol/authorize');
                 if ((time() - intval($mconfig->an_lastcron) > 3600 * 24)) {
                     notify(get_string('admincronsetup', 'enrol_authorize'));
                 }
@@ -430,10 +431,10 @@ class enrolment_plugin_authorize
         }
 
         if (data_submitted()) {
-            if (empty($frm->an_login)) {
+            if (empty($mconfig->an_login)) {
                 notify("an_login required");
             }
-            if (empty($frm->an_tran_key) && empty($frm->an_password)) {
+            if (empty($mconfig->an_tran_key) && empty($mconfig->an_password)) {
                 notify("an_tran_key or an_password required");
             }
         }
@@ -452,6 +453,7 @@ class enrolment_plugin_authorize
     function process_config($config)
     {
         global $CFG;
+        $mconfig = get_config('enrol/authorize');
 
         // site settings
         if (($cost = optional_param('enrol_cost', 5, PARAM_INT)) > 0) {
@@ -489,7 +491,6 @@ class enrolment_plugin_authorize
         $emailexpired = ($emailexpired > 5) ? 5 : (($emailexpired < 0) ? 0 : $emailexpired);
 
         if (!empty($reviewval) && ($captureday > 0 || $emailexpired > 0)) {
-            $mconfig = get_config('enrol/authorize');
             if (time() - intval($mconfig->an_lastcron) > 3600 * 24) {
                 return false;
             }
@@ -507,30 +508,35 @@ class enrolment_plugin_authorize
             return false;
         }
 
-        // required fields
+        // REQUIRED fields;
+        // an_login
         $loginval = optional_param('an_login', '');
-        if (empty($loginval)) {
+        if (empty($loginval) && empty($mconfig->an_login)) {
             return false;
         }
-        set_config('an_login', $loginval);
+        $loginval = !empty($loginval) ? rc4encrypt($loginval) : strval($mconfig->an_login);
+        set_config('an_login', $loginval, 'enrol/authorize');
 
+        // an_tran_key, an_password
         $tranval = optional_param('an_tran_key', '');
+        $tranval = !empty($tranval) ? rc4encrypt($tranval) : (isset($mconfig->an_tran_key)?$mconfig->an_tran_key:'');
         $passwordval = optional_param('an_password', '');
-        $deletecurrent = optional_param('delete_current', '');
-
-        if (!empty($passwordval)) { // password is changing
-            set_config('an_password', $passwordval);
+        $passwordval = !empty($passwordval) ? rc4encrypt($passwordval) :(isset($mconfig->an_password)?$mconfig->an_password:'');
+        $deletecurrent = optional_param('delete_current', '0', PARAM_BOOL);
+        if (!empty($deletecurrent) and !empty($tranval)) {
+            unset_config('an_password', 'enrol/authorize');
+            $passwordval = '';
         }
-        elseif (!empty($deletecurrent) and !empty($tranval)) {
-            set_config('an_password', '');
-            $CFG->an_password = '';
+        elseif (!empty($passwordval)) {
+            set_config('an_password', $passwordval, 'enrol/authorize');
         }
-
-        if (empty($tranval) and empty($CFG->an_password)) {
+        if (empty($tranval) and empty($passwordval)) {
             return false;
         }
+        if (!empty($tranval)) {
+            set_config('an_tran_key', $tranval, 'enrol/authorize');
+        }
 
-        set_config('an_tran_key', $tranval);
         return true;
     }
 
@@ -676,6 +682,7 @@ class enrolment_plugin_authorize
 
         $oneday = 86400;
         $timenow = time();
+        $onepass = $timenow - $oneday;
         $settlementtime = authorize_getsettletime($timenow);
         $timediff30 = $settlementtime - (30 * $oneday);
 
@@ -692,7 +699,24 @@ class enrolment_plugin_authorize
         $select = "(status='".AN_STATUS_EXPIRE."') AND (timecreated<'$timediff60')";
         delete_records_select('enrol_authorize', $select);
 
-        // XXX TODO SEND EMAIL to uploadcsv user
+        // XXX TODO SEND EMAIL to 'enrol/authorize:uploadcsv'
+        // 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')";
+        $count = count_records_select('enrol_authorize', $select);
+        if ($count) {
+            $a = new stdClass;
+            $a->count = $count;
+            $a->course = $SITE->shortname;
+            $subject = get_string('pendingechecksubject', 'enrol_authorize', $a);
+            $a = new stdClass;
+            $a->count = $count;
+            $a->url = $CFG->wwwroot.'/enrol/authorize/uploadcsv.php';
+            $message = get_string('pendingecheckemail', 'enrol_authorize', $a);
+            @email_to_user($adminuser, $adminuser, $subject, $message);
+        }
 
         // Daily warning email for pending orders expiring.
         if (empty($CFG->an_emailexpired)) {
@@ -720,7 +744,6 @@ class enrolment_plugin_authorize
         $a->enrolurl = "$CFG->wwwroot/$CFG->admin/enrol_config.php?enrol=authorize";
         $a->url = $CFG->wwwroot.'/enrol/authorize/index.php?status='.AN_STATUS_AUTH;
         $message = get_string('pendingordersemail', 'enrol_authorize', $a);
-        $adminuser = get_admin();
         email_to_user($adminuser, $adminuser, $subject, $message);
 
         // Email to teachers

enrol/authorize/index.php

@@ -9,6 +9,11 @@
     $courseid = optional_param('course', SITEID, PARAM_INT);
     $userid   = optional_param('user', 0, PARAM_INT);
 
+/// Get course
+    if (! $course = get_record('course', 'id', $courseid)) {
+        error('Could not find that course');
+    }
+
 /// Only site users can access to this page
     require_login(); // Don't use $courseid! User may want to see old orders.
 
@@ -16,10 +21,6 @@
         error("Guests cannot use this page.");
     }
 
-    if (! $course = get_record('course', 'id', $courseid)) {
-        error('Could not find that course');
-    }
-
 /// Load strings. All strings should be defined here. locallib.php uses these strings.
     $strs = get_strings(array('search','status','action','time','course','confirm','no','all','none','error'));
     $authstrs = get_strings(array('orderid','nameoncard','echeckfirslasttname','void','capture','refund','delete',
@@ -30,9 +31,9 @@
 
 /// Print header
     $strpaymentmanagement = get_string('paymentmanagement', 'enrol_authorize');
-    print_header_simple("$strpaymentmanagement", "", "<a href=\"index.php\">$strpaymentmanagement</a>");
+    print_header_simple($strpaymentmanagement, "", "<a href=\"index.php\">$strpaymentmanagement</a>");
 
-/// If orderid is empty, print orders
+/// If orderid is empty, user wants to see all orders
     if (empty($orderid)) {
         authorize_print_orders($courseid, $userid);
     } else {

enrol/authorize/localfuncs.php

@@ -31,9 +31,7 @@ function prevent_double_paid($course)
 {
     global $CFG, $SESSION, $USER;
 
-    $sql = "SELECT id FROM {$CFG->prefix}enrol_authorize
-            WHERE userid = $USER->id
-              AND courseid = $course->id ";
+    $sql = "SELECT id FROM {$CFG->prefix}enrol_authorize WHERE userid = '$USER->id' AND courseid = '$course->id' ";
 
     if (empty($CFG->an_test)) { // Real mode
         $sql .= 'AND status IN('.AN_STATUS_AUTH.','.AN_STATUS_UNDERREVIEW.','.AN_STATUS_APPROVEDREVIEW.')';
@@ -42,9 +40,9 @@ function prevent_double_paid($course)
         $sql .= 'AND status='.AN_STATUS_NONE;
     }
 
-    if ($rec = get_record_sql($sql)) {
+    if ($recid = get_field_sql($sql)) {
         $a = new stdClass;
-        $a->orderid = $rec->id;
+        $a->orderid = $recid;
         $a->url = "$CFG->wwwroot/enrol/authorize/index.php?order=$a->orderid";
         redirect($a->url, get_string("paymentpending", "enrol_authorize", $a), '10');
         return;
@@ -232,7 +230,7 @@ function validate_cc_form($form, &$err)
         }
     }
 
-    if (empty($form->ccfirstname) || empty($form->cclastname)) {
+    if (empty($form->firstname) || empty($form->lastname)) {
         $err['ccfirstlast'] = get_string('missingfullname');
     }
 

enrol/authorize/locallib.php

@@ -26,8 +26,11 @@ function authorize_print_orders($courseid, $userid)
     $status = optional_param('status', AN_STATUS_NONE, PARAM_INT);
     $searchtype = optional_param('searchtype', 'id', PARAM_ALPHA);
     $idortransid = optional_param('idortransid', '0', PARAM_INT);
+    $showonlymy = optional_param('showonlymy', 0, PARAM_BOOL);
 
-    if (! has_capability('enrol/authorize:managepayments', get_context_instance(CONTEXT_COURSE, $courseid))) {
+    $canmanagepayments = has_capability('enrol/authorize:managepayments', get_context_instance(CONTEXT_COURSE, $courseid));
+
+    if ($showonlymy || !$canmanagepayments) {
         $userid = $USER->id;
     }
 
@@ -46,22 +49,29 @@ function authorize_print_orders($courseid, $userid)
     );
 
     $sql = "SELECT c.id, c.fullname FROM {$CFG->prefix}course c INNER JOIN {$CFG->prefix}enrol_authorize e ON c.id = e.courseid ";
-    if ($CFG->enrol == 'authorize') { // default enrolment plugin
-        $sql .= "WHERE (c.enrol IS NULL) OR (c.enrol='') OR (c.enrol = 'authorize') ";
-    }
-    else {
-        $sql .= "WHERE (c.enrol = 'authorize') ";
+    if ($userid > 0) {
+        $sql .= "WHERE (e.userid='$userid') ";
     }
     $sql .= "ORDER BY c.sortorder, c.fullname";
     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>";
-        echo "<td width='5%'>$strs->status: </td><td width='10%'>";popup_form($baseurl.'&amp;course='.$courseid.'&amp;status=',$statusmenu,'statusmenu',$status,'','','',false);echo"</td>\n";
-        echo "<td width='5%'>$strs->course: </td><td width='10%'>";popup_form($baseurl.'&amp;status='.$status.'&amp;course=',$popupcrs,'coursesmenu',$courseid,'','','',false);echo"</td>\n";
+        echo "<td width='5%' valign='top'>$strs->status: </td><td width='10%'>";
+        popup_form($baseurl.'&amp;course='.$courseid.'&amp;status=',$statusmenu,'statusmenu',$status,'','','',false);
+        if ($canmanagepayments) {
+            echo "<br />\n";
+            print_checkbox('showonlymy', '1', $userid == $USER->id, get_string('mypaymentsonly', 'enrol_authorize'), '',
+            "var locationtogo = '{$CFG->wwwroot}/enrol/authorize/index.php?status=$status&amp;course=$courseid';
+                                  locationtogo += '&amp;user=' + (this.checked ? '$USER->id' : '0');
+                                  top.location.href=locationtogo;");
+        }
+        echo "</td>\n";
+        echo "<td width='5%' valign='top'>$strs->course: </td><td width='10%' valign='top'>";
+        popup_form($baseurl.'&amp;status='.$status.'&amp;course=',$popupcrs,'coursesmenu',$courseid,'','','',false);echo"</td>\n";
         if (has_capability('enrol/authorize:uploadcsv', get_context_instance(CONTEXT_USER, $USER->id))) {
             echo "<form method='get' action='uploadcsv.php'>";
-            echo "<td rowspan=2 align='center' valign='middle' width='50%'><input type='submit' value='".get_string('uploadcsv', 'enrol_authorize')."'></td>";
+            echo "<td rowspan=2 align='right' valign='middle' width='50%'><input type='submit' value='".get_string('uploadcsv', 'enrol_authorize')."' /></td>";
             echo "</form>";
         }
         else {
@@ -88,7 +98,7 @@ function authorize_print_orders($courseid, $userid)
 
     $table->define_columns(array('id', 'timecreated', 'userid', 'status', ''));
     $table->define_headers(array($authstrs->orderid, $strs->time, $authstrs->nameoncard, $strs->status, $strs->action));
-    $table->define_baseurl($baseurl."&amp;status=$status");
+    $table->define_baseurl($baseurl."&amp;status=$status&amp;course=$courseid");
 
     $table->sortable(true, 'id', SORT_DESC);
     $table->pageable(true);
@@ -218,7 +228,7 @@ function authorize_print_order_details($orderno)
     }
 
     echo "<form action=\"index.php\" method=\"post\">\n";
-    echo "<input type=\"hidden\" name=\"order\" value=\"$orderno\">\n";
+    echo "<input type=\"hidden\" name=\"order\" value=\"$orderno\" />\n";
     echo "<input type=\"hidden\" name=\"sesskey\" value=\"" . sesskey() . "\" />";
 
     $settled = authorize_settled($order);
@@ -256,7 +266,7 @@ function authorize_print_order_details($orderno)
             $strcaptureyes = get_string('captureyes', 'enrol_authorize');
             $table->data[] = array("<b>$strs->confirm:</b>",
             "$strcaptureyes <br />
-            <input type='hidden' name='confirm' value='1'><input type='submit' name='". ORDER_CAPTURE ."' value='$authstrs->capture' />
+            <input type='hidden' name='confirm' value='1' /><input type='submit' name='". ORDER_CAPTURE ."' value='$authstrs->capture' />
             &nbsp;&nbsp;&nbsp;<a href='index.php?order=$orderno'>$strs->no</a>");
         }
         else {
@@ -318,14 +328,15 @@ function authorize_print_order_details($orderno)
                 $cbunenrol = print_checkbox('unenrol', '1', !empty($unenrol), '', '', '', true);
                 $table->data[] = array("<b>$authstrs->unenrolstudent</b>", $cbunenrol);
                 $table->data[] = array("<b>$strhowmuch</b>",
-                    "<input type='hidden' name='confirm' value='1'>
-                     <input type='text' size='5' name='amount' value='$amount'>
+                    "<input type='hidden' name='confirm' value='1' />
+                     <input type='text' size='5' name='amount' value='$amount' />
                      $strcanbecredit<br /><input type='submit' name='".ORDER_REFUND."' value='$authstrs->refund'>");
             }
             else {
                 $extra->amount = $amount;
                 $message = '';
-                if (AN_APPROVED == authorize_action($order, $message, $extra, AN_ACTION_CREDIT)) {
+                $success = authorize_action($order, $message, $extra, AN_ACTION_CREDIT);
+                if (AN_APPROVED == $success || AN_REVIEW == $success) {
                     if (empty($CFG->an_test)) {
                         if (empty($extra->id)) {
                             $table->data[] = array("<b><font color=red>$strs->error:</font></b>", 'insert record error');
@@ -360,8 +371,8 @@ function authorize_print_order_details($orderno)
             if (empty($confirm)) {
                 $strvoidyes = get_string('voidyes', 'enrol_authorize');
                 $table->data[] = array("<b>$strs->confirm:</b>",
-                    "$strvoidyes<br /><input type='hidden' name='".ORDER_VOID."' value='y'>
-                     <input type='hidden' name='confirm' value='1'>
+                    "$strvoidyes<br /><input type='hidden' name='".ORDER_VOID."' value='y' />
+                     <input type='hidden' name='confirm' value='1' />
                      <input type='submit' value='$authstrs->void'>
                      &nbsp;&nbsp;&nbsp;&nbsp;<a href='index.php?order=$orderno'>$strs->no</a>");
             }
@@ -407,9 +418,9 @@ function authorize_print_order_details($orderno)
                     $cbunenrol = print_checkbox('unenrol', '1', !empty($unenrol), '', '', '', true);
                     $table->data[] = array("<b>$authstrs->unenrolstudent</b>", $cbunenrol);
                     $table->data[] = array("<b>$strs->confirm:</b>",
-                        "$strsubvoidyes<br /><input type='hidden' name='".ORDER_VOID."' value='y'>
-                         <input type='hidden' name='confirm' value='1'>
-                         <input type='hidden' name='suborder' value='$suborderno'>
+                        "$strsubvoidyes<br /><input type='hidden' name='".ORDER_VOID."' value='y' />
+                         <input type='hidden' name='confirm' value='1' />
+                         <input type='hidden' name='suborder' value='$suborderno' />
                          <input type='submit' value='$authstrs->void'>
                          &nbsp;&nbsp;&nbsp;&nbsp;<a href='index.php?order=$orderno'>$strs->no</a>");
                 }
@@ -446,8 +457,8 @@ function authorize_print_order_details($orderno)
             $cbunenrol = print_checkbox('unenrol', '1', !empty($unenrol), '', '', '', true);
             $table->data[] = array("<b>$authstrs->unenrolstudent</b>", $cbunenrol);
             $table->data[] = array("<b>$strs->confirm:</b>",
-                "<input type='hidden' name='".ORDER_DELETE."' value='y'>
-                 <input type='hidden' name='confirm' value='1'>
+                "<input type='hidden' name='".ORDER_DELETE."' value='y' />
+                 <input type='hidden' name='confirm' value='1' />
                  <input type='submit' value='$authstrs->delete'>
                  &nbsp;&nbsp;&nbsp;&nbsp;<a href='index.php?order=$orderno'>$strs->no</a>");
         }
@@ -583,8 +594,10 @@ function authorize_get_status_action($order)
 
     case AN_STATUS_AUTHCAPTURE:
         if (authorize_settled($order)) {
-            if ($order->paymentmethod == AN_METHOD_CC && $canmanage) {
-                $ret->actions = array(ORDER_REFUND);
+            if ($canmanage) {
+                if (($order->paymentmethod == AN_METHOD_CC) || ($order->paymentmethod == AN_METHOD_ECHECK && !empty($order->refundinfo))) {
+                    $ret->actions = array(ORDER_REFUND);
+                }
             }
             $ret->status = 'settled';
         }

enrol/authorize/uploadcsv.php

@@ -33,10 +33,10 @@
 /// Print submit form
     $maxuploadsize = get_max_upload_file_size();
     echo '<center><form method="post" enctype="multipart/form-data" action="uploadcsv.php">
-          <input type="hidden" name="MAX_FILE_SIZE" value="'.$maxuploadsize.'">
+          <input type="hidden" name="MAX_FILE_SIZE" value="'.$maxuploadsize.'" />
           <input type="hidden" name="sesskey" value="'.$USER->sesskey.'">';
           upload_print_form_fragment(1, array('csvfile'), array(get_string('file')));
-    echo '<input type="submit" value="'.get_string('upload').'">';
+    echo '<input type="submit" value="'.get_string('upload').'" />';
     echo '</form></center><br />';
 
 /// Print footer
@@ -50,7 +50,7 @@ function authorize_process_csv($filename)
 
 /// We need these fields
     $myfields = array(
-        'Transaction ID',           // enrol_authorize.transid
+        'Transaction ID',           // enrol_authorize.transid or enrol_authorize_refunds.transid; See: Reference Transaction ID
         'Transaction Status',       // Under Review,Approved Review,Review Failed,Settled Successfully
         'Transaction Type',         // Authorization w/ Auto Capture, Authorization Only, Capture Only, Credit, Void, Prior Authorization Capture
         'Settlement Amount',        //
@@ -59,7 +59,7 @@ function authorize_process_csv($filename)
         'Authorization Amount',     //
         'Authorization Currency',   //
         'Submit Date/Time',         // timecreated
-        'Reference Transaction ID', // enrol_authorize_refunds.transid
+        'Reference Transaction ID', // enrol_authorize.transid if Transaction Type = Credit
         'Total Amount',             // enrol_authorize.cost
         'Currency',                 // enrol_authorize.currency
         'Invoice Number',           // enrol_authorize.id: Don't trust this! Backup/Restore changes this
@@ -111,6 +111,7 @@ function authorize_process_csv($filename)
         $transid = $data[$csvfields['Transaction ID']];
         $transtype = $data[$csvfields['Transaction Type']];
         $transstatus = $data[$csvfields['Transaction Status']];
+        $reftransid = $data[$csvfields['Reference Transaction ID']];
         $settlementdate = strtotime($data[$csvfields['Settlement Date/Time']]);
 
         if ($transstatus == 'Approved Review' || $transstatus == 'Review Failed') {
@@ -122,6 +123,29 @@ function authorize_process_csv($filename)
             continue;
         }
 
+        if (!empty($reftransid) && is_numeric($reftransid) && 'Settled Successfully' == $transstatus && 'Credit' == $transtype) {
+            if ($order = get_record('enrol_authorize', 'transid', $reftransid)) {
+                if (AN_METHOD_ECHECK == $order->paymentmethod) {
+                    $refund = get_record('enrol_authorize_refunds', 'transid', $transid);
+                    if ($refund) {
+                        $refund->status = AN_STATUS_CREDIT;
+                        $refund->settletime = $settlementdate;
+                        update_record('enrol_authorize_refunds', $refund);
+                        $updated++;
+                    }
+                    else {
+                        $ignored++;
+                        $ignoredlines .= $reftransid . ": Not our business(Reference Transaction ID)\n";
+                    }
+                }
+            }
+            else {
+                $ignored++;
+                $ignoredlines .= $reftransid . ": Not our business(Transaction ID)\n";
+            }
+            continue;
+        }
+
         if (! ($transstatus == 'Settled Successfully' && $transtype == 'Authorization w/ Auto Capture')) {
             $ignored++;
             $ignoredlines .= $transid . ": Not settled\n";

enrol/authorize/version.php

@@ -1,6 +1,6 @@
 <?php // $Id$
 
-$plugin->version  = 2006101700;
+$plugin->version  = 2006101702;
 $plugin->requires = 2006100401;
 
 ?>

enrol/database/enrol.php

@@ -18,7 +18,7 @@ function setup_enrolments(&$user) {
     // $this->enrol_disconnect() as it is doing some nasty vodoo with $CFG->prefix
     $enroldb = $this->enrol_connect();
     if (!$enroldb) {
-        error_log('[ENROL_DB] Could not make a connection: '.$enroldb->ErrorMsg());
+        error_log('[ENROL_DB] Could not make a connection');
         return;
     }
 
@@ -61,7 +61,7 @@ function setup_enrolments(&$user) {
             error_log('[ENROL_DB] Using config default for roles: '.$role->shortname);
         }*/
         
-        if ($rs = $enroldb->Execute("SELECT {$CFG->enrol_remotecoursefield}
+        if ($rs = $enroldb->Execute("SELECT {$CFG->enrol_remotecoursefield} as enrolremotecoursefield
                                        FROM {$CFG->enrol_dbtable}
                                       WHERE {$CFG->enrol_remoteuserfield} = " . $useridfield .
                                         (isset($remote_role_name, $remote_role_value) ? ' AND '.$remote_role_name.' = '.$remote_role_value : ''))) {
@@ -84,7 +84,7 @@ function setup_enrolments(&$user) {
 
                 $courselist = array();
                 while (!$rs->EOF) {         // Make a nice little array of courses to process
-                    $courselist[] = $rs->fields[0];
+                    $courselist[] = $rs->fields['enrolremotecoursefield'];
                     $rs->MoveNext();
                 }
                 $rs->Close();
@@ -604,6 +604,7 @@ function enrol_connect() {
     // Try to connect to the external database
     $enroldb = &ADONewConnection($CFG->enrol_dbtype);
     if ($enroldb->PConnect($CFG->enrol_dbhost,$CFG->enrol_dbuser,$CFG->enrol_dbpass,$CFG->enrol_dbname)) {
+        $enroldb->SetFetchMode(ADODB_FETCH_ASSOC); ///Set Assoc mode always after DB connection
         return $enroldb;
     } else {
         // do a bit of cleanup, and lot the problem

enrol/database/enrol_database_sync.php

@@ -9,6 +9,7 @@
     require_once(dirname(dirname(dirname(__FILE__))).'/config.php'); // global moodle config file.
 
     require_once($CFG->dirroot . '/course/lib.php');
+    require_once($CFG->dirroot . '/lib/blocklib.php');
     require_once($CFG->dirroot . "/enrol/database/enrol.php");
 
     // ensure errors are well explained

enrol/manual/enrol.php

@@ -137,11 +137,9 @@ function check_entry($form, $course) {
 
     $groupid = $this->check_group_entry($course->id, $form->password);
 
-    $context = get_context_instance(CONTEXT_COURSE, $course->id);
-
     if (($form->password == $course->password) or ($groupid !== false) ) {
 
-        if (has_capability('moodle/legacy:guest', $context, $USER->id, false)) {
+        if ($USER->username == 'guest') { // only real user guest, do not use this for users with guest role
             $USER->enrolkey[$course->id] = true;
             add_to_log($course->id, 'course', 'guest', 'view.php?id='.$course->id, getremoteaddr());
 

enrol/paypal/enrol.php

@@ -42,7 +42,7 @@ function print_entry($course) {
 
         print_simple_box_start("center");
 
-        if (has_capability('moodle/legacy:guest', get_context_instance(CONTEXT_SYSTEM, SITEID), NULL, false)) {
+        if ($USER->username == 'guest') { // force login only for guest user, not real users with guest role
             if (empty($CFG->loginhttps)) {
                 $wwwroot = $CFG->wwwroot;
             } else {

enrol/paypal/ipn.php

@@ -112,7 +112,7 @@
 
 
 
-            if ($existing = get_record("enrol_paypal", "txn_id", $data->txn_id)) {   // Make sure this transaction doesn't exist already
+            if ($existing = get_record("enrol_paypal", "txn_id", addslashes($data->txn_id))) {   // Make sure this transaction doesn't exist already
                 email_paypal_error_to_admin("Transaction $data->txn_id is being repeated!", $data);
                 die;
 
@@ -150,11 +150,11 @@
 
             // ALL CLEAR !
 
-            if (!insert_record("enrol_paypal", $data)) {       // Insert a transaction record
+            if (!insert_record("enrol_paypal", addslashes_object($data))) {       // Insert a transaction record
                 email_paypal_error_to_admin("Error while trying to insert valid transaction", $data);
             }
 
-            if (enrol_into_course($course, $user, 'paypal')) {
+            if (!enrol_into_course($course, $user, 'paypal')) {
                 email_paypal_error_to_admin("Error while trying to enrol ".fullname($user)." in '$course->fullname'", $data);
                 die;
             } else {
@@ -188,7 +188,7 @@
 
 
         } else if (strcmp ($result, "INVALID") == 0) { // ERROR
-            insert_record("enrol_paypal", $data, false);
+            insert_record("enrol_paypal", addslashes_object($data), false);
             email_paypal_error_to_admin("Received an invalid payment notification!! (Fake payment?)", $data);
         }
     }
@@ -203,7 +203,7 @@
 
 function email_paypal_error_to_admin($subject, $data) {
     $admin = get_admin();
-    $site = get_admin();
+    $site = get_site();
 
     $message = "$site->fullname:  Transaction failed.\n\n$subject\n\n";
 

files/index.php

@@ -35,7 +35,7 @@
 
     require_login($course->id);
 
-    require_capability('moodle/course:update', get_context_instance(CONTEXT_COURSE, $course->id));
+    require_capability('moodle/course:managefiles', get_context_instance(CONTEXT_COURSE, $course->id));
 
     function html_footer() {
         global $course, $choose;

filter/mediaplugin/filter.php

@@ -98,11 +98,9 @@ function mediaplugin_filter($courseid, $text) {
         $replace .= " <param name=\"movie\" value=\"$CFG->wwwroot/filter/mediaplugin/flvplayer.swf?file=\\2.flv\" />";
         $replace .= ' <param name="quality" value="high" />';
         $replace .= ' <param name="bgcolor" value="#FFFFFF" />';
-        $replace .= ' <param name="flashvars" value="'.$c.'" />';
         $replace .= " <embed src=\"$CFG->wwwroot/filter/mediaplugin/flvplayer.swf?file=\\2.flv\" ";
         $replace .= "  quality=\"high\" bgcolor=\"#FFFFFF\" width=\"480\" height=\"360\" name=\"flvplayer\" ";
         $replace .= ' type="application/x-shockwave-flash" ';
-        $replace .= ' flashvars="'.$c.'" ';
         $replace .= ' pluginspage="http://www.macromedia.com/go/getflashplayer">';
         $replace .= '</embed>';
         $replace .= '</object>&nbsp;';

index.php

@@ -48,12 +48,23 @@
         require_login();
     }
 
-    if (has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
-        if (moodle_needs_upgrading()) {
+    if ($CFG->rolesactive) { // if already using roles system
+        if (has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
+            if (moodle_needs_upgrading()) {
+                redirect($CFG->wwwroot .'/'. $CFG->admin .'/index.php');
+            }
+        } else if (!empty($CFG->mymoodleredirect)) {    // Redirect logged-in users to My Moodle overview if required
+            if (isloggedin()) {
+                redirect($CFG->wwwroot .'/my/index.php');
+            }
+        }
+    } else { // if upgrading from 1.6 or below
+        if (isadmin() && moodle_needs_upgrading()) {
             redirect($CFG->wwwroot .'/'. $CFG->admin .'/index.php');
         }
     }
 
+
     if (get_moodle_cookie() == '') {   
         set_moodle_cookie('nobody');   // To help search for cookies on login page
     }

install.php

@@ -290,14 +290,14 @@ if ($INSTALL['stage'] == DATABASE) {
     }
 
     if ($INSTALL['dbtype'] == 'mssql') {  /// Check MSSQL extension is present
-        if (!extension_loaded('mssql')) {
+        if (!function_exists('mssql_connect')) {
             $errormsg = get_string('mssqlextensionisnotpresentinphp', 'install');
             $nextstage = DATABASE;
         }
     }
 
     if ($INSTALL['dbtype'] == 'mssql_n') {  /// Check MSSQL extension is present
-        if (!extension_loaded('mssql')) {
+        if (!function_exists('mssql_connect')) {
             $errormsg = get_string('mssqlextensionisnotpresentinphp', 'install');
             $nextstage = DATABASE;
         }

install/lang/ar_utf8/installer.php

@@ -78,6 +78,7 @@ $string['phpversionhelp'] = '<p> يتطلب مودل على الاقل الأص
 <p> يجب عليك ترقية PHP أو الانتقال إلى مستظيف أخر لديه أصدار اجد لـ PHP.</p>';
 $string['previous'] = 'السابق';
 $string['report'] = 'تقرير';
+$string['restricted'] = 'متحكم فيه';
 $string['safemode'] = 'وضع الامان';
 $string['safemodeerror'] = 'من الممكن ان مودل يواجه مشاكل عندما يكون وضع الامان نشط';
 $string['sessionautostart'] = 'البدء الآلي للجلسة';

install/lang/bs_utf8/installer.php

@@ -39,7 +39,7 @@ $string['gdversionhelp'] = '<p>Vaš server neće izgledati isto imajući GD inst
 
 <p>Da dodate GD u PHP na osnovu Unixa, kompajlirate PHP koristeći se gd parametrom.</p>
 
-<p>Na osnovu Windows obično možete podesiti php.ini i ne bilježiti liniju referencirajući libgd.dll.</p>';
+<p>Na osnovu Windows obično možete podesiti php.ini i ne bilježiti liniju referencirajući php_gd2.dll.</p>';
 $string['help'] = 'Pomoć';
 $string['installation'] = 'Instalacija';
 $string['language'] = 'Jezik';

install/lang/ca_utf8/installer.php

@@ -36,6 +36,7 @@ $string['configfilewritten'] = 'S\'ha creat amb èxit el fitxer config.php';
 $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['continue'] = 'Continua';
+$string['curlrecommended'] = 'Es recomana instal·lar la biblioteca opcional Curl a fi d\'habilitar la funcionalitat de Moodle en Xarxa.';
 $string['database'] = 'Base de dades';
 $string['databasecreationsettingshead'] = 'Ara cal configurar els paràmetres de la base de dades on s\'emmagatzemaran la majoria de dades de Moodle. L\'instal·lador crearà automàticament aquesta base de dades amb els paràmetres que especifiqueu aquí.';
 $string['databasecreationsettingssub'] = '<b>Tipus:</b> fixat a \"mysql\" per l\'instal·lador<br />
@@ -135,7 +136,7 @@ $string['gdversionhelp'] = '<p>Sembla que el vostre servidor no té instal·lat
 
 <p>Per afegir GD al PHP en Unix, compileu el PHP amb el paràmetre --with-gd.</p>
 
-<p>En Windows generalment es pot editar el fitxer php.ini i treure el comentari de la línia que porti la referència a libgd.dll.</p>';
+<p>En Windows generalment es pot editar el fitxer php.ini i treure el comentari de la línia que porti la referència a php_gd2.dll.</p>';
 $string['globalsquotes'] = 'Gestió insegura dels globals';
 $string['globalsquoteserror'] = 'Arregleu els paràmetres del vostre PHP: inhabiliteu register_globals i/o habiliteu magic_quotes_gpc';
 $string['help'] = 'Ajuda';
@@ -179,6 +180,7 @@ $string['ociextensionisnotpresentinphp'] = 'El PHP no s\'ha configurat correctam
 $string['odbc_mssql'] = 'SQL*Server over ODBC (odbc_mssql)';
 $string['odbcextensionisnotpresentinphp'] = 'El PHP no s\'ha configurat correctament amb l\'extensió ODBC de manera que pugui comunicar-se amb Oracle. Reviseu el fitxer php.ini o recompileu el PHP.';
 $string['ok'] = 'OK';
+$string['opensslrecommended'] = 'Es recomana instal·lar la biblioteca OpenSSL per habilitar la funcionalitat de Moodle en Xarxa.';
 $string['pass'] = 'Correcte';
 $string['password'] = 'Contrasenya';
 $string['pgsqlextensionisnotpresentinphp'] = 'El PHP no s\'ha configurat correctament amb l\'extensió PGSQL de manera que pugui comunicar-se amb PostgreSQL. Reviseu el fitxer php.ini o recompileu el PHP.';
@@ -201,6 +203,8 @@ $string['skipdbencodingtest'] = 'Omet la prova de codificació de la base de dad
 $string['status'] = 'Estat';
 $string['thischarset'] = 'UTF-8';
 $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['user'] = 'Usuari';
 $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!';

install/lang/cs_utf8/installer.php

@@ -36,6 +36,7 @@ $string['configfilewritten'] = 'Soubor config.php byl úspěšně vytvořen.';
 $string['configurationcompletehead'] = 'Konfigurace dokončena';
 $string['configurationcompletesub'] = 'Moodle se pokusil uložit soubor s konfigurací do kořenového adresáře instalace Moodlu.';
 $string['continue'] = 'Pokračovat';
+$string['curlrecommended'] = 'Pro běh síťových funkcionalit (\"Moodle Networking\") je potřeba nainstalovat volitelnou knihovnu Curl.';
 $string['database'] = 'Databáze';
 $string['databasecreationsettingshead'] = 'Nyní musíte nastavit připojení k databázi, kam si bude Moodle ukládat většinu svých dat. Tato databáze může být vytvořena instalátorem automaticky podle následujícího nastavení.';
 $string['databasecreationsettingssub'] = '<b>Typ:</b> instalátor nastaví na \"mysql\"<br />
@@ -98,7 +99,7 @@ $string['gdversionhelp'] = '<p>Na vašem serveru zřejmě není nainstalována k
 
 <p>V Unixu můžete přidat GD do PHP tak, že zkompilujte PHP s parametrem --with-gd.</p>
 
-<p>Ve Windows stačí většinou upravit php.ini a odkomentovat řádek odkazující na libgd.dll.</p>';
+<p>Ve Windows stačí většinou upravit php.ini a odkomentovat řádek odkazující na php_gd2.dll.</p>';
 $string['globalsquotes'] = 'Nezabezpečené zacházení s globálními proměnnými';
 $string['globalsquoteserror'] = 'Upravte nastavení PHP: zakažte register_globals a/nebo povolte magic_quotes_gpc';
 $string['help'] = 'Nápověda';
@@ -136,6 +137,7 @@ $string['mysqlextensionisnotpresentinphp'] = 'PHP nebylo korektně nakonfigurov
 $string['name'] = 'Název';
 $string['next'] = 'Další';
 $string['ok'] = 'OK';
+$string['opensslrecommended'] = 'Pro běh síťových funkcionalit (\"Moodle Networking\") je potřeba nainstalovat volitelnou knihovnu OpenSSL.';
 $string['pass'] = 'V pořádku';
 $string['password'] = 'Heslo';
 $string['php50restricted'] = 'V PHP 5.0.x bylo nalezeno množství chyb; přejděte buď na vyšší verzi 5.1.x, nebo na nižší verzi 4.3.x či 4.4.x.';
@@ -157,6 +159,8 @@ $string['skipdbencodingtest'] = 'Přeskočit test kódování DB';
 $string['status'] = 'Stav';
 $string['thischarset'] = 'UTF-8';
 $string['thislanguage'] = 'Čeština';
+$string['unicoderecommended'] = 'Doporučujeme ukládání dat v kódování Unicode (UTF-8). Nové instalace by měly být založeny nad databází s výchozím kódováním Unicode. Pokud přecházíte z nižších verzí, měli byste podstoupit proces migrace na UTF-8 (viz stránku Správa).';
+$string['unicoderequired'] = 'Je nezbytné ukládání dat v kódování Unicode (UTF-8). Nové instalace musí být založeny nad databází s výchozím kódováním Unicode. Pokud přecházíte z nižších verzí, měli byste podstoupit proces migrace na UTF-8 (viz stránku Správa).';
 $string['user'] = 'Uživatel';
 $string['welcomep10'] = '$a->installername ($a->installerversion)';
 $string['welcomep20'] = 'Podařilo se vám úspěšně nainstalovat a spustit balíček <strong>$a->packname $a->packversion</strong>. Gratulujeme!';

install/lang/da_utf8/installer.php

@@ -11,7 +11,9 @@
 
 $string['admindirerror'] = 'Det angivende admin biblioteket er forkert';
 $string['admindirname'] = 'Adminbibliotek';
+$string['bypassed'] = 'Forbigået';
 $string['caution'] = 'Pas på';
+$string['check'] = 'Kontroller';
 $string['closewindow'] = 'Luk dette vindue';
 $string['configfilenotwritten'] = 'Installationsscriptet var ikke i stand til at oprette config.php filen der indeholder de valgte indstillinger, sandsynligvis fordi den bruger hvis apache(PHP) kører med (apache, nobody ell) ikke har rettigheder til at skrive til moodlebiblioteket. 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';
@@ -27,6 +29,12 @@ $string['dbtype'] = 'Type';
 $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['environmenterrortodo'] = 'Du bliver nødt til at løse de ovenstående problemer (fejl) der er ved serveropsætningen før du kan installere denne version af Moodle';
+$string['environmentrecommendinstall'] = 'det anbefales installeret/aktiveret';
+$string['environmentrecommendversion'] = 'version $a->needed er anbefalet og du kører $a->current';
+$string['environmentrequireinstall'] = 'det er nødvendigt at installere/aktivere';
+$string['environmentrequireversion'] = 'version $a->needed er nødvendigt og du kører $a->current';
+$string['environmentxmlerror'] = 'Fejl ved læsning af serveropsætningens data ($a->error_code)';
 $string['error'] = 'Fejl';
 $string['fail'] = 'Mislykkedes';
 $string['fileuploads'] = 'Fil uploads';
@@ -41,11 +49,13 @@ $string['gdversionhelp'] = '<p>Det lader til at din server ikke har GD installer
 
 <p>Under windows er det normalt nok at udkommentere den linje i php.ini der referere til libgd.dll </p>';
 $string['help'] = 'Hjælp';
+$string['iconvrecommended'] = 'Det anbefales at installere/aktivere ICONV udvidelsen for at forbedre sitets hastighed, især hvis dit site understøtter sprog med ikke-latinske tegn.';
 $string['info'] = 'Information';
 $string['installation'] = 'Installation';
 $string['language'] = 'Sprog';
 $string['magicquotesruntime'] = 'Magic Quotes Run Time';
 $string['magicquotesruntimeerror'] = 'Denne skulle være deaktiveret';
+$string['mbstringrecommended'] = 'Det anbefales at installere/aktivere MBSTRING udvidelsen for at forbedre sitets ydeevne, især hvis sitet understøtter ikke-latinske sprog og tegn.';
 $string['memorylimit'] = 'Hukommelses begrænsning';
 $string['memorylimiterror'] = 'Den tilgængelige hukommelse til PHP er ret lav... Det kan være at der opstår problemer senere.';
 $string['memorylimithelp'] = '<p>Mængden af hukommelse som PHP kan bruge er sat til $a.</p>
@@ -62,18 +72,24 @@ indstillingen så der er minimum 16Mb til rådighed. Hvis du ikke har direkte ad
 <li>På nogle servere kan du oprette en \'.htaccess\' fil, gemme den i moodle biblioteket med linjen <p><blockquote>php_value memory_limit 16M</blockquote></p>
 <p>Det kan dog på nogle servere forårsage en fejl på <b>alle</b> PHPsiderne. i så fald kan du blive nødt til at fjerne \'.htaccess\' filen igen.</p></li>
 </ol>';
+$string['moodledocslink'] = 'Moodle Doks for denne side';
+$string['mysql416bypassed'] = 'Hvis sitet kun benytter iso-8859-1 (latin-1) sprog/tegnsæt, kan du fortsætte med at benytte den nuværende version 4.1.12 af MySQL (eller nyere)';
+$string['mysql416required'] = 'Moodle 1.6 skal som minimum bruge MySql version 4.1.16 for at garantere at data kan konverteres til UTF-8 fremover.';
 $string['mysqlextensionisnotpresentinphp'] = 'PHP er ikke blevet ordentligt konfigureret med MySQL  udvidelsen så den kan kommunikere med MySQL. Det kan skyldes at MySQL extension/dll ikke er loadet. Kontroller venlist phpinfo() og php.ini filen eller rekompiler PHP.';
 $string['name'] = 'Navn';
 $string['next'] = 'Næste';
 $string['ok'] = 'OK';
 $string['pass'] = 'OK';
-$string['password'] = 'Password';
+$string['password'] = 'Adgangskode';
+$string['php50restricted'] = 'PHP 5.0.x har nogle kendte fejl og problemer. Opgrader venligst til 5.1.x eller nedgradér til 4.3.x eller 4.4.x';
 $string['phpversion'] = 'PHP version';
 $string['phpversionerror'] = 'PHP versionen skal være nyere end 4.1.0';
 $string['phpversionhelp'] = '<p>Moodle kræver en PHP version der er nyere end 4.1.0.</p>
 <p>Webserveren bruger i øjeblikket version $a</p>
 <p>Du bliver nødt til at opdatere PHP eller flytte systemet over på en anden webserver der har en nyere version af PHP!</p>';
 $string['previous'] = 'Forrige';
+$string['report'] = 'Rapport';
+$string['restricted'] = 'Afvist';
 $string['safemode'] = 'Safe mode';
 $string['safemodeerror'] = 'Moodle kan have problemer med \"Safe mode : on\"';
 $string['sessionautostart'] = 'Session autostart';
@@ -81,6 +97,8 @@ $string['sessionautostarterror'] = 'Denne skulle være deaktiveret';
 $string['status'] = 'Status';
 $string['thischarset'] = 'UTF-8';
 $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['user'] = 'Bruger';
 $string['wwwroot'] = 'Web adresse';
 $string['wwwrooterror'] = 'Webadressen lader ikke til at være korrekt - Moodleinstallationen kunne ikke findes der.';

install/lang/de_du_utf8/installer.php

@@ -9,19 +9,117 @@
 /// File generated by cvs://contrib/lang2installer/installer_builder
 /// using strings defined in installer_strings (same dir)
 
-$string['closewindow'] = 'Dieses Fenster schließen';
-$string['continue'] = 'Weiter';
-$string['error'] = 'Fehler';
-$string['help'] = 'Hilfe';
-$string['language'] = 'Sprache';
-$string['name'] = 'Name';
-$string['next'] = 'Nächste';
-$string['ok'] = 'OK';
+$string['admindirsettingsub'] = 'Einige wenige Webhosting-Anbieter benutzen /admin als spezielles Verzeichnis für den Zugang zum Administrationstool oder andere Dinge. Leider kommt es dadurch zu Konflikten mit dem Standard für das Administrationsverzeichnis von Moodle. Du kannst dies ändern, indem du das Verzeichnis /admin in der Moodle-Installation umbenennst. Den geänderten Namen dieses Verzeichnisses musst du hier eingeben.
+z.B.: <br /> <br /><b>moodleadmin</b><br /> 
+Dies ändert die Links für das Admin-Verzeichnis in Moodle.';
+$string['chooselanguagesub'] = 'Wähle eine Sprache, die du während der Installation verwenden möchtest. Nach der Installation kannst du die Sprache für die Oberfläche und die Nutzer/innen festlegen.';
+$string['configfilenotwritten'] = 'Das Installationsscript kann die Datei config.php, welche die gewählten Einstellungen enthält, nicht automatisch erstellen. Der webuser hat keine Schreibrechte für das Moodle-Verzeichnis. Du kannst den folgenden Code manuell in der Datei config.php speichern und diese dann ins Hauptverzeichnis Ihrer Moodle-Installation kopieren.';
+$string['configurationcompletesub'] = 'Moodle speichert deine Konfigurationseinstellungen nun im Hauptverzeichnis deiner Moodle-Installation.';
+$string['databasecreationsettingshead'] = 'Du musst Einstellungen für die Datenbank konfigurieren, in der die meisten Moodle-Daten abgelegt werden. Der Installationsprozess erstellt die Datenbanktabellen automatisch auf der Grundlage der Einstellungen.';
+$string['databasecreationsettingssub'] = '<b>Typ:</b> \"mysql\" vom Installer festgelegt<br />
+<b>Host:</b> \"localhost\" vom Installer festgelegt<br />
+<b>Name:</b> Datenbankname, z.B. moodle<br />
+<b>User:</b> \"root\" vom Installer festgelegt<br />
+<b>Password:</b> Dein Datenbankpasswort<br />
+<b>Tables Prefix:</b> optionaler Prefix für alle Tabellennamen';
+$string['databasesettingshead'] = 'Du musst nun die Einstellungen für die Datenbank konfigurieren, in der die meisten Moodle-Daten abgelegt werden. Diese Datenbank muss bereits vorher angelegt und mit Nutzernamen und Passwort versehen worden sein, um auf sie zugreifen zu können.';
+$string['databasesettingssub'] = '<b>Typ:</b> mysql oder postgres7<br />
+<b>Host:</b> z.B. localhost oder db.isp.com<br />
+<b>Name:</b> Datenbankname, z.B. moodle<br />
+<b>Nutzer:</b> Dein Anmeldename für die Datenbank<br />
+<b>Passwort:</b> Dein Passwort für die Datenbank<br />
+<b>Tabellen-Prefix:</b> optionaler Prefix für alle Tabellen';
+$string['databasesettingssub_mssql'] = '<b>Typ:</b> SQL*Server (ohne UTF-8)<br />
+<b>Host:</b> z.B. localhost oder db.isp.com<br />
+<b>Name:</b> Datenbankname, z.B. moodle<br />
+<b>User:</b> Dein Anmeldename für die Datenbank<br />
+<b>Password:</b> Dein Passwort für die Datenbank<br />
+<b>Tabellen-Prefix:</b> Prefix für alle Tabellen (notwendig)';
+$string['databasesettingssub_mssql_n'] = '<b>Typ:</b> SQL*Server (mit UTF-8)<br />
+<b>Host:</b> z.B. localhost oder db.isp.com<br />
+<b>Name:</b> Datenbankname, z.B. moodle<br />
+<b>User:</b> Dein Anmeldename für die Datenbank<br />
+<b>Password:</b> Dein Passwort für die Datenbank<br />
+<b>Tabellen-Prefix:</b> Prefix für alle Tabellen (notwendig)';
+$string['databasesettingssub_mysql'] = '<b>Typ:</b> MySQL<br />
+<b>Host:</b> z.B. localhost oder db.isp.com<br />
+<b>Name:</b> Datenbankname, z.B. moodle<br />
+<b>User:</b> Dein Anmeldename für die Datenbank<br />
+<b>Password:</b> Dein Passwort für die Datenbank<br />
+<b>Tabellen-Prefix:</b> Prefix für alle Tabellen (optional)';
+$string['databasesettingssub_oci8po'] = '<b>Typ:</b> Oracle<br />
+<b>Host:</b> unbenutzt - muss leer bleiben!<br />
+<b>Name:</b> vorgegebener Verbindungname zu tnsnames.ora<br />
+<b>User:</b> Dein Anmeldename für die Datenbank<br />
+<b>Password:</b> Dein Passwort für die Datenbank<br />
+<b>Tabellen-Prefix:</b> Prefix für alle Tabellen (notwendig, 2cc. max)';
+$string['databasesettingssub_odbc_mssql'] = '<b>Typ:</b> SQL*Server (over ODBC) <b><font color=\"red\">Experimentell! (nicht für den produktiven Einsatz)</font></b><br />
+<b>Host:</b> vorgegebener DSN-Name im ODBC-Kontrolldialog<br />
+<b>Name:</b> Datenbankname, z.B. moodle<br />
+<b>User:</b> Dein Anmeldename für die Datenbank<br />
+<b>Password:</b> Dein Passwort für die Datenbank<br />
+<b>Tabellen-Prefix:</b> Prefix für alle Tabellen (notwendig)';
+$string['databasesettingssub_postgres7'] = '<b>Typ:</b> PostgreSQL<br />
+<b>Host:</b> z.B. localhost oder db.isp.com<br />
+<b>Name:</b> Datenbankname, z.B. moodle<br />
+<b>User:</b> Dein Anmeldename für die Datenbank<br />
+<b>Password:</b> Dein Passwort für die Datenbank<br />
+<b>Tabellen-Prefix:</b> Prefix für alle Tabellen (notwendig)';
+$string['datarooterror'] = 'Das angegebene Datenverzeichnis ist nicht vorhanden und kann nicht angelegt werden. Korrigiere die Pfad-Eingabe oder lege das Verzeichnis manuell an.';
+$string['dbconnectionerror'] = 'Eine Verbindung zur angegebenen Datenbank konnte nicht hergestellt werden. Bitte überprüfe deine Eingaben.';
+$string['dbwrongencoding'] = 'Die ausgewählte Datenbank läuft unter einem nicht empfohlenen Zeichensatz. Es wäre besser, wenn du eine Unicode (UTF-8) basierte Datenbank verwenden würdest. Du hast die Möglichkeit diesen Schritt zu überspringen. Vermutlich wird dies später bei der Nutzung aber zu Problemen führen.';
+$string['dbwronghostserver'] = 'Du musst den oben genannten \"Host\"-Regeln folgen.';
+$string['dbwrongnlslang'] = 'Die Umgebungsvariable NLS_LANG deines Webservers muss den Zeichensatz AL32UTF8 benutzen. Lies in der PHP-Dokumentation nach, wie du OCI8 richtig einstellst.';
+$string['dbwrongprefix'] = 'Du musst den oben genannten \"Tabellen-Prefix\"- Regeln folgen.';
+$string['directorysettingshead'] = 'Bestätige bitte die Verzeichniseinträge für deine Moodle-Installation';
+$string['directorysettingssub'] = '<p><b>URL-Adresse:</b>
+Gib hier die vollständige URL für deine Moodle-Installation an. Sollte deine Seite über mehrere Adressen erreichbar sein, gib die Adresse an, die am häufigsten genutzt wird. Bitte gib am Ende kein Slash ein.</p>
+
+<p><b>Moodle-Verzeichnis:</b>
+Gib den absoluten Pfad für deine Moodle-Installation an. Bitte prüfe, ob die Groß-/ Kleinschreibung korrekt ist.</p>
+
+<p><b>Datenverzeichnis:</b>
+Moodle benötigt ein Verzeichnis, indem hochgeladene Dateien abgelegt werden. Dieses Verzeichnis muss Lese- und Schreibrechte für den webuser des Servers haben. (üblicherweise \'nobody\' or \'apache\'), aber es sollte nicht direkt über das Internet erreichbar sein.</p>';
+$string['downloadedfilecheckfailed'] = 'Die Prüfung der heruntergeladenen Datei ist gescheitert';
+$string['downloadlanguagenotneeded'] = 'Du kannst die Installation mit dem Sprachpaket \"$a\" fortsetzen.';
+$string['downloadlanguagesub'] = 'Du hast nun die Möglichkeit, ein Sprachpaket herunterzuladen und den Installationsprozess mit dieser Sprache fortzusetzen. <br /><br /> Falls du keinen Download durchführen kannst, wird die Installation auf Englisch fortgeführt. (Wenn die Installation abgeschlossen ist, hast du die Option weitere Sprachpakete herunterzuladen.)';
+$string['environmenterrortodo'] = 'Du musst zunächst alle Probleme mit der Server-Konfiguration beheben, bevor du mit der Installation dieser Moodle-Version fortfahren kannst.';
+$string['environmentsub'] = 'Es wird geprüft, ob die verschiedenen Komponenten deines Systems die Installationsanforderungen erfüllen.';
+$string['gdversionhelp'] = '<p>Auf deinem Server ist vermutlich GD nicht installiert. </p>
+<p>GD ist eine Bibliothek, die von PHP benötigt wird, um damit Bilder von Moodle angezeigt werden können, z.B. Nutzer-Bilder oder grafische Darstellungen der Log-Daten. Moodle arbeitet auch ohne GD. Die o.g. Funktionen stehen dir dann jedoch nicht zur Verfügung.</p>
+<p> Wenn du GD unter UNIX zu PHP hinzufügen möchtest, kompilierst du PHP unter Verwendung des Parameters   with-gd </p>
+<p>Unter Windows kannst du die Datei php.ini bearbeiten und die Zeile libgd.dll auskommentieren.</p>';
+$string['globalsquoteserror'] = 'Prüfe die PHP-Einstellungen: deaktiviere register_globals und/oder aktiviere magic_quotes_gpc';
+$string['iconvrecommended'] = 'Die Installation der ICONV Bibliothek wird zur Leistungsverbesserung dringend empfohlen. Dies ist besonders wichtig, wenn du Sprachen mit anderen als lateinischen Zeichensätzen verwendst.';
+$string['mbstringrecommended'] = 'Die Installation der Bibliothek MBSTRING wird zur Leistungsverbesserung dringend empfohlen. Dies ist besonders wichtig, wenn du Sprachen mit anderen als lateinischen Zeichensätzen verwendest.';
+$string['memorylimithelp'] = '<p>Die PHP-Einstellung memory_limit für deinen Server ist zur Zeit auf $a eingestellt. </p>
+<p>Dies wird vermutlich zu Problemen führen, wenn du Moodle mit vielen Aktivitäten oder vielen Nutzer/innen verwendst. </p>
+<p>Wir empfehlen die Einstellung zu erhöhen. Empfohlen werden 16M oder mehr. Dies kannst du auf verschiedene Arten machen:</p>
+<ol>
+<li>Wenn du PHP neu kompilieren kannst, nimm die Einstellung <i>--enable-memory-limit</i>. Dann kann Moodle die Einstellung selber vornehmen.
+<li>Wenn du Zugriff auf die Datei php.ini hast, kannst du die Einstellung <b>memory_limit</b> selber auf z.B. 16M anpassen. Wenn du selber keinen Zugriff hast, fragst du den Server-Admin, dies für dich zu tun.
+<li>Auf einigen PHP-Servern kannst du eine .htaccess-Datei im Moodle-Verzeichnis einrichten. Trage darin die folgende Zeile ein: <p><blockquote>php_value memory_limit 16M</blockquote></p>
+<p>Achtung: auf einigen Servern hindert diese Einstellung <b>alle</b> PHP-Seiten und du erhältst Fehlermeldungen. Entferne dann den Eintrag in der .htaccess-Datei wieder.</p></li>
+</ol>';
+$string['mssqlextensionisnotpresentinphp'] = 'PHP wurde nicht richtig konfiguriert, um über die MSSQL-Erweiterung mit SQL*Server zu kommunizieren. Bitte prüfe die Datei php.ini oder kompiliere PHP neu.';
+$string['mysql416bypassed'] = 'Wenn du in deiner Website ausschließlich ISO-8859-1 (lateinische) Sprachen verwenden, kannst du eine MySQL-Version ab 4.1.12 (oder höher) verwenden.';
+$string['mysqlextensionisnotpresentinphp'] = 'PHP wurde nicht richtig konfiguriert, um über die MySQL-Erweiterung mit MySQL zu kommunizieren. Bitte prüfe die Datei php.ini oder kompiliere PHP neu.';
+$string['ociextensionisnotpresentinphp'] = 'PHP wurde nicht richtig konfiguriert, um über die OCI8-Erweiterung mit Oracle zu kommunizieren. Bitte prüfe die Datei php.ini oder kompiliere PHP neu.';
+$string['odbcextensionisnotpresentinphp'] = 'PHP wurde nicht richtig konfiguriert, um über die ODBC-Erweiterung mit SQL*Server zu kommunizieren. Bitte prüfe die Datei php.ini oder kompiliere PHP neu.';
 $string['parentlanguage'] = 'de_utf8';
-$string['password'] = 'Kennwort';
-$string['previous'] = 'Frühere';
-$string['status'] = 'Status';
+$string['pgsqlextensionisnotpresentinphp'] = 'PHP wurde nicht richtig konfiguriert, um über die PGSQL-Erweiterung mit PostgreSQL zu kommunizieren. Bitte prüfe die Datei php.ini oder kompiliere PHP neu.';
+$string['php50restricted'] = 'PHP 5.0.x hat eine Reihe bekannter Fehler! Du solltest stattdessen die Versionen 5.1.x bzw. 4.3.x/4.4.x benutzen.';
+$string['phpversionhelp'] = '<p>Moodle erwartet PHP mindestens in der Version 4.3.0/4.4.0 oder 5.1.0 (5.0.x weist eine Reihe bekannter Fehler auf).</p>
+<p>Du benutzt zur Zeit die Version $a.</p>
+<p>Du musst deine PHP-Verson aktualisieren oder auf einen Rechner wechseln, der eine neuere Version von PHP nutzt.<br />
+(Im Falle von 5.0.x könntest du auch zu einer Version 4.3.x/4.4.x downgraden)</p>';
+$string['remotedownloadnotallowed'] = 'Der Download von Komponenten auf deinen Server ist nicht erlaubt (allow_url_fopen ist deaktiviert). <br /><br /> Die Datei <a href=\"$a->url\">$a->url</a> muss manuell heruntergeladen werden. Kopiere die Datei nach \"$a->dest\" auf deinen Server und entpacke sie dort.';
 $string['thischarset'] = 'UTF-8';
 $string['thislanguage'] = 'Deutsch - Du';
-$string['user'] = 'Nutzer';
+$string['unicoderecommended'] = 'Es wird empfohlen, alle Daten im Format Unicode UTF8 zu speichern. Neuinstallationen sollten mit Datenbanken vorgenommen werden, die als Standardzeichensatz UTF8 benutzen. Wenn du ein Upgrade durchführst, solltest du die UTF8-Migration starten (Admin-Seite).';
+$string['unicoderequired'] = 'Es ist notwendig, alle Daten im Format Unicode UTF8 zu speichern. Neuinstallationen müssen mit Datenbanken vorgenommen werden, die als Standardzeichensatz UTF8 benutzen. Wenn du ein Upgrade durchführst, solltest du die UTF8-Migration starten (Admin-Seite).';
+$string['welcomep20'] = 'Du hast das Paket <strong>$a->packname $a->packversion</strong> erfolgreich auf deinem Computer installiert.';
+$string['welcomep30'] = 'Diese Version von <strong>$a->installername</strong> enthält folgende Anwendungen, mit denen du <strong>Moodle</strong> ausführen kannst:';
+$string['welcomep60'] = 'Die folgenden Seiten führen dich in einfachen Schritten durch die Konfiguration und Installation von <strong>Moodle</strong> auf deinem Computer. Du kannst die vorgeschlagenen Einstellungen übernehmen oder an deine Bedürfnisse anpassen.';
+$string['welcomep70'] = 'Klicke auf den \"Weiter\"-Button, um mit dem Setup von <string>Moodle</string> fortzufahren.';
 ?>

install/lang/de_utf8/installer.php

@@ -17,25 +17,25 @@ z.B.: <br /> <br /><b>moodleadmin</b><br />
 Dies ändert die Links für das Admin-Verzeichnis in Moodle.';
 $string['bypassed'] = 'Unberücksichtigt';
 $string['cannotcreatelangdir'] = 'Das Verzeichnis \"lang\" kann nicht angelegt werden.';
-$string['cannotcreatetempdir'] = 'Temporäres Verzeichnis kann nicht angelegt werden.';
+$string['cannotcreatetempdir'] = 'Das temporäre Verzeichnis kann nicht angelegt werden.';
 $string['cannotdownloadcomponents'] = 'Komponenten können nicht heruntergeladen werden.';
 $string['cannotdownloadzipfile'] = 'ZIP-Datei kann nicht heruntergeladen werden.';
 $string['cannotfindcomponent'] = 'Komponente wurde nicht gefunden.';
-$string['cannotsavemd5file'] = 'md5-Datei konnte nicht gespeichert werden.';
-$string['cannotsavezipfile'] = 'ZIP-Datei konnte nicht gespeichert werden';
-$string['cannotunzipfile'] = 'Datei konnte nicht entpackt werden.';
+$string['cannotsavemd5file'] = 'Die md5-Datei konnte nicht gespeichert werden.';
+$string['cannotsavezipfile'] = 'Die ZIP-Datei konnte nicht gespeichert werden';
+$string['cannotunzipfile'] = 'Die Datei konnte nicht entpackt werden.';
 $string['caution'] = 'Warnung';
 $string['check'] = 'Prüfen';
 $string['chooselanguagehead'] = 'Eine 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['compatibilitysettingshead'] = '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['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 Moodle- Hauptverzeichnis kopieren.';
+$string['configfilenotwritten'] = 'Das Installationsscript kann die Datei config.php, welche die gewählten Einstellungen enthält, nicht automatisch erstellen. Der web-user hat keine Schreibrechte für das Moodle-Verzeichnis. Sie können den folgenden Code manuell in der Datei config.php speichern und diese dann ins Hauptverzeichnis Ihrer Moodle-Installation kopieren.';
 $string['configfilewritten'] = 'Die Datei config.php wurde erfolgreich erstellt';
 $string['configurationcompletehead'] = 'Die Konfiguration ist abgeschlossen.';
-$string['configurationcompletesub'] = 'Moodle speichert Ihre Konfigurationseinstellungen nun im root-Verzeichnis Ihrer Moodle-Installation.';
+$string['configurationcompletesub'] = 'Moodle speichert Ihre Konfigurationseinstellungen nun im Hauptverzeichnis Ihrer Moodle-Installation.';
 $string['continue'] = 'Weiter';
 $string['database'] = 'Datenbank';
 $string['databasecreationsettingshead'] = 'Sie müssen Einstellungen für die Datenbank konfigurieren, in der die meisten Moodle-Daten abgelegt werden. Der Installationsprozess erstellt die Datenbanktabellen automatisch auf der Grundlage der Einstellungen.';
@@ -52,7 +52,13 @@ $string['databasesettingssub'] = '<b>Typ:</b> mysql oder postgres7<br />
 <b>Nutzer:</b> Ihr Anmeldename für die Datenbank<br />
 <b>Passwort:</b> Ihr Passwort für die Datenbank<br />
 <b>Tabellen-Prefix:</b> optionaler Prefix für alle Tabellen';
-$string['databasesettingssub_mssql'] = '<b>Typ:</b> SQL*Server<br />
+$string['databasesettingssub_mssql'] = '<b>Typ:</b> SQL*Server (ohne UTF-8)<br />
+<b>Host:</b> z.B. localhost oder db.isp.com<br />
+<b>Name:</b> Datenbankname, z.B. moodle<br />
+<b>User:</b> Ihr Anmeldename für die Datenbank<br />
+<b>Password:</b> Ihr Passwort für die Datenbank<br />
+<b>Tabellen-Prefix:</b> Prefix für alle Tabellen (notwendig)';
+$string['databasesettingssub_mssql_n'] = '<b>Typ:</b> SQL*Server (mit UTF-8)<br />
 <b>Host:</b> z.B. localhost oder db.isp.com<br />
 <b>Name:</b> Datenbankname, z.B. moodle<br />
 <b>User:</b> Ihr Anmeldename für die Datenbank<br />
@@ -89,7 +95,8 @@ $string['dbcreationerror'] = 'Fehler beim Anlegen der Datenbank. Die Datenbank k
 $string['dbhost'] = 'Name des Datenbankservers';
 $string['dbprefix'] = 'Prefix für alle Tabellen';
 $string['dbtype'] = 'Datenbankart';
-$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.';
+$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['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.';
@@ -106,19 +113,19 @@ web-user des Servers haben. (üblicherweise \'nobody\' or \'apache\'), aber es s
 $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['download'] = 'Herunterladen';
-$string['downloadedfilecheckfailed'] = 'Prüfung der heruntergeladenen Datei ist gescheitert';
-$string['downloadlanguagebutton'] = 'Download des \"$a\" Sprachpakets';
+$string['downloadedfilecheckfailed'] = 'Die 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['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['environmenterrortodo'] = 'Sie müssen zunächst alle Probleme mit Einstellungen des Servers beheben, bevor Sie mit der Installation von Moodle fortfahren können.';
+$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['environmentrecommendinstall'] = 'sollte installiert bzw. aktiviert werden';
-$string['environmentrecommendversion'] = 'Version $a->needed wird empfohlen. Derzeit ist $a->current installiert.';
-$string['environmentrequireinstall'] = 'muss installiert /aktiviert werden.';
-$string['environmentrequireversion'] = 'Version $a->needed muss installiert werden. Derzeit ist $a->current installiert.';
+$string['environmentrecommendinstall'] = 'sollte installiert und aktiviert sein.';
+$string['environmentrecommendversion'] = 'Version $a->needed wird empfohlen - aktuell ist $a->current installiert.';
+$string['environmentrequireinstall'] = 'muss installiert und aktiviert sein.';
+$string['environmentrequireversion'] = 'Version $a->needed ist erforderlich - aktuell ist $a->current installiert.';
 $string['environmentsub'] = 'Es wird geprüft, ob die verschiedenen Komponenten Ihres Systems die Installationsanforderungen erfüllen.';
-$string['environmentxmlerror'] = 'Beim Auslesen der Einstellungen auf dem Server ist ein Fehler aufgetreten ($a->error_code)';
+$string['environmentxmlerror'] = 'Beim Auslesen der Server-Konfiguration ist ein Fehler aufgetreten ($a->error_code)';
 $string['error'] = 'Fehler';
 $string['fail'] = 'Fehlgeschlagen';
 $string['fileuploads'] = 'Dateien hochladen';
@@ -129,11 +136,11 @@ $string['gdversionhelp'] = '<p>Auf Ihrem Server ist vermutlich GD nicht installi
 <p>GD ist eine Bibliothek, die von PHP benötigt wird, um damit Bilder von Moodle angezeigt werden können, z.B. Nutzer-Bilder oder grafische Darstellungen der Log-Daten. Moodle arbeitet auch ohne GD. Die o.g. Funktionen stehen Ihnen dann jedoch nicht zur Verfügung.</p>
 <p> Wenn Sie GD unter UNIX zu PHP hinzufügen wollen, kompilieren Sie PHP unter Verwendung des Parameters   with-gd </p>
 <p>Unter Windows können Sie die Datei php.ini bearbeiten und die Zeile libgd.dll auskommentieren.</p>';
-$string['globalsquotes'] = 'Unsichere Einstellung von Globals';
+$string['globalsquotes'] = 'Unsichere Einstellung von Globalparametern';
 $string['globalsquoteserror'] = 'Prüfen Sie die PHP-Einstellungen: deaktivieren Sie register_globals und/oder aktivieren Sie magic_quotes_gpc';
 $string['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'] = 'Information/en';
+$string['info'] = 'Informationen';
 $string['installation'] = 'Installation';
 $string['invalidmd5'] = 'md5 ungültig';
 $string['langdownloaderror'] = 'Leider konnte die Sprache \"$a\" nicht installiert werden. Die Installation wird auf Englisch fortgesetzt.';
@@ -141,25 +148,26 @@ $string['langdownloadok'] = 'Die Installation der Sprache \"$a\" war erfolgreich
 $string['language'] = 'Sprache';
 $string['magicquotesruntime'] = 'Magic Quotes Run Time';
 $string['magicquotesruntimeerror'] = 'Dies sollte ausgeschaltet sein (\'off\')';
-$string['mbstringrecommended'] = 'Die Installation der MBSTRING Bibliothek wird zur Leistungsverbesserung dringend empfohlen. Dies ist besonders wichtig, wenn Sie Sprachen mit anderen als lateinischen Zeichensätzen verwenden.';
+$string['mbstringrecommended'] = 'Die Installation der Bibliothek MBSTRING wird zur Leistungsverbesserung dringend empfohlen. Dies ist besonders wichtig, wenn Sie Sprachen mit anderen als lateinischen Zeichensätzen verwenden.';
 $string['memorylimit'] = 'Memory Limit';
-$string['memorylimiterror'] = 'Die PHP-Speichereinstellung memory_limit ist zu niedrig. Es wird bei der künftigen Nutzung vermutlich zu Problemen kommen.';
+$string['memorylimiterror'] = 'Die PHP-Speichereinstellung memory_limit ist zu niedrig. Dies könnte später zu Problemen führen.';
 $string['memorylimithelp'] = '<p>Die PHP-Einstellung memory_limit für Ihren Server ist zur Zeit auf $a eingestellt. </p>
 <p>Dies wird vermutlich zu Problemen führen, wenn Sie Moodle mit vielen Aktivitäten oder vielen Nutzer/innen verwenden. </p>
 <p>Wir empfehlen die Einstellung zu erhöhen. Empfohlen werden 16M oder mehr. Dies können Sie auf verschiedene Arten machen:</p>
 <ol>
 <li>Wenn Sie PHP neu kompilieren können, nehmen Sie die Einstellung <i>--enable-memory-limit</i>. Dann kann Moodle die Einstellung selber vornehmen.
-<li>Wenn Sie Zugriff auf die Datei php.ini haben, können Sie die Einstellung <b>memory_limit</b> selber auf z.B. 16M anpassen. Wenn Sie selber keinen Zugriff haben, fragen Sie den/die Administrator/in, dies für Sie zu tun.
+<li>Wenn Sie Zugriff auf die Datei php.ini haben, können Sie die Einstellung <b>memory_limit</b> selber auf z.B. 16M anpassen. Wenn Sie selber keinen Zugriff haben, fragen Sie den Server-Admin, dies für Sie zu tun.
 <li>Auf einigen PHP-Servern können Sie eine .htaccess-Datei im Moodle-Verzeichnis einrichten. Tragen Sie darin die folgende Zeile ein: <p><blockquote>php_value memory_limit 16M</blockquote></p>
 <p>Achtung: auf einigen Servern hindert diese Einstellung <b>alle</b> PHP-Seiten und Sie erhalten Fehlermeldungen. Entfernen Sie dann den Eintrag in der .htaccess-Datei wieder.</p></li>
 </ol>';
 $string['missingrequiredfield'] = 'Einige erforderliche Felder sind nicht ausgefüllt.';
 $string['moodledocslink'] = 'Moodle-Dokumentation für diese Seite';
 $string['mssql'] = 'SQL*Server (mssql)';
+$string['mssql_n'] = 'SQL*Server mit UTF-8-Unterstützung (mssql_n)';
 $string['mssqlextensionisnotpresentinphp'] = 'PHP wurde nicht richtig konfiguriert, um über die MSSQL-Erweiterung mit SQL*Server zu kommunizieren. Bitte prüfen Sie die Datei php.ini oder kompilieren Sie PHP neu.';
 $string['mysql'] = 'MySQL (mysql)';
-$string['mysql416bypassed'] = 'Wenn Sie auf Ihrer Site ausschließlich ISO-8859-1 (lateinische) Sprachen verwenden, können Sie die derzeitige MySQL-Version 4.1.12 (oder höher) verwenden.';
-$string['mysql416required'] = 'MySQL 4.1.16 (oder höher) ist für Moodle 1.6 unbedingt erforderlich, um sicherzustellen, dass alle Daten künftig nach UTF-8 konvertiert werden können.';
+$string['mysql416bypassed'] = 'Wenn Sie in Ihrer Website ausschließlich ISO-8859-1 (lateinische) Sprachen verwenden, können Sie eine MySQL-Version ab 4.1.12 (oder höher) verwenden.';
+$string['mysql416required'] = 'MySQL 4.1.16 (oder höher) ist für Moodle 1.6 unbedingt erforderlich, um eine Datenkonvertierung nach UTF-8 sicherzustellen.';
 $string['mysqlextensionisnotpresentinphp'] = 'PHP wurde nicht richtig konfiguriert, um über die MySQL-Erweiterung mit MySQL zu kommunizieren. Bitte prüfen Sie die Datei php.ini oder kompilieren Sie PHP neu.';
 $string['name'] = 'Name';
 $string['next'] = 'Nächste';
@@ -181,18 +189,20 @@ $string['phpversionhelp'] = '<p>Moodle erwartet PHP mindestens in der Version 4.
 (Im Falle von 5.0.x könnten Sie auch zu einer Version 4.3.x/4.4.x downgraden)</p>';
 $string['postgres7'] = 'PostgreSQL (postgres7)';
 $string['previous'] = 'Frühere';
-$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 Ihrem Server und entpacken Sie sie dort.';
+$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';
 $string['safemode'] = 'Safe Mode';
 $string['safemodeerror'] = 'Die Nutzung von Moodle im Safe Mode kann zu Schwierigkeiten führen.';
 $string['sessionautostart'] = 'Session Auto Start';
-$string['sessionautostarterror'] = 'Diese Option sollte abgeschaltet sein.';
+$string['sessionautostarterror'] = 'Diese Option sollte abgeschaltet sein';
 $string['skipdbencodingtest'] = 'Prüfung der Datenbank-Verschlüsselung überspringen';
 $string['status'] = 'Status';
 $string['thischarset'] = 'UTF-8';
 $string['thislanguage'] = 'Deutsch';
-$string['user'] = 'Nutzer/in';
+$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['user'] = 'Nutzer';
 $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:';

install/lang/en_utf8/installer.php

@@ -155,7 +155,7 @@ $string['gdversionhelp'] = '<p>Your server does not seem to have GD installed.</
 
 <p>To add GD to PHP under Unix, compile PHP using the --with-gd parameter.</p>
 
-<p>Under Windows you can usually edit php.ini and uncomment the line referencing libgd.dll.</p>';
+<p>Under Windows you can usually edit php.ini and uncomment the line referencing php_gd2.dll.</p>';
 $string['globalsquotes'] = 'Insecure Handling of Globals';
 $string['globalsquoteserror'] = 'Fix your PHP settings: disable register_globals and/or enable magic_quotes_gpc';
 $string['help'] = 'Help';
@@ -229,6 +229,8 @@ $string['skipdbencodingtest'] = 'Skip DB Encoding Test';
 $string['status'] = 'Status';
 $string['thischarset'] = 'UTF-8';
 $string['thislanguage'] = 'English';
+$string['unicoderecommended'] = 'Storing all your data in Unicode (UTF-8) is recommended. New installations should be performed into databases that have their default character set as Unicode.  If you are upgrading, you should perform the UTF-8 migration process (see the Admin page).';
+$string['unicoderequired'] = 'It is required that you store all your data in Unicode format (UTF-8). New installations must be performed into databases that have their default character set as Unicode.  If you are upgrading, you should perform the UTF-8 migration process (see the Admin page).';
 $string['user'] = 'User';
 $string['welcomep10'] = '$a->installername ($a->installerversion)';
 $string['welcomep20'] = 'You are seeing this page because you have successfully installed and 

install/lang/es_utf8/installer.php

@@ -52,7 +52,43 @@ $string['databasesettingssub'] = '<b>Tipo:</b> mysql o postgres7<br />
 <b>Servidor:</b> p.ej.: localhost o db.tudominio.com<br />
 <b>Usuario:</b> el usuario propietario de tu base de datos<br />
 <b>Contraseña:</b> la contraseña del usuario de la base de datos<br />
-<b>Prefijo de tablas:</b>  prefijo opcional para utilizar en todas las tablas';
+<b>Prefijo de tablas:</b>  prefijo opcional a usar en los nombres de las tablas';
+$string['databasesettingssub_mssql'] = '<b>Tipo:</b> SQL*Server (no UTF-8) <b><font color=\"red\">Experimental! (no usar en modo de producción)</font></b><br />
+<b>Servidor:</b> eg localhost o db.isp.com<br />
+<b>Nombre:</b> nombre de la base de datos, eg moodle<br />
+<b>Usuario:</b> usuario de la base de datos<br />
+<b>Contraseña:</b> contraseña de la base de datos<br />
+<b>Prefijo de tablas:</b> prefijo a usar en los nombres de las tablas (obligatorio)';
+$string['databasesettingssub_mssql_n'] = '<b>Tipo:</b> SQL*Server (UTF-8 habilitado)<br />
+<b>Servidor:</b> eg localhost o db.isp.com<br />
+<b>Nombre:</b> nombre de la base de datos, eg moodle<br />
+<b>Usuario:</b> usuario de la base de datos<br />
+<b>Contraseña:</b> contraseña de la base de datos<br />
+<b>Prefijo de tablas:</b> prefijo a usar en los nombres de las tablas (obligatorio)';
+$string['databasesettingssub_mysql'] = '<b>Tipo:</b> MySQL<br />
+<b>Servidor:</b> eg localhost o db.isp.com<br />
+<b>Nombre:</b> nombre de la base de datos, eg moodle<br />
+<b>Usuario:</b> usuario de la base de datos<br />
+<b>Contraseña:</b> contraseña de la base de datos<br />
+<b>Prefijo de tablas:</b> prefijo a usar en los nombres de las tablas (opcional)';
+$string['databasesettingssub_oci8po'] = '<b>Tipo:</b> Oracle<br />
+<b>Servidor:</b> no usado, puede dejarse en blanco<br />
+<b>Nombre:</b> nombre de la conexión tnsnames.ora<br />
+<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, máx. 2cc.)';
+$string['databasesettingssub_odbc_mssql'] = '<b>Tipo:</b> SQL*Server (sobre ODBC) <b><font color=\"red\">Experimental! (no usar en modo de producción)</font></b><br />
+<b>Servidor:</b> nombre del DSN en el panel de control ODBC<br />
+<b>Nombre:</b> nombre de la base de datos, eg moodle<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['databasesettingssub_postgres7'] = '<b>Tipo:</b> PostgreSQL<br />
+<b>Servidor:</b> eg localhost o db.isp.com<br />
+<b>Nombre:</b> nombre de la base de datos, eg moodle<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['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.';
@@ -61,7 +97,10 @@ $string['dbhost'] = 'Servidor';
 $string['dbprefix'] = 'Prefijo de tablas';
 $string['dbtype'] = 'Tipo';
 $string['dbwrongencoding'] = 'La base de datos seleccionada está ejecutándose bajo una codificación no recomendada ($a). Convendría usar en su lugar una base de datos con codificación Unicode (UTF-8). En cualquier caso, usted puede pasar por alto esta prueba seleccionando \"Pasar por alto la prueba de codificación BD\", si bien tal vez tenga problemas en el futuro.';
-$string['directorysettingshead'] = 'Por favor confirme las siguientes localizaciones de su instalación';
+$string['dbwronghostserver'] = 'Debe seguir las reglas \"Host\" tal como se explicó más arriba.';
+$string['dbwrongnlslang'] = 'La variable contextual NLS_LANG de su servidor web debe usar el conjunto de caracteres AL32UTF8. Revise la documentación PHP para ver cómo se configura adecuadamente OCI8.';
+$string['dbwrongprefix'] = 'Debe seguir las reglas \"Prefijo de Tablas\" como se explicó más arriba.';
+$string['directorysettingshead'] = 'Por favor, confirme las siguientes direcciones de la instalación de Moodle';
 $string['directorysettingssub'] = '<b>Dirección Web:</b>
 Especifique la dirección web completa en la que se accederá a Moodle.
 Si su sitio es accesible desde diferentes URLs entonces elija
@@ -103,7 +142,7 @@ $string['gdversionhelp'] = '<p>Su servidor parece no tener el GD instalado.</p>
 
 <p>Para agregar GD a PHP en entorno Unix, compile PHP usando el parámetro --with-gd.</p>
 
-<p>En un entorno Windows, puede editar php.ini y quitar los comentarios de la línea referida a libgd.dll.</p>';
+<p>En un entorno Windows, puede editar php.ini y quitar los comentarios de la línea referida a php_gd2.dll.</p>';
 $string['globalsquotes'] = 'Manejo Inseguro de Ajustes Globales';
 $string['globalsquoteserror'] = 'Fije sus ajustes PHP: deshabilite register_globals y/o habilite magic_quotes_gpc';
 $string['help'] = 'Ayuda';
@@ -137,22 +176,32 @@ a, digamos, 16M. Si no lo tiene, pida a su administrador que lo haga por usted.<
 </ol>';
 $string['missingrequiredfield'] = 'Falta algún campo necesario';
 $string['moodledocslink'] = 'Moodle Docs para esta página';
+$string['mssql'] = 'SQL*Server (mssql)';
+$string['mssql_n'] = 'SQL*Server con UTF-8 (mssql_n)';
+$string['mssqlextensionisnotpresentinphp'] = 'PHP no se ha configurado adecuadamente con la extensión MSSQL de modo que pueda comunicarse con el SQL*Server. Por favor, compruebe el archivo php.ini o vuelva a compilar PHP.';
+$string['mysql'] = 'MySQL (mysql)';
 $string['mysql416bypassed'] = 'En cualquier caso, si su sitio únicamente está utilizando idiomas ISO-8859-1 (latin), puede continuar con su versión de MySQL actual (4.1.12 o superior).';
 $string['mysql416required'] = 'MySQL 4.1.16 es la versión mínima requerida para trabajar con Moodle 1.6 y garantizar que toda la información podrá ser convertida a UTF-8 en el futuro.';
 $string['mysqlextensionisnotpresentinphp'] = 'PHP no ha sido adecuadamente configurado con la extensión MySQL de modo que pueda comunicarse con MySQL. Por favor, compruebe el archivo php.ini o recompile PHP.';
 $string['name'] = 'Nombre';
 $string['next'] = 'Siguiente';
+$string['oci8po'] = 'Oracle (oci8po)';
+$string['ociextensionisnotpresentinphp'] = 'PHP no ha sido adecuadamente configurado con la extensión OCI8 de modo que pueda comunicarse con Oracle. Por favor, compruebe el archivo php.ini o vuelva a compilar PHP.';
+$string['odbc_mssql'] = 'SQL*Server over ODBC (odbc_mssql)';
+$string['odbcextensionisnotpresentinphp'] = 'PHP no ha sido adecuadamente configurado con la extensión ODBC de modo que pueda comunicarse con SQL*Server. Por favor, compruebe el archivo php.ini o vuelva a compilar PHP.';
 $string['ok'] = 'OK';
 $string['pass'] = 'Correcto';
 $string['password'] = 'Contraseña';
+$string['pgsqlextensionisnotpresentinphp'] = 'PHP no ha sido adecuadamente configurado con la extensión PGSQL de modo que pueda comunicarse con PostgreSQL. Por favor, compruebe el archivo php.ini o vuelva a compilar PHP.';
 $string['php50restricted'] = 'PHP 5.0.x tiene varios problemas conocidos; por favor, actualícese a la versión 5.1.x o utilice las versiones 4.3.x o 4.4.x';
 $string['phpversion'] = 'Versión PHP';
 $string['phpversionerror'] = 'La versión PHP debe ser 4.1.0 o superior';
 $string['phpversionhelp'] = '<p>Moodle requiere una versión de PHP 4.1.0 o superior.</p>
 <p>Su versión es $a</p>
 <p>Debe actualizar PHP o acudir a otro servidor con una versión más reciente de PHP</p>';
+$string['postgres7'] = 'PostgreSQL (postgres7)';
 $string['previous'] = 'Anterior';
-$string['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['remotedownloadnotallowed'] = 'No está permitido descargar los componentes a su servidor (allow_url_fopen está deshabilitado).<br /><br />Debe descargar el archivo <a href=\"$a->url\">$a->url</a> manualmente, y copiarlo a \"$a->dest\"';
 $string['report'] = 'Informe';
 $string['restricted'] = 'Restringido';
 $string['safemode'] = 'Safe Mode';
@@ -163,6 +212,8 @@ $string['skipdbencodingtest'] = 'Pasar por alto el test de decodificación de la
 $string['status'] = 'Estado';
 $string['thischarset'] = 'UTF-8';
 $string['thislanguage'] = 'Español - Internacional';
+$string['unicoderecommended'] = 'Se recomienda almacenar todos los datos en Unicode (UTF-8). Las instalaciones nuevas deberían ejecutarse en bases de datos cuyo juego de caracteres por defecto fuera Unicode. Si está realizando una actualización, debería llevar a cabo el proceso de migración UTF-8 (vea al respecto la página de Administración).';
+$string['unicoderequired'] = 'Es necesario que almacene todos sus datos en formato Unicode (UTF-8). Las instalaciones nuevas deberían ejecutarse en bases de datos cuyo juego de caracteres por defecto fuera Unicode. Si está realizando una actualización, debería llevar a cabo el proceso de migración UTF-8 (vea al respecto la página de Administración).';
 $string['user'] = 'Usuario';
 $string['welcomep10'] = '$a->installername ($a->installerversion)';
 $string['welcomep20'] = 'Si está viendo esta página es porque ha podido ejecutar el paquete
@@ -175,7 +226,7 @@ $string['welcomep50'] = 'El uso de todas las aplicaciones del paquete está gobe
     licencias. El programa <strong>$a->installername</strong> es 
     <a href=\"http://www.opensource.org/docs/definition_plain.html\">código abierto</a> y se distribuye 
     bajo licencia <a href=\"http://www.gnu.org/copyleft/gpl.html\">GPL</a>.';
-$string['welcomep60'] = 'Las siguientes páginas le guiarán a traves de algunos sencillos pasos para configurar
+$string['welcomep60'] = 'Las siguientes páginas le guiarán a través de algunos sencillos pasos para configurar
     y ajustar <strong>Moodle</strong> en su ordenador. Puede utilizar los valores por defecto sugeridos o,
     de forma opcional, modificarlos para que se ajusten a sus necesidades.';
 $string['welcomep70'] = 'Pulse en el botón \"Siguiente\" para continuar con la configuración de <strong>Moodle</strong>.';
@@ -183,5 +234,5 @@ $string['wrongdestpath'] = 'Ruta de destino errónea.';
 $string['wrongsourcebase'] = 'Base de fuente de URL errónea.';
 $string['wrongzipfilename'] = 'Nombre de archivo ZIP erróneo.';
 $string['wwwroot'] = 'Dirección Web';
-$string['wwwrooterror'] = 'La \'Dirección Web\' parece incorrecto. No se pudo encontrar una instalación de Moodle. El valor ha sido cambiado por el original.';
+$string['wwwrooterror'] = 'La \'Dirección Web\' parece incorrecta. No se pudo encontrar una instalación de Moodle. El valor ha sido cambiado por el original.';
 ?>

install/lang/eu_utf8/installer.php

@@ -14,6 +14,7 @@ $string['admindirname'] = 'Admin direktorioa';
 $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>';
+$string['bypassed'] = 'Saihestua';
 $string['cannotcreatelangdir'] = 'Lang direktorioa ezin da sortu.';
 $string['cannotcreatetempdir'] = 'Temp direktorioa ezin da sortu.';
 $string['cannotdownloadcomponents'] = 'Ezin dira osagaiak jaitsi.';
@@ -81,6 +82,10 @@ $string['downloadlanguagehead'] = 'Hizkuntza-paketea jaitsi';
 $string['downloadlanguagenotneeded'] = 'Instalazio-prozesua lehenetsitako hizkuntzaz jarrai dezakezu, \"$a\".';
 $string['downloadlanguagesub'] = 'Orain zure hizkuntza-paketea jaisteko eta hizkuntza horretan instalazioarekin jarraitzeko aukera daukazu.<br /><br />Jaitsiera eskuragarri ez balitz, prozesuak ingelesez jarraituko luke (instalazioa burututakoan, beste hizkuntzak jaitsi eta instalatu ahal izango dituzu).';
 $string['environmenthead'] = 'Zure ingurunea konprobatzen';
+$string['environmentrecommendinstall'] = 'gomendagarria da instalatuta/gaituta egotea';
+$string['environmentrecommendversion'] = '$a->needed bertsioa gomendatzen da eta zu $a->current ari zara egikaritzen';
+$string['environmentrequireinstall'] = 'derrigorrezkoa da instalatuta/gaituta izatea';
+$string['environmentrequireversion'] = '$a->needed bertsioa beharrezkoa da eta zu $a->current ari zara egikaritzen';
 $string['environmentsub'] = 'Zure zerbitzariaren osagai ezberdinak sistemaren betebeharrekin bat datozen egiaztatzen ari gara';
 $string['error'] = 'Errorea';
 $string['fail'] = 'Errorea';
@@ -94,7 +99,7 @@ $string['gdversionhelp'] = '<p>Zure zerbitzariak GDa instalaturik ez daukala dir
 
 <p>UNIX ingurunean GD PHPri eransteko, PHP konpilatu --with-gd parametroa erabiliz.</p>
 
-<p>Windows ingurunean, php.ini edita dezakezu, libgd.dll-ri dagozkion iruzkinen lerroa kenduz.</p>';
+<p>Windows ingurunean, php.ini edita dezakezu, php_gd2.dll-ri dagozkion iruzkinen lerroa kenduz.</p>';
 $string['globalsquotes'] = 'Ezarpen orokorren erabilera ez segurua';
 $string['globalsquoteserror'] = 'PHP ezarpenak zehaztu: register_globals indargabetu edo/eta magic_quotes_gpc ezarri';
 $string['help'] = 'Laguntza';
@@ -126,12 +131,15 @@ Horrek Moodlek berak memoria-muga ezartzea ahalbidetzen du.</li>
 </ol>';
 $string['missingrequiredfield'] = 'Beharrezko eremuren bat falta da.';
 $string['moodledocslink'] = 'Moodle Doc-ak orri honetarako';
+$string['mysql'] = 'MySQL (mysql)';
 $string['mysqlextensionisnotpresentinphp'] = 'PHP ez da ongi ezarri MySQL luzapenarekin datu-basearekin komunikatzeko. Php.ini fitxategia aztertu edo PHP konpilatu, mesedez.';
 $string['name'] = 'Izena';
 $string['next'] = 'Hurrengoa';
+$string['oci8po'] = 'Oracle (oci8po)';
 $string['ok'] = 'Ongi';
 $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>
@@ -140,6 +148,7 @@ $string['phpversionhelp'] = '<p>Moodlek PHP 4.1.0 edo geroagoko bertsioa behar d
 $string['previous'] = 'Aurrekoa';
 $string['remotedownloadnotallowed'] = 'Osagaiak ezin dira zure zerbitzarira jaitsi (allow_url_fopen ez dago aktibatuta).<br /><br /><a href=\"$a->url\">$a->url</a> fitxategia eskuz jaitsi eta \"$a->dest\" kokapenean kopiatu behar duzu.';
 $string['report'] = 'Txostena';
+$string['restricted'] = 'Baimena behar da';
 $string['safemode'] = 'Modu segurua';
 $string['safemodeerror'] = 'Moodlek arazoak izan ditzake \'modu segurua\' ezarriz gero';
 $string['sessionautostart'] = 'Saioaren hasiera automatikoa';

install/lang/fi_utf8/installer.php

@@ -129,7 +129,7 @@ $string['gdversionhelp'] = '<p>Palvelimellasi ei näyttäisi olevan GD:tä asenn
 
 <p>Lisätäksesi GD:n PHP:hen Unix:in alaisena, käännä PHP käyttäen --with-gd parametria.</p>
 
-<p>Windowsin alaisena voit yleensä muokata php.ini:ä ja olla kommentoimatta rivivertailua libgd.dll.</p>';
+<p>Windowsin alaisena voit yleensä muokata php.ini:ä ja olla kommentoimatta rivivertailua php_gd2.dll.</p>';
 $string['globalsquotes'] = 'Globaalien muuttujien turvaton käsittely';
 $string['help'] = 'Ohje';
 $string['iconvrecommended'] = 'Valinnaisen ICONV-kirjaston asentamista suositellaan  erityisesti silloin jos sivustolla käytetäänuseita eri kieliä.';

install/lang/fr_ca_utf8/installer.php

@@ -33,7 +33,7 @@ $string['fileuploads'] = 'Téléchargement des fichiers';
 $string['fileuploadserror'] = 'Le téléchargement des fichiers sur le serveur doit être activé';
 $string['gdversion'] = 'Version de GD';
 $string['gdversionerror'] = 'La librairie GD doit être activée pour traiter et créer les images';
-$string['gdversionhelp'] = '<p>Il semble que la librairie GD n\'est pas installée sur votre serveur.</p> <p>GD est une librairie requise par PHP pour permettre à Moodle de traiter les images (comme les photos des profils) et de créer des graphiques (par exemple ceux des historiques). Moodle fonctionnera sans GD, mais ces fonctionnalités ne seront pas disponibles pour vous.</p> <p>Sous Unix ou Mac OS X, pour ajouter GD à PHP, vous pouvez compiler PHP avec l\'option <i>--with-gd</i>.</p> <p>Sous Windows, on peut normalement modifier le fichier « php.ini » en enlevant le commentaire de la ligne référençant la librairie libgd.dll.</p>';
+$string['gdversionhelp'] = '<p>Il semble que la librairie GD n\'est pas installée sur votre serveur.</p> <p>GD est une librairie requise par PHP pour permettre à Moodle de traiter les images (comme les photos des profils) et de créer des graphiques (par exemple ceux des historiques). Moodle fonctionnera sans GD, mais ces fonctionnalités ne seront pas disponibles pour vous.</p> <p>Sous Unix ou Mac OS X, pour ajouter GD à PHP, vous pouvez compiler PHP avec l\'option <i>--with-gd</i>.</p> <p>Sous Windows, on peut normalement modifier le fichier « php.ini » en enlevant le commentaire de la ligne référençant la librairie php_gd2.dll.</p>';
 $string['help'] = 'Aide';
 $string['installation'] = 'Installation';
 $string['language'] = 'Langue';

install/lang/fr_utf8/installer.php

@@ -35,6 +35,7 @@ $string['configfilewritten'] = 'Le fichier « config.php » a été cr
 $string['configurationcompletehead'] = 'Configuration terminée';
 $string['configurationcompletesub'] = 'Moodle a tenté d\'enregistrer votre configuration dans un fichier à la racine de votre installation de Moodle.';
 $string['continue'] = 'Continuer';
+$string['curlrecommended'] = 'L\'installation de la bibliothèque optionnelle Curl est vivement recommandée, afin de pouvoir utiliser la fonctionnalité Réseau Moodle.';
 $string['database'] = 'Base de données';
 $string['databasecreationsettingshead'] = 'La base de données dans laquelle sont enregistrées la plupart des données utilisées par Moodle doit maintenant être configurée. Cette base de données sera créée automatiquement par l\'installeur Moodle4Windows avec les options spécifiées ci-dessous.';
 $string['databasecreationsettingssub'] = '<strong>Type&nbsp;:</strong> réglé sur «&nbsp;mysql&nbsp;» par l\'installeur<br />
@@ -123,7 +124,7 @@ $string['fileuploads'] = 'Téléchargement des fichiers';
 $string['fileuploadserror'] = 'Le téléchargement des fichiers sur le serveur doit être activé';
 $string['gdversion'] = 'Version de GD';
 $string['gdversionerror'] = 'La librairie GD doit être activée pour traiter et créer les images';
-$string['gdversionhelp'] = '<p>Il semble que la librairie GD n\'est pas installée sur votre serveur.</p><p>GD est une librairie requise par PHP pour permettre à Moodle de traiter les images (comme les photos des profils) et de créer des graphiques (par exemple ceux des historiques). Moodle fonctionnera sans GD, mais ces fonctionnalités ne seront pas disponibles pour vous.</p><p>Sur Unix ou Mac OS X, pour ajouter GD à PHP, vous pouvez compiler PHP avec l\'option <em>--with-gd</em>.</p><p>Sous Windows, on peut normalement modifier le fichier «&nbsp;php.ini&nbsp;» en enlevant le commentaire de la ligne référençant la librairie libgd.dll.</p>';
+$string['gdversionhelp'] = '<p>Il semble que la librairie GD n\'est pas installée sur votre serveur.</p><p>GD est une librairie requise par PHP pour permettre à Moodle de traiter les images (comme les photos des profils) et de créer des graphiques (par exemple ceux des historiques). Moodle fonctionnera sans GD, mais ces fonctionnalités ne seront pas disponibles pour vous.</p><p>Sur Unix ou Mac OS X, pour ajouter GD à PHP, vous pouvez compiler PHP avec l\'option <em>--with-gd</em>.</p><p>Sous Windows, on peut normalement modifier le fichier «&nbsp;php.ini&nbsp;» en enlevant le commentaire de la ligne référençant la librairie php_gd2.dll.</p>';
 $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['help'] = 'Aide';
@@ -161,6 +162,7 @@ $string['ociextensionisnotpresentinphp'] = 'La configuration de l\'extension OCI
 $string['odbc_mssql'] = 'SQL*Server via ODBC (odbc_mssql)';
 $string['odbcextensionisnotpresentinphp'] = 'La configuration de l\'extension ODBC de PHP n\'a pas été effectuée correctement. De ce fait, PHP ne peut communiquer avec SQL*Server. Veuillez contrôler votre fichier «&nbsp;php.ini&nbsp;» ou recompiler PHP.';
 $string['ok'] = 'Ok';
+$string['opensslrecommended'] = 'L\'installation de la bibliothèque optionnelle OpenSSL est vivement recommandée, afin de pouvoir utiliser la fonctionnalité Réseau Moodle.';
 $string['pass'] = 'Réussi';
 $string['password'] = 'Mot de passe';
 $string['pgsqlextensionisnotpresentinphp'] = 'La configuration de l\'extension PGSQL de PHP n\'a pas été effectuée correctement. De ce fait, PHP ne peut communiquer avec PostgreSQL. Veuillez contrôler votre fichier «&nbsp;php.ini&nbsp;» ou recompiler PHP.';
@@ -181,6 +183,8 @@ $string['skipdbencodingtest'] = 'Ne pas effectuer le test d\'encodage de la base
 $string['status'] = 'Statut';
 $string['thischarset'] = 'UTF-8';
 $string['thislanguage'] = 'Français';
+$string['unicoderecommended'] = 'Il est recommandé de stocker toutes vos données en Unicode (UTF-8). Toute nouvelle installation de Moodle devrait être effectuée dans une base de données ayant comme jeu de caractères par défaut Unicode (UTF-8). Si vous effectuez une mise à jour de Moodle, veuillez procéder à la migration de votre base de données en Unicode (voir la page d\'administration).';
+$string['unicoderequired'] = 'Le stockage des données en format Unicode (UTF-8) est requis.  Toute nouvelle installation de Moodle doit être effectuée dans une base de données ayant comme jeu de caractères par défaut Unicode (UTF-8). Si vous effectuez une mise à jour de Moodle, veuillez procéder à la migration de votre base de données en Unicode (voir la page d\'administration).';
 $string['user'] = 'Utilisateur';
 $string['welcomep10'] = '$a->installername ($a->installerversion)';
 $string['welcomep20'] = 'Vous voyez cette page, car vous avez installé Moodle correctement et lancé le logiciel <strong>$a->packname $a->packversion</strong> sur votre ordinateur. Félicitations&nbsp;!';

install/lang/gu_utf8/installer.php

@@ -0,0 +1,43 @@
+<?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 installer_strings (same dir)
+
+$string['cannotcreatelangdir'] = 'lang dir બનાવી શકાતી નથી.';
+$string['cannotcreatetempdir'] = 'temp dir બનાવી શકાતી નથી.';
+$string['cannotdownloadcomponents'] = 'કમ્પોનન્ટ્સ ડાઊનલોડ કરી શકાતા નથી.';
+$string['cannotdownloadzipfile'] = 'ઝિપ ફાઈલ ડાઊનલોડ કરી શકાતી નથી.';
+$string['cannotfindcomponent'] = 'કમ્પોનન્ટ શોધી શકાતા નથી';
+$string['cannotsavemd5file'] = 'md5 file સેવ કરી શકાતી નથી.';
+$string['cannotsavezipfile'] = 'ZIP file સેવ કરી શકાતી નથી.';
+$string['cannotunzipfile'] = 'ફાઈલને અનઝિપ કરી શકાતી નથી';
+$string['check'] = 'તપાસ';
+$string['closewindow'] = 'આ વિન્ડોને બંધ કરો.';
+$string['componentisuptodate'] = 'કમ્પોનન્ટ અપ ડેઈટ છે.';
+$string['continue'] = 'શરુ રાખો';
+$string['downloadedfilecheckfailed'] = 'ડાઊનલોડ કરેલ ફાઈલનું ચેક નિષ્ફળ રહ્યું';
+$string['error'] = 'ક્ષતિ (Error)';
+$string['help'] = 'મદદ';
+$string['info'] = 'માહિતિ';
+$string['invalidmd5'] = 'અમન્ય md5';
+$string['language'] = 'ભાષા';
+$string['missingrequiredfield'] = 'કેટલાક જરૂરી ફિલ્ડ ગુમ છે';
+$string['moodledocslink'] = 'આ પેઈજ માટેના મુડલ ડોક્યુમેન્ટ';
+$string['name'] = 'નામ';
+$string['next'] = 'આગળ';
+$string['password'] = 'પાસવર્ડ';
+$string['previous'] = 'પહેલાનું';
+$string['report'] = 'રિપોર્ટ';
+$string['restricted'] = 'પ્રતિબંધિત';
+$string['thischarset'] = 'UTF-8';
+$string['thislanguage'] = 'ગુજરાતી';
+$string['user'] = 'યુઝર';
+$string['wrongdestpath'] = 'ખોટો ડેસ્ટીનેશન પાથ.';
+$string['wrongzipfilename'] = 'ખોટું ઝિપ ફાઈલ નામ.';
+?>

install/lang/hu_utf8/installer.php

@@ -52,6 +52,42 @@ $string['databasesettingssub'] = '<strong>Típus:</strong> mysql vagy postgres7<
 <strong>Felhasználó:</strong>az Ön adatbázishoz használt azonosítója<br />
 <strong>Jelszó:</strong> az Ön adatbázishoz használt jelszava<br />
 <strong>Táblázat előtagja:</strong> opcionális előtag az összes táblanévhez';
+$string['databasesettingssub_mssql'] = "<b>Típus:</b> SQL*Server (nem UTF-8) <b><font color=\"red\">Kísérleti! (élesben nem használandó)</font></b><br />
+       <b>Gazdagép:</b> pl. localhost vagy db.isp.com<br />
+       <b>Név:</b> adatbázis neve, pl. moodle<br />
+       <b>Felhasználó:</b> az Ön adatbázis-felhasználói neve<br />
+       <b>Jelszó:</b> az Ön adatbázis-jelszava<br />
+       <b>Táblázati előtag:</b> minden táblázatnévhez használandó előtag (kötelező)";
+$string['databasesettingssub_mssql_n'] = "<b>Típus:</b> SQL*Server (UTF-8-at használ)<br />
+       <b>Gazdagép:</b> pl. localhost vagy db.isp.com<br />
+       <b>Név:</b> adatbázis neve, pl. moodle<br />
+       <b>Felhasználó:</b> az Ön adatbázis-felhasználói neve<br />
+       <b>Jelszó:</b> az Ön adatbázis-jelszava<br />
+       <b>Táblázati előtag:</b> minden táblázatnévhez használandó előtag (kötelező)";
+$string['databasesettingssub_mysql'] = "<b>Típus:</b> MySQL<br />
+       <b>Gazdagép:</b> pl. localhost vagy db.isp.com<br />
+       <b>Név:</b> adatbázis neve, pl. moodle<br />
+       <b>Felhasználó:</b> az Ön adatbázis-felhasználói neve<br />
+       <b>Jelszó:</b> az Ön adatbázis-jelszava<br />
+       <b>Táblázati előtag:</b> minden táblázatnévhez használandó előtag (választható)";
+$string['databasesettingssub_oci8po'] = "<b>Típus:</b> Oracle<br />
+       <b>Gazdagép:</b> pl. localhost vagy db.isp.com<br />
+       <b>Név:</b> adatbázis neve, pl. moodle<br />
+       <b>Felhasználó:</b> az Ön adatbázis-felhasználói neve<br />
+       <b>Jelszó:</b> az Ön adatbázis-jelszava<br />
+       <b>Táblázati előtag:</b> minden táblázatnévhez használandó előtag (kötelező, max. 2 cc)";
+$string['databasesettingssub_odbc_mssql'] = "<b>Típus:</b> SQL*Server (over ODBC) <b><font color=\"red\">Kísérleti! (élesben nem használandó)</font></b><br />
+       <b>Gazdagép:</b> az ODBC kezelőpaneljében megadott DSN neve<br />
+       <b>Név:</b> adatbázis neve, pl. moodle<br />
+       <b>Felhasználó:</b> az Ön adatbázis-felhasználói neve<br />
+       <b>Kelszó:</b> az Ön adatbázis-jelszava<br />
+       <b>Táblázati előtag:</b> minden táblázatnévhez használandó előtag (kötelező)";
+$string['databasesettingssub_postgres7'] = "<b>Típus:</b> PostgreSQL<br />
+       <b>Gazdagép:</b> pl. localhost vagy db.isp.com<br />
+       <b>Név:</b> adatbázis neve, pl. moodle<br />
+       <b>Felhasználó:</b> az Ön adatbázis-felhasználói neve<br />
+       <b>Jelszó:</b> az Ön adatbázis-jelszava<br />
+       <b>Táblázati előtag:</b> minden táblázatnévhez használandó előtag (kötelező)";
 $string['dataroot'] = 'Adatkönyvtár';
 $string['datarooterror'] = 'A megadott \'Adatkönyvtár\' nem létezik vagy nem sikerült létrehozni. Módosítsa az útvonalat vagy hozza létre a könyvtárat.';
 $string['dbconnectionerror'] = 'Nem sikerült a megadott adatbázishoz csatlakozni. Ellenőrizze adatbázisának beállításait.';
@@ -60,6 +96,9 @@ $string['dbhost'] = 'Gazdagép szervere';
 $string['dbprefix'] = 'Táblázat előtagja';
 $string['dbtype'] = 'Típus';
 $string['dbwrongencoding'] = 'A kiválasztott adatbázis egy nem ajánlott kódolást használ ($a). Helyette ajánlatos unikódos (UTF-8) adatbázist használni. Egyébként ezt a tesztet átugorhatja, ha bejelöli alább az \"Adatbázis kódolásának ellenőrzése\" négyzetet, bár így a későbbiekben gondjai támadhatnak.';
+$string['dbwronghostserver'] = "A fentiek szerinti \"Gazdagép\" beállítási szabályait tartsa be.";
+$string['dbwrongnlslang'] = "Webszerverében az NLS_LANG környezetváltozónak az AL32UTF8 karakterkészletet kell használni. Az OCI8 megfelelő beálításával kapcsolatban lásd a PHP dokumentációját.";
+$string['dbwrongprefix'] = "A fentiek szerinti \"Táblázati előtag\" beállítási szabályait tartsa be.";
 $string['directorysettingshead'] = 'Erősítse meg a Moodle telepítésének helyét.';
 $string['directorysettingssub'] = '<strong>Webcím:</strong>
 Adja meg a teljes webcímet, ahol a Moodle elérhető lesz. Ha portálja több URL-ről is elérhető, adja meg azt, amelyet a tanulók leginkább használni fognak. Ne tegyen a végére perjelet.
@@ -96,7 +135,7 @@ $string['gdversionerror'] = 'Képek feldolgozásához és készítéséhez a GD-
 $string['gdversionhelp'] = '<p>Feltehetőleg szerverén nincs telepítve a GD.</p>
 <p>A GD a PHP számára szükséges könyvtár, mellyel a Moodle képeket (például felhasználói ikonokat) tud feldolgozni és újakat tud készíteni (például naplódiagramokat). A Moodle működik GD nélkül is - csak ezek a lehetőség nem lesznek az Ön számára elérhetők.</p>
 <p>A GD Unix alatti PHP-hez való hozzáadásához a PHP-t fordítsa a --with-gd paraméterrel.</p>
-<p>Windows alatt szerkesztheti a php.ini-t: el kell távolítani a megjegyzésjelet a libgd.dll-re hivatkozó sor elejéről.</p>';
+<p>Windows alatt szerkesztheti a php.ini-t: el kell távolítani a megjegyzésjelet a php_gd2.dll-re hivatkozó sor elejéről.</p>';
 $string['globalsquotes'] = 'Globális változók nem biztonságos kezelése';
 $string['globalsquoteserror'] = 'Javítsa ki a PHP beállításait: kapcsolja ki a disable register_globals és/vagy az enable magic_quotes_gpc opciókat';
 $string['help'] = 'Súgó';
@@ -109,7 +148,7 @@ $string['langdownloadok'] = 'A(z) \"$a\" nyelv telepítése sikerült. A telepí
 $string['language'] = 'Nyelv';
 $string['magicquotesruntime'] = 'Futásidejű Magic Quotes';
 $string['magicquotesruntimeerror'] = 'Kikapcsolva kell lennie';
-$string['mbstringrecommended'] = 'A portál teljesítményének javítása érdekében ajánlatos telepíteni az opcionális MBSTRING könyvtárat, különösen, ha a portál támogatja nem latin nyelvek használatát. ';
+$string['mbstringrecommended'] = 'A portál teljesítményének javítása érdekében ajánlatos telepíteni az opcionális MBSTRING könyvtárat, különösen, ha a portál támogatja nem latin nyelvek használatát.';
 $string['memorylimit'] = 'Memóriakorlát';
 $string['memorylimiterror'] = 'A PHP memóriakorlátja túl alacsonyra van állítva... ez a későbbiekben gondot okozhat.';
 $string['memorylimithelp'] = '<p>Szerverén a PHP memóriakorlátja jelenleg $a.</p>
@@ -126,22 +165,34 @@ beállítást pl. 16M-ra. Ha nem éri el az állományt, kérje meg a rendszerad
 </ol>';
 $string['missingrequiredfield'] = 'Egy szükséges mező hiányzik';
 $string['moodledocslink'] = 'Az oldalhoz tartozó Moodle Docs';
+$string['mssql'] = "SQL*Server (mssql)";
+$string['mssql_n'] = "SQL*Server UTF-8 támogatással (mssql_n)";
+$string['mssqlextensionisnotpresentinphp'] = "A PHP nincs megfelelően beállítva az MSSQL-bővítéshez, egy nem tud kommunikálni az SQL*Serverrel.  Ellenőrizze a php.ini állományt vagy fordítsa le újra a PHP-t.";
+$string['mysql'] = "MySQL (mysql)";
 $string['mysql416bypassed'] = 'Ha viszont a portálja CSAK iso-8859-1 (latin) nyelveket használ, továbbra is használhatja a pillanatnyilag telepített MySQL 4.1.12 (vagy magasabb) verziót.';
 $string['mysql416required'] = 'A Moodle 1.6 esetén a MySQL minimális verziószáma a 4.1.16 annak érdekében, hogy a későbbiekben minden adatot UTF-8 formában lehessen tárolni.';
 $string['mysqlextensionisnotpresentinphp'] = 'A PHP nincs jól beállítva a MySQL kiterjesztéshez, így nem tud ele kommunikálni. Ellenőrizze a php.ini fájlt vagy fordítsa újra a PHP-t.';
 $string['name'] = 'Név';
 $string['next'] = 'Következő';
+$string['oci8po'] = "Oracle (oci8po)";
+$string['ociextensionisnotpresentinphp'] = "A PHP nincs megfelelően beállítva az OCI8 bővítéshez, egy nem tud kommunikálni az Oracle-lal. Ellenőrizze a php.ini állományt vagy fordítsa le újra a PHP-t.";
+$string['odbc_mssql'] = "SQL*Server over ODBC (odbc_mssql)";
+$string['odbcextensionisnotpresentinphp'] = "A PHP nincs megfelelően beállítva az ODBC-bővítéshez, egy nem tud kommunikálni az SQL*Serverrel.  Ellenőrizze a php.ini állományt vagy fordítsa le újra a PHP-t.";
 $string['ok'] = 'Rendben';
 $string['pass'] = 'Rendben';
 $string['password'] = 'Jelszó';
+$string['pgsqlextensionisnotpresentinphp'] = "A PHP nincs megfelelően beállítva az PGSQL-bővítéshez, egy nem tud kommunikálni a PostgreSQL-lel.  Ellenőrizze a php.ini állományt vagy fordítsa le újra a PHP-t.";
+$string['php50restricted'] = 'A PHP 5.0.x számos ismert problémával rendelkezik, frissítsen 5.1.x-re vagy térjen vissza a 4.3.x vagy 4.4.x változathoz';
 $string['phpversion'] = 'PHP-verzió';
 $string['phpversionerror'] = 'A PHP-verzió legalább 4.1.0 legyen';
 $string['phpversionhelp'] = '<p>A Moodle használatához legalább PHP 4.1.0 verziója szükséges.</p>
 <p>Az Ön által használt verzió $a</p>
 <p>Frissítse a PHP-verziót vagy térjen át újabb PHP-verziót működtető gazdagépre!</p>';
+$string['postgres7'] = "PostgreSQL (postgres7)";
 $string['previous'] = 'Előző';
 $string['remotedownloadnotallowed'] = 'Az összetevőket nem lehet szerverére letölteni(az allow_url_fopen ki van kapcsolva).<br /><br />A(z) <a href=\"$a->url\">$a->url</a> állományt töltse le kézzel, másolja át szerverén a(z) \"$a->dest\" célkönyvtárba és csomagolja ki ott.';
 $string['report'] = 'Jelentés';
+$string['restricted'] = 'Korlátozott';
 $string['safemode'] = 'Biztonságos mód';
 $string['safemodeerror'] = 'A Moodle bekapcsolt biztonságos mód esetén akadályba ütközhet';
 $string['sessionautostart'] = 'Folyamat automatikus kezdése';
@@ -150,6 +201,8 @@ $string['skipdbencodingtest'] = 'Az adatbázis-kódolás ellenőrzésének kihag
 $string['status'] = 'Állapot';
 $string['thischarset'] = 'UTF-8';
 $string['thislanguage'] = 'Magyar';
+$string['unicoderecommended'] = 'Ajánlott minden adatot unikódban (UTF-8) tárolni. Az új telepítéseket unikód alapkészletű adatbázisokba kell telepíteni. Ha újabb változatra vált, végre kell hajtania az UTF-8-ra való áttérést (lásd a Rendszergazda oldalát).';
+$string['unicoderequired'] = 'Minden adatot unikódban (UTF-8) kell tárolni. Az új telepítéseket unikód alapkészletű adatbázisokba kell telepíteni. Ha újabb változatra vált, végre kell hajtania az UTF-8-ra való áttérést (lásd a Rendszergazda oldalát).';
 $string['user'] = 'Felhasználó';
 $string['welcomep10'] = '$a->installername ($a->installerversion)';
 $string['welcomep20'] = 'Azért látja ezt az oldalt, mert sikeresen telepítette és futtatja a(z) <strong>$a->packname $a->packversion</strong> csomagot számítógépén. Gratulálunk!';

install/lang/is_utf8/installer.php

@@ -28,6 +28,7 @@ $string['compatibilitysettingshead'] = 'Stillingar á PHP athugaðar';
 $string['compatibilitysettingssub'] = 'Vefþjóninn verður að standast allar þessar prófanir til þess að tryggja að Moodle keyri án vandkvæða';
 $string['configfilenotwritten'] = 'Uppsetningarforritið gat ekki myndað config.php skránna sem hefur að geyma stillingar vefsins. Líklegast vegna þess að skrifheimild vantar á Moodle skráarsafnið. Þú getur leyst þetta með að búa til skránna config.php í rót vefins og afritað eftirfarandi kóða í hana.';
 $string['configfilewritten'] = 'config.php skráin hefur verið mynduð';
+$string['configurationcompletehead'] = 'Stillingu lokið';
 $string['configurationcompletesub'] = 'Moodle gerði tilraun til þess að vista uppsetningarskránna í rót Moodle skráarsafnins.';
 $string['continue'] = 'Áfram';
 $string['database'] = 'Gagnagrunnur';
@@ -54,6 +55,16 @@ $string['dbprefix'] = 'fortáknun taflna';
 $string['dbtype'] = 'Tegund';
 $string['dbwrongencoding'] = 'Kótun á uppgefnum gagnagrunni er af tegund ($a) sem ekki er mælt með. Betri kostur er að notast gagnagrunn með Unicode (UTF-8) kótun. Þú getur engu að síður haldið uppsetningunni áfram með því haka við \"Sleppa prófun á gagnagrunni\" hér að neðan, en mátt þá eiga von á vandamálum síðar.';
 $string['directorysettingshead'] = 'Vinsamlegast staðfestu staðsetningu á þessari Moodle uppsetningu';
+$string['directorysettingssub'] = '<b>Vefslóð:</b>
+Gefðu upp fulla vefslóð að Moodle. Ef Moodle er aðgengilegt af fleiri en einni slóð skaltu skrá þá slóð sem líklegast er að nemendur muni nota. Ekki hafa skástrik í endanum.
+<br />
+<br />
+<b>Moodle skráarsafnið:
+Gefðu upp slóðina að skráarsafninu þar sem Moodle er vistað.</p>
+<br />
+<br />
+<b>Gagnamappa:</b>
+Moodle þarf á að halda skráarsafni þar sem gögn eru vistuð. Athugaðu að vefþjónninn verður að hafa bæði les- OG SKRIFHEIMILD á þetta skráarsafn (venjulega \'nobody\' eða \'apache\'). Skráarsafnið á hins vegar ekki að vera aðgengilegt beint í gegnum vefinn.';
 $string['dirroot'] = 'Moodle skráarsafnið';
 $string['dirrooterror'] = 'Ekki tókst að finna Moodle uppsetningu í uppgefnu Moodle skráarsafni. Gildið hér að neðan hefur verið endursett.';
 $string['download'] = 'Sækja';
@@ -62,10 +73,13 @@ $string['downloadlanguagehead'] = 'Sækja tungumálapakka';
 $string['downloadlanguagenotneeded'] = 'Þú getur haldið áfram með uppsetninguna með sjálfgefnum tungumálapakka, \"$a\".';
 $string['downloadlanguagesub'] = 'Nú hefur þú kost á því að sækja tungumálapakka og halda uppsetningunni áfram á því tungumáli.<br /><br />
 Ef þú getur ekki sótt tungumálapakkann þá heldur uppsetningarferlið áfram á ensku. Eftir að uppsetningu lýkur getur þú sótt og sett upp önnur tungumál.';
+$string['environmenterrortodo'] = 'Þú verður að leysa úr öllum villuboðunum hér að ofan áður en haldið er áfram með innsetningu á þessari útgáfu af Moodle!';
 $string['environmentrecommendinstall'] = 'mælum við með að sé uppsett/virkt';
 $string['environmentrecommendversion'] = 'mælt er með útgáfu $a->needed en þú notast við útgáfu $a->current';
 $string['environmentrequireinstall'] = 'verður að vera uppsett/virkt';
 $string['environmentrequireversion'] = 'krafist er útgáfu $a->needed en þú notast við útgáfu $a->current';
+$string['environmentxmlerror'] = 'Villa kom upp við lestur á umhverfisgögnum
+($a->error_code)';
 $string['error'] = 'Villa';
 $string['fail'] = 'Ekki staðið';
 $string['gdversion'] = 'GD útgáfa';
@@ -81,10 +95,13 @@ $string['language'] = 'Tungumál';
 $string['mbstringrecommended'] = 'Mælt er með uppsetningu á MBSTRING safninu í því skyni að auka virkni vefsins, sérstaklega ef vefurinn styður við tungumál sem ekki eru af latneskum stofni (non-latin).';
 $string['missingrequiredfield'] = 'Einhverjir reitir eru enn óútfylltir';
 $string['moodledocslink'] = 'Hjálp fyrir þessa síðu';
+$string['mssql'] = 'SQL *vefþjónn (mssql)';
+$string['mysql'] = 'MySQL (mysql)';
 $string['mysql416bypassed'] = 'Ef vefurinn notast hinsvegar EINUNGIS við iso-8859-1 (latin) stafasettið er óhætt að notast áfram við MySQL 4.1.12 eða yngri útgáfur.';
 $string['mysql416required'] = 'Moodle gerir lágmarkskröfu um MySQL 4.1.16 gagnagrunninn til þess að trygga að mögulegt sé að yfirfæra öll gögn yfir í UTF-8.';
 $string['name'] = 'Nafn';
 $string['next'] = 'Áfram';
+$string['oci8po'] = 'Oracle (oci8po)';
 $string['ok'] = 'OK';
 $string['parentlanguage'] = 'en';
 $string['pass'] = 'Staðið';
@@ -101,6 +118,7 @@ $string['phpversionhelp'] = '<p>Moodle requires a PHP version of at least 4.3.0
 <p>Þú er með útgáfu $a</p>
 <p>Þú verður að uppfæra PHP eða velja vefþjónustu sem býður upp á nýrri útgáfu af PHP!<br/>
 (Ef þú notar útgáfu 5.0.x gætir þú hugsanlega breytt yfir í 4.4.x)</p>';
+$string['postgres7'] = 'PostgreSQL (postgres7)';
 $string['previous'] = 'Til baka';
 $string['report'] = 'Skýrsla';
 $string['restricted'] = 'Aðgangur takmarkaður';

install/lang/it_utf8/installer.php

@@ -69,7 +69,7 @@ $string['gdversionerror'] = 'La libreria GD deve essere presente per elaborare e
 $string['gdversionhelp'] = '<p>Sul vostro server sembra non essere installato il supporto per le librerie GD.</p>
 <p>GD è una libreria che è richiesta dal PHP per permettere a Moodle di elaborare le immagini (come le icone dei profili utente) e creare nuove immagini (come i grafici dei log). Moodle continuerà  a funzionare senza GD - queste caratteristiche non saranno disponibili sulla vostra installazione.</p>
 <p>Per aggiungere GD al PHP su sistemi operativi Unix/Linux, compilare il PHP utilizzando l\'opzione --with-gd.</p>
-<p>Su Windows normalmente è possibile modificare il file php.ini e togliere il commento dalla linea che contiene libgd.dll.</p>';
+<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['help'] = 'Aiuto';
@@ -123,6 +123,8 @@ $string['skipdbencodingtest'] = 'Salta il test del sistema di codifica della bas
 $string['status'] = 'Status';
 $string['thischarset'] = 'UTF-8';
 $string['thislanguage'] = 'Italiano';
+$string['unicoderecommended'] = 'E\' raccomandato che tutti i dati vengano memorizzati in formato Unicode (UTF-8). Le nuove installazioni dovrebbero essere effettuate in database che hanno il proprio set di caratteri default impostato come Unicode. Se si sta facendo un aggiornamento, bisogna eseguire il processo di migrazione UTF-8 (vedi pagina di Amministrazione).';
+$string['unicoderequired'] = 'E\' richiesto che tutti i dati vengano memorizzati in formato Unicode (UTF-8). Le nuove installazioni dovrebbero essere effettuate in database che hanno il proprio set di caratteri default impostato come Unicode. Se si sta facendo un aggiornamento, bisogna eseguire il processo di migrazione UTF-8 (vedi pagina di Amministrazione).';
 $string['user'] = 'Utente';
 $string['welcomep10'] = '$a->installername ($a->installerversion)';
 $string['wrongdestpath'] = 'Percorso della destinazione errato.';

install/lang/ja_utf8/installer.php

@@ -9,7 +9,7 @@
 /// File generated by cvs://contrib/lang2installer/installer_builder
 /// using strings defined in installer_strings (same dir)
 
-$string['admindirerror'] = '設定されたadminディレクトリが間違っています。';
+$string['admindirerror'] = '設定されたadminディレクトリが正しくありません。';
 $string['admindirname'] = 'Adminディレクトリ';
 $string['admindirsettinghead'] = '管理ディレクトリの設定中 ...';
 $string['admindirsettingsub'] = 'まれなケースですが /admin をコントロールパネルまたはその他のページにアクセスするための特別なURLとして使用しているウェブホストがあります。残念ですが、これは標準的なMoodle管理ページのロケーションと衝突します。あなたのインストールに関するadminディレクトリをリネームすることで、この衝突を回避できます。例えば: <br /> <br /><b>moodleadmin</b><br /> <br />
@@ -36,6 +36,7 @@ $string['configfilewritten'] = 'config.phpが正常に作成されました。';
 $string['configurationcompletehead'] = '設定が完了しました。';
 $string['configurationcompletesub'] = 'Moodleは、Moodleインストレーションルートへの設定内容の保存を試みました。';
 $string['continue'] = '続ける';
+$string['curlrecommended'] = 'Moodleネットワーキング機能を有効にするため、Curlライブラリのインストールを強くお勧めします。';
 $string['database'] = 'データベース';
 $string['databasecreationsettingshead'] = 'ほとんどのMoodleデータが保存されるデータベース設定を行ってください。このデータベースはインストーラーにより、下記の設定が指定された形で自動的に作成されます。';
 $string['databasecreationsettingssub'] = '<b>タイプ:</b> インストーラーにより「mysql」に修正されました。<br />
@@ -137,7 +138,7 @@ $string['gdversionhelp'] = '<p>あなたのサーバには、GDがインスト
 
 <p>Unix環境下で、GDをPHPにインストールするには、PHPを --with-gd パラメータでコンパイルしてください。</p>
 
-<p>Windows環境下では、php.iniでlibgd.dllを参照している行のコメントアウトを取り除いてください。</p>';
+<p>Windows環境下では、php.iniでphp_gd2.dllを参照している行のコメントアウトを取り除いてください。</p>';
 $string['globalsquotes'] = '安全では無いGlobalsのハンドリング';
 $string['globalsquoteserror'] = 'PHP設定を修正してください: register_globalsを「Off」および/またはmagic_quotes_gpcを「On」';
 $string['help'] = 'ヘルプ';
@@ -180,6 +181,7 @@ $string['ociextensionisnotpresentinphp'] = 'PHPのOCI8 extensionが適切に設
 $string['odbc_mssql'] = 'SQL*Server over ODBC (odbc_mssql)';
 $string['odbcextensionisnotpresentinphp'] = 'PHPのODBC extensionが適切に設定されていないため、SQL*Serverと通信できません。あなたのphp.iniファイルをチェックするか、PHPを再コンパイルしてください。';
 $string['ok'] = 'OK';
+$string['opensslrecommended'] = 'Moodleネットワーキング機能を有効にするため、OpenSSLライブラリのインストールを強くお勧めします。';
 $string['pass'] = 'パス';
 $string['password'] = 'パスワード';
 $string['pgsqlextensionisnotpresentinphp'] = 'PHPのPGSQL extensionが適切に設定されていないため、PostgreSQLと通信できません。あなたのphp.iniファイルをチェックするか、PHPを再コンパイルしてください。';
@@ -203,6 +205,8 @@ $string['skipdbencodingtest'] = 'DBエンコーディングテストをスキッ
 $string['status'] = '状態';
 $string['thischarset'] = 'UTF-8';
 $string['thislanguage'] = '日本語';
+$string['unicoderecommended'] = 'あなたのすべてのデータをユニコードフォーマット (UTF-8) で保存することが推奨されます。Moodleの新しいインストールは、ユニコードがデフォルトキャラクタにセットされたデータベースに実行される必要があります。アップグレードの場合、UTF-8移行プロセスを実行してださい (詳細は管理ページをご覧ください)。';
+$string['unicoderequired'] = 'あなたのすべてのデータをユニコードフォーマット (UTF-8) で保存することが必須です。Moodleの新しいインストールは、ユニコードがデフォルトキャラクタにセットされたデータベースに実行される必要があります。アップグレードの場合、UTF-8移行プロセスを実行してださい (詳細は管理ページをご覧ください)。';
 $string['user'] = 'ユーザ';
 $string['welcomep10'] = '$a->installername ($a->installerversion)';
 $string['welcomep20'] = 'インストールが正常に完了したため、このページをご覧頂いています。あなたのコンピュータで <strong>$a->packname $a->packversion</strong> パッケージを起動してください。';
@@ -211,9 +215,9 @@ $string['welcomep40'] = 'パッケージには <strong>Moodle $a->moodlerelease
 $string['welcomep50'] = 'このパッケージ内のすべてのアプリケーションの使用は個々のライセンスによって規定されています。全体の <strong>$a->installername</strong> パッケージは <a href=\"http://www.opensource.org/docs/definition_plain.html\">オープンソース</a> であり、<a href=\"http://www.gnu.org/copyleft/gpl.html\">GPL</a>ライセンスの下で配布されています。';
 $string['welcomep60'] = '次からのページは、あなたのコンピュータに <strong>Moodle</strong> を簡単に設定およびセットアップする手順にしたがって進みます。デフォルトの設定を使用することも、必要に応じて任意で設定を変更することもできます。';
 $string['welcomep70'] = '<strong>Moodle</strong>のセットアップを続けるには「次へ」ボタンをクリックしてください。';
-$string['wrongdestpath'] = '宛先パスが間違っています。';
-$string['wrongsourcebase'] = 'ソースURLベースが間違っています。';
-$string['wrongzipfilename'] = 'ZIPファイル名が間違っています。';
+$string['wrongdestpath'] = '宛先パスが正しくありません。';
+$string['wrongsourcebase'] = 'ソースURLベースが正しくありません。';
+$string['wrongzipfilename'] = 'ZIPファイル名が正しくありません。';
 $string['wwwroot'] = 'ウェブアドレス';
-$string['wwwrooterror'] = '「ウェブアドレス」が間違っています - インストール済みMoodleはそこに表示されません。下記の値はリセットされました。';
+$string['wwwrooterror'] = '「ウェブアドレス」が正しくありません - インストール済みMoodleはそこに表示されません。下記の値はリセットされました。';
 ?>

install/lang/ka_utf8/installer.php

@@ -42,7 +42,7 @@ $string['gdversionhelp'] = '<p>როგორც ჩანს თქვენ
 
 <p> GD-ს დასამატებლად PHP-ზე  Unix-ში, შეასრულეთ PHP გამოიყენებთ რა --with-gd პარამეტრს.</p>
 
-<p> Windows გარემოში ჩვეულებრივად შესაძლოა php.ini-ს რედაქტირება და libgd.dll უკომენტაროდ დატოვება უკომენტაროდ .</p>';
+<p> Windows გარემოში ჩვეულებრივად შესაძლოა php.ini-ს რედაქტირება და php_gd2.dll უკომენტაროდ დატოვება უკომენტაროდ .</p>';
 $string['help'] = 'დახმარება';
 $string['info'] = 'ინფორმაცია';
 $string['installation'] = 'ინსტალირება';

install/lang/ko_utf8/installer.php

@@ -35,6 +35,7 @@ $string['configfilewritten'] = '성공적으로 contig.php가 생성되었음.';
 $string['configurationcompletehead'] = '초기 설정 완료';
 $string['configurationcompletesub'] = '무들이 설치 루트디렉토리에 있는 파일에 당신의 설정을 저장하도록 시도하였습니다.';
 $string['continue'] = '계속';
+$string['curlrecommended'] = '무들 네트웍 기능을 활성화하기 위해서는 추가적인 Curl 라이브러리를 설치할 것을 강력히 권고한다.';
 $string['database'] = '데이타 베이스';
 $string['databasecreationsettingshead'] = '대부분의 무들 데이터가 저장될 데이터베이스를 설정해야 합니다. 설치프로그램에 의해 자동으로 아래에 명시된 설정대로 데이터베이스가 생성될 것입니다.';
 $string['databasecreationsettingssub'] = '<b>종류:</b> 설치프로그램에 의해 \"mysql\" 로 고정됨 <br />
@@ -121,7 +122,7 @@ $string['environmenterrortodo'] = '이 무들버전을 설치하기 전에 앞
 $string['environmenthead'] = '구동환경을 점검합니다...';
 $string['environmentrecommendinstall'] = '설치하거나 활성화할 것을 권고합니다.';
 $string['environmentrecommendversion'] = '$a->needed 버전을 권장하고 있는 데 현재 $a->current 을 사용하고 있습니다.';
-$string['environmentrequireinstall'] = '설치하거나 활성화할 것을 권고합니다.';
+$string['environmentrequireinstall'] = '설치하거나 활성화해야만 합니다.';
 $string['environmentrequireversion'] = '$a->needed 버전을 사용하여야 하는데 현재 $a->current 을 사용하고 있습니다.';
 $string['environmentsub'] = '기존 운영체제가 무들의 여러 구성 요소들을 구동하는데 적합한지 점검합니다.';
 $string['environmentxmlerror'] = '환경 설정 데이터 불러들이기 오류 ($a->error_code)';
@@ -179,6 +180,7 @@ $string['ociextensionisnotpresentinphp'] = 'OCI8 익스텐션으로 PHP가 오
 $string['odbc_mssql'] = 'ODBC를 통한 SQL*Server (odbc_mssql)';
 $string['odbcextensionisnotpresentinphp'] = 'ODBC 익스텐션으로 PHP가 SQL*서버와 통신하도록 적절히 설정되지 않았습니다. php.ini 파일을 점검하거나 PHP를 다시 컴파일 하십시오.';
 $string['ok'] = 'OK';
+$string['opensslrecommended'] = '추가적인 OpenSSL 라이브러리를 설치할 것을 강력히 권고한다. 이는 무들 네트웍 기능을 가능하게 할 수 있다.';
 $string['parentlanguage'] = 'ko';
 $string['pass'] = '통과';
 $string['password'] = '비밀번호';
@@ -202,6 +204,8 @@ $string['skipdbencodingtest'] = 'DB 엔코딩 테스트 생략';
 $string['status'] = '상태';
 $string['thischarset'] = 'UTF-8';
 $string['thislanguage'] = '한국어';
+$string['unicoderecommended'] = '모든 자료를 유니코드(UTF-8)로 저장해야 합니다. 새 설정은 기본 문자코드가 유니코드로 저장되어 있다고 가정하고 작동이 됩니다. 만일 업그레이드 중이라면 반드시 UTF-8 변환과정을 수행하여야만 합니다.(관리화면 참조)';
+$string['unicoderequired'] = '여러분의 모든 자료가 유니코드(UTF-8)로 저장되야 합니다. 새 설정은 기본 문자코드가 유니코드로 저장되어 있다고 가정하고 작동이 됩니다. 만일 업그레이드 중이라면 반드시 UTF-8 변환과정을 수행하여야만 합니다.(관리화면 참조)';
 $string['user'] = '사용자';
 $string['welcomep10'] = '$a->installername ($a->installerversion)';
 $string['welcomep20'] = '당신의 컴퓨터에 <strong>$a->packname $a->packversion</strong> 패키지를 성공적으로 설치한 것을 축하합니다!';

install/lang/lo_utf8/installer.php

@@ -0,0 +1,34 @@
+<?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 installer_strings (same dir)
+
+$string['bypassed'] = 'ຂ້າມ';
+$string['check'] = 'ກວດສອບ';
+$string['download'] = 'Download';
+$string['environmenterrortodo'] = 'You must solve all the environmental problems (errors) found above before proceeding to install this Moodle version!';
+$string['environmentrecommendinstall'] = 'is recommended to be installed/enabled';
+$string['environmentrecommendversion'] = 'version $a->needed is recommended and you are running $a->current';
+$string['environmentrequireinstall'] = 'is required to be installed/enabled.';
+$string['environmentrequireversion'] = 'version $a->needed is required and you are running $a->current';
+$string['environmentxmlerror'] = 'Error reading environment data ($a->error_code)';
+$string['gdversion'] = 'GD version';
+$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['language'] = 'ພາສາທີ່ໃຊ້ໃນເວັບ';
+$string['mbstringrecommended'] = 'Installing the optional MBSTRING library is highly recommended in order to improve site performance, particularly if your site is supporting non-latin languages.';
+$string['mysql416bypassed'] = 'However, if your site is using iso-8859-1 (latin) languages ONLY, you may continue using your currently installed MySQL 4.1.12 (or higher).';
+$string['mysql416required'] = 'MySQL 4.1.16 is the minimum version required for Moodle 1.6 in order to guarantee that all data can be converted to UTF-8 in the future.';
+$string['password'] = 'ລະຫັດຜ່ານ';
+$string['php50restricted'] = 'PHP 5.0.x has a number of known problems, please upgrade to 5.1.x or downgrade to 4.3.x or 4.4.x';
+$string['thischarset'] = 'UTF-8';
+$string['thislanguage'] = 'Laotian';
+$string['unicoderecommended'] = 'Storing all your data in Unicode (UTF-8) is recommended. New installations should be performed into databases that have their default character set as Unicode.  If you are upgrading, you should perform the UTF-8 migration process (see the Admin page).';
+$string['unicoderequired'] = 'It is required that you store all your data in Unicode format (UTF-8). New installations must be performed into databases that have their default character set as Unicode.  If you are upgrading, you should perform the UTF-8 migration process (see the Admin page).';
+$string['user'] = 'ສະມາຊິກ';
+?>

install/lang/mi_wwow_utf8/installer.php

@@ -0,0 +1,132 @@
+<?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 installer_strings (same dir)
+
+$string['admindirerror'] = 'He hē te whaiaronga whakahaere i whakapūtāhia';
+$string['admindirname'] = 'Whaiaronga Whakahaere';
+$string['admindirsettinghead'] = 'E tautuhi ana i te whaiaronga whakahere…';
+$string['admindirsettingsub'] = 'Ka whakamahi ētahi kaihautū tukutuku ruarua i te /admin hei URL hira kia āhei ai koe ki te mea pēnei i te paewhiri mana. Heoi, ka papā tēnei ki te tauwāhi paerewa mō ngā whārangi whakahaere o Moodle. Mā te whakaingoa anō i te whaiaronga whakahaere i rō tāutanga, me te waiho i taua ingoa hōu ki konei ka taea e koe te whakatika. Hei tauira ake:<br /><br/><b>moodleadmin</b><br /> <br /> Ka whakatika tēnei i ngā hononga whakahaere i Moodle.';
+$string['bypassed'] = 'Kua waiho ki te taha';
+$string['cannotcreatelangdir'] = 'Kāore i taea te whaiaronga reo.';
+$string['cannotcreatetempdir'] = 'Kāore i taea te whaiaronga rangitaki.';
+$string['cannotdownloadcomponents'] = 'Kāore i taea ngā wae te tikiake.';
+$string['cannotdownloadzipfile'] = 'Kāore i taea te kōnae KŌTUI te tikiake.';
+$string['cannotfindcomponent'] = 'Kāore i taea te wae te kite.';
+$string['cannotsavemd5file'] = 'Kāore i taea te kōnae md5 te tiaki.';
+$string['cannotsavezipfile'] = 'Kāore i taea te kōnae KŌTUI te tiaki.';
+$string['cannotunzipfile'] = 'Kāore i taea te kōnae te whewhera.';
+$string['caution'] = 'Whakatūpato';
+$string['check'] = 'Taki';
+$string['chooselanguagehead'] = 'Kōwhiritia tētahi reo';
+$string['chooselanguagesub'] = 'Kōwhiritia koa tētahi reo mō te tāutanga ANAKE. Mā tētahi atu mata o muri mai, ka taea ai te kōwhiri i ngā reo a te pae, a te kaiwhakamahi hoki';
+$string['closewindow'] = 'Kati Matapihi';
+$string['compatibilitysettingshead'] = 'E taki ana i ō tautuhinga PHP ...';
+$string['compatibilitysettingssub'] = 'Me pāhi tō tūmau i ēnei whakamātautau katoa kia haere tika ai a Moodle';
+$string['componentisuptodate'] = 'Tika tonu te wae ki te rā';
+$string['configfilenotwritten'] = 'Kāore i taea e te kaitāuta hōtuhi te waihanga aunoa i tētahi kōnae config.php e pupuri ana i ō tautuhinga i kōwhirihia, te take, kāore puano te whaiaronga Moodle i te taeatuhi. Ka taea te tārua-ā-ringa i te waehere e whai ake nei ki tētahi kōnae nō roto o te whaiaronga iomatua o Moodle, e kīa nei ko config.php.';
+$string['configfilewritten'] = 'kua tika te waihanga i te config.php';
+$string['configurationcompletehead'] = 'Kua oti te whirihora';
+$string['configurationcompletesub'] = 'I ngana  atu a Moodle ki te tiaki i tō whirihoranga ki rō kōnae i te pūtake o tō utanga o Moodle.';
+$string['continue'] = 'Haere Tonu';
+$string['database'] = 'Pātengi Raraunga';
+$string['databasecreationsettingshead'] = 'Īnāianei me whirihora e koe ngā tautuhinga pātengi raraunga ki te wāhi penapena i te nuinga o ngā raraunga Moodle. Ka waihanga aunoatia tēnei pātengi raraunga e te pūtāuta Moodle4Windows me ngā tautuhinga o raro ake nei.';
+$string['databasecreationsettingssub'] = '<b>Momo:</b> He mea whakapūmau ki \"mysql\" e te pūtāuta<br /><b>Kaihautū:</b> He mea whakapūmau ki \"localhost\" e te pūtāuta<br /><b>Ingoa:</b> ingoa pātengi raraunga, arā, moodle<br /><b>Kaiwhakamahi:</b> He mea whakapūmau ki \"root\" e te pūtāuta<br /><b>Kupuhipa:</b> tō kupuhipa pātengi raraunga<br /><b>Kuhimua o Ngā Ripanga:</b> kuhimua kōwhiri mō ngā ingoa ripanga katoa';
+$string['databasesettingshead'] = 'Īnāianei me whirihora e koe ngā tautuhinga pātengi raraunga ki te wāhi penapena i te nuinga o ngā raraunga Moodle. Ko te tikanga, kua oti kē tēnei pātengi raraunga, te ingoa kaiwhakamahi, me te kupuhipa te waihanga kia āhei ai ki te uru atu.';
+$string['databasesettingssub'] = '<<b>Momo:</b> mysql, postgres7 rānei<br /><b>Kaihautū:</b> arā localhost, db.isp.com rānei<br /><b>Ingoa:</b> ingoa pātengi raraunga, pēnei ake i a moodle<br /><b>Kaiwhakamahi:</b> tō ingoa kaiwhakamahi pātengi raraunga<br /><b>Kupuhipa:</b> tō kupuhip pātengi raraunga<br /><b>Kuhimua o Ngā Ripanga:</b> kuhimua kōwhiri mō ngā ingoa ripanga katoa';
+$string['dataroot'] = 'Whaiaronga Raraunga';
+$string['datarooterror'] = 'Kāore te \'Whaiaronga Raraunga\' i whakapūtāhia e koe i kitea, i taea rānei te waihanga. Whakatikahia te ara, waihanga ā-ringa rānei i te whaiaronga.';
+$string['dbconnectionerror'] = 'Kāore i taea te tūhono ki te pātengi raraunga i whakapūtāhia. Takina ō tautuhinga pātengi raraunga.';
+$string['dbcreationerror'] = 'Hapa waihanga pātengi raraunga. Kāore i taea tērā ingoa pātengi raraunga te waihanga ki ngā tautuhinga i homai';
+$string['dbhost'] = 'Tūmau Kaihautū';
+$string['dbprefix'] = 'Kuhimua o Ngā Ripanga';
+$string['dbtype'] = 'Momo';
+$string['dbwrongencoding'] = 'E haere ana te pātengi raraunga i tīpakohia ki raro i tētahi whakawaehere tūtohu-kore ($a). He pai ake te whakamahi kē i tētahi pātengi raraunga waehereao (UTF-8). Heoi, mā te tīpako i te pouaka taki \'Tīpoka Whakamātautau Whakawaehere DB\' o raro nei e taea ai te tīpoka atu i te whakamātautau nei, engari tērā pea ka pā mai he raru ā te wā e heke mai nei';
+$string['directorysettingshead'] = 'Tēnā koa, whakaūngia ngā tauwāhi o tēnei tāutanga o Moodle.';
+$string['directorysettingssub'] = '<b>Wāhitau Tukutuku:</b>Whakapūtāhia te wāhitau tukutuku o Moodle. Mēnā he maha ngā URL, kōwhirihia te mea ngāwari ki ō ākonga. Kaua e tāpiri i te rītaha whaimuri. <br > <br /> <b>Whaiaronga o Moodle:</b>Whakapūtāhia te ara whaiaronga katoa ki tēnei tāutanga. Kia tika hoki ngā pūmatua/iti. <br /> <br /> <b>Whaiaronga Raraunga:</b>Me whiwhi wāhi kia taea e Moodle ngā kōnae kua tikina ake te tiaki. Me taea tēnei whaiaronga e te kaiwhakamahi tūmau tukutuku (i te nuinga o te wā ko \'nobody\', \'apache\' rānei) te pānui me te TUHI HOKI, engari kia kaua e uru tika tonu mā te tukutuku.</p>';
+$string['dirroot'] = 'Whaiaronga Moodle';
+$string['dirrooterror'] = 'Te āhua nei e hē ana ngā tautuhinga o te \'Whaiaronga Moodle\' - kāore tētahi tāutanga o Moodle i kitea e mātou i reira. Kua tautuhia anō te uara o raro.';
+$string['download'] = 'Tikiake';
+$string['downloadedfilecheckfailed'] = 'I rahua te takinga o te kōnae i tikina ake';
+$string['downloadlanguagebutton'] = 'Tikina ake te pōkai reo \"$a\"';
+$string['downloadlanguagehead'] = 'Tikina ake te pōkai reo';
+$string['downloadlanguagenotneeded'] = 'Ka taea te tāuta tonu mā te whakamahi i te pōkai reo taunoa, \"$a\".';
+$string['downloadlanguagesub'] = 'Ināianei ka taea e koe te tiki ake i tētahi pōkai reo me te tāuta tonu i roto i tēnei reo.<br /><br />Ki te kore e taea te tiki ake i te pōkai reo, ka tāuta tonu i roto i te reo Ingarihi. (Inā mutu te tāuta kātahi ka taea te tiki ake me te tāuta i ētahi atu pōkai reo).';
+$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['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['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';
+$string['fail'] = 'Rahu';
+$string['fileuploads'] = 'Ngā Tukunga ake i Ngā Kōnae';
+$string['fileuploadserror'] = 'Ko te tikanga kei runga tēnei i';
+$string['gdversion'] = 'Putanga GD';
+$string['gdversionerror'] = 'Ko te puna GD hei tukatuka me te waihanga atanga';
+$string['gdversionhelp'] = '<p>Te āhua nei kāore tō tūmau i tāuta i te GD.</p><p>Ko te GD tētahi puna e hiahiatia ana e te PHP hei tuku i te Moodle ki te tukatuka i ngā atanga (pērā ki ngā ata kōtaha kaiwhakamahi), hei waihanga atanga hōu hoki (pērā ki ngā kauwhata rangitaki). Ka mahi tonu te Moodle me te kore GD - engari ka kore ēnei āhuatanga e wātea ki a koe.</p><p>Hei tāpiri GD ki PHP i raro i Unix, whakahiato PHP mā te whakamahi i te tawhā--with-gd.</p><p>I raro i a Windows i te nuinga o te wā ka taea te whakatika i te php.ini me te uncomment i te rārangi whakapuakanga libgd.dll.</p>';
+$string['globalsquotes'] = 'Whakamahinga Haumaru Kore o ngā Globals';
+$string['globalsquoteserror'] = 'Whakatikahia ō tautuhinga PHP:disable register_globals whakahohe hoki/rānei magic_quotes_gpc';
+$string['help'] = 'Āwhina';
+$string['iconvrecommended'] = 'Kia pai ake ai te mahinga o te pae, me tāuta te puna ICONV (kei a koe), inā koa kei te tautoko tō pae i ngā reo rātini-kore.';
+$string['info'] = 'Mōhiohio';
+$string['installation'] = 'Tāutatanga';
+$string['invalidmd5'] = 'md5 muhu';
+$string['langdownloaderror'] = 'Kāore te reo \"$a\" i utaina. Ka tāuta tonu i te reo Ingarihi.';
+$string['langdownloadok'] = 'I utaina tika te reo \"$a\" . Ka tāuta tonu i roto i tēnei reo.';
+$string['language'] = 'Reo';
+$string['magicquotesruntime'] = 'Wā Haerenga Magic Quotes';
+$string['magicquotesruntimeerror'] = 'Ko te tikanga kua whakawetohia tēnei';
+$string['mbstringrecommended'] = 'Hei whakapai ake i te mahinga o tō pae, me tāuta e koe te puna MBSTRING (kei a koe), inā koa kei te tautoko tō pae i ngā reo rātini-kore.';
+$string['memorylimit'] = 'Tepe Pūmahara';
+$string['memorylimiterror'] = 'Kua whakatautuhia kia iti noa te tepe pūmahara o te PHP … ā muri ake pea ka pā ki a koe he raru.';
+$string['memorylimithelp'] = '<p>I tēnei wā ko te tepe pūmahara PHP mō tō tūmau ko te $a.</p><p>Mā tēnei pea ka raru ai te pūmahara o Moodle, inā ki te maha ake ngā kōwae e hohe ana, ngā kaiwhakamahi hoki/rānei.</p> <p>Ko tāku ki a koe, me whirihora te PHP ki te tepe teitei ake mēnā e taea ana, pēnei ake i te 16M. Arā atu ngā huarahi hei whakatutuki i tēnei:</p><ol><li>Mēnā ka taea, whakahiato anōtia te PHP ki te <i>--enable-memory-limit</i>. Mā tēnei ka taea e Moodle te tepe pūmahara te whakarite.</li><li>Mēnā he āheitanga tāu ki tō kōnae php.ini, ka taea te tautuhinga <b>memory_limit</b> te huri kia āhua 16M. Ki te kore ō āheitanga, pātaihia tō kaiwhakahaere, māna tērā āheitanga e hoatu ki a koe.</li><li>I runga i ētahi tūmau PHP ka taea te waihanga kōnae .htaccess ki roto i te whaiaronga Moodle e pupuru ana i tēnei rārangi: <p><blockquote>php_value memory_limit 16M</blockquote></p> <p>Heoi, i runga i ētahi tūmau ka kaupare pea te mahinga o ngā whārangi PHP <b>katoa</b> (ka kitea ngā hapa inā tirohia ngā whārangi) nō reira, me tango te kōnae .htaccess.</p></li></ol>';
+$string['missingrequiredfield'] = 'E ngaro ana tētahi āpure e hiahiatia ana';
+$string['moodledocslink'] = 'Tuhinga Moodle mō tēnei whārangi';
+$string['mysql416bypassed'] = 'Engari, ka taea e koe tō MySQL 4.1.12 (pai ake rānei) te whakamahi tonu mēnā kei te whakamahi tō pae i ngā reo (rātini) iso-8859-1 ANAKE.';
+$string['mysql416required'] = 'Me whiwhi putanga MySQL 4.1.16 kia āhei ai ngā raraunga katoa te whakatahuri ki UTF-8 ā muri ake nei.';
+$string['mysqlextensionisnotpresentinphp'] = 'Kāore i tika te whirihoratanga o te PHP me te toronga MySQL kia taea te whakawhiti me te MySQL. Taki koe i tō kōnae php.ini, whakahiato anō rānei i te PHP.';
+$string['name'] = 'Ingoa';
+$string['next'] = 'Panuku';
+$string['ok'] = 'ĀE';
+$string['parentlanguage'] = '<< Ngā Kaiwhakamāori: Ki te whai Reo Matua, e tika ana kia whakamahia e Moodle ki te ngaro ētahi rārangi mai i tō pōkai reo,  tō reo, tena whakapūtā te waehere ki konei. Ki te waiho kia wātea ka whakamahia te Pākehā. Hei tauira: nl >>';
+$string['pass'] = 'Pāhi';
+$string['password'] = 'Kupuhipa';
+$string['php50restricted'] = 'He maha ngā raruraru e mōhiotia nei tō te PHP 5.0.x, whakapaingia aketia koa ki 5.1.x, e hoki rānei koa ki 4.3.x, 4.4.x rānei';
+$string['phpversion'] = 'Putanga PHP';
+$string['phpversionerror'] = 'Kia 4.1.0 neke atu ranei te putanga PHP';
+$string['phpversionhelp'] = '<p>E hiahiatia ana e Moodle kia  4.1.0 neke atu rānei te putanga PHP.</p><p>I tēnei wā kei te whakahaere koe i te putanga $a</p><p>Me whakahōu te PHP, nuku rānei ki tētahi kaihautū me te putanga hōu PHP hōu ake!</p>';
+$string['previous'] = 'Tōmua';
+$string['remotedownloadnotallowed'] = 'Kāore e taea ngā wae o tō tūmau te tikiake (kua monokia te allow_url_fopen). <br /><br />Me tikiake-ā-ringa te kōnae <a href=\"$a->url\">$a->url</a>, tāruatia ki \"$a->dest\", ā, whewherahia i reira';
+$string['report'] = 'Pūrongo';
+$string['restricted'] = 'Kāore he āheitanga';
+$string['safemode'] = 'Aratau Haumaru';
+$string['safemodeerror'] = 'Ka raru pea te Moodle ki te kā te aratau haumaru';
+$string['sessionautostart'] = 'Wātū Tīmata Aunoa';
+$string['sessionautostarterror'] = 'Ko te tikanga kua weto tēnei';
+$string['skipdbencodingtest'] = 'Tīpokatia te Whakamātautau Whakamuna DB';
+$string['status'] = 'Tūnga';
+$string['thischarset'] = 'utf-8';
+$string['thislanguage'] = 'Māori - WWoW';
+$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['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['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>.';
+$string['wrongdestpath'] = 'Ehara tēnei ara ūnga i te tika';
+$string['wrongsourcebase'] = 'Ehara tēnei tumu URL pūtake i te tika';
+$string['wrongzipfilename'] = 'Ehara tēnei ingoakōnae ZIP i te tika';
+$string['wwwroot'] = 'Wāhitau Tukutuku';
+$string['wwwrooterror'] = 'Te āhua nei kāore te wāhitau tukutuku i te tika - kāore tēnei tāutanga o Moodle i reira.';
+?>

install/lang/nl_utf8/installer.php

@@ -134,7 +134,7 @@ $string['gdversionerror'] = 'De GD-bibliotheek moet geïnstalleerd zijn om afbee
 $string['gdversionhelp'] = '<p>Blijkbaar is GD niet geïnstalleerd op je server.</p>
 <p>PHP heeft de GD-bibliotheek nodig om afbeeldingen te kunnen maken (zoals de grafieken van de logbestanden) en te verwerken (zoals de profielbestanden van de gebruikers). Moodle zal werken zonder GD - alleen deze mogelijkheden zullen het niet doen.</p>
 <p>Om GD toe te voegen aan PHP op een Unixmachine moet je PHP compileren met de --with-gd parameter.</p>
-<p>Onder Windows kun je gewoonlijk php.ini bewerken en de commentaartekens voor de lijn met libgd.dll verwijderen.</p>';
+<p>Onder Windows kun je gewoonlijk php.ini bewerken en de commentaartekens voor de lijn met php_gd2.dll verwijderen.</p>';
 $string['globalsquotes'] = 'Inveilige behandeling van globals';
 $string['globalsquoteserror'] = 'Zet je PHP instellingen juist: schakel register_globals uit en/of schakel magic_quotes_gpc in';
 $string['help'] = 'Help';
@@ -198,6 +198,8 @@ $string['skipdbencodingtest'] = 'Negeer DB-encodingtest';
 $string['status'] = 'Status';
 $string['thischarset'] = 'UTF-8';
 $string['thislanguage'] = 'Nederlands';
+$string['unicoderecommended'] = 'Aanbevolen wordt om al je data als Unicode (UTF-8) te bewaren. Nieuwe installaties zouden moeten geïnstalleerd worden met Unicode als standaard tekenset voor de databank. Als je upgrade, moet je het UTF-8 migratieproces laten lopen (zie pagina Beheer).';
+$string['unicoderequired'] = 'Je moet al je data als Unicode (UTF-8) bewaren. Nieuwe installaties moeten geïnstalleerd worden met Unicode als standaard tekenset voor de databank. Als je upgrade, moet je het UTF-8 migratieproces laten lopen (zie pagina Beheer).';
 $string['user'] = 'Gebruiker';
 $string['welcomep10'] = '$a->installername ($a->installerversion)';
 $string['welcomep20'] = 'Je krijgt deze pagina te zien omdat je met succes het <strong>$a->packname $a->packversion</strong> packet op je computer gezet en gestart hebt. Proficiat!';

install/lang/no_utf8/installer.php

@@ -12,9 +12,18 @@
 $string['admindirerror'] = 'The admin directory specified is incorrect';
 $string['admindirname'] = 'Admin Directory';
 $string['bypassed'] = 'Utelatt';
+$string['cannotcreatelangdir'] = 'Kan ikke opprette mappen \'lang\'.';
+$string['cannotcreatetempdir'] = 'Kan ikke opprette mappen \'temp';
+$string['cannotdownloadcomponents'] = 'Kan ikke laste ned komponentene.';
+$string['cannotdownloadzipfile'] = 'Kan ikke laste ned ZIP-fil.';
+$string['cannotfindcomponent'] = 'Kan ikke finne komponenten.';
+$string['cannotsavemd5file'] = 'Kan ikke lagre md5-fil.';
+$string['cannotsavezipfile'] = 'Kan ikke lagre ZIP-fil.';
+$string['cannotunzipfile'] = 'Kan ikke pakke opp (unzip) filen.';
 $string['caution'] = 'Caution';
 $string['check'] = 'Sjekk';
 $string['closewindow'] = 'Lukk dette vinduet';
+$string['componentisuptodate'] = 'Komponenten er ajourført.';
 $string['configfilenotwritten'] = 'The installer script was not able to automatically create a config.php file containing your chosen settings, probably because the Moodle directory is not writeable. You can manually copy the following code into a file named config.php within the root directory of Moodle.';
 $string['configfilewritten'] = 'config.php has been successfully created';
 $string['continue'] = 'Fortsett';
@@ -29,7 +38,13 @@ $string['dbtype'] = 'Type';
 $string['dirroot'] = 'Moodle Directory';
 $string['dirrooterror'] = 'The \'Moodle Directory\' setting seems to be incorrect - we can\'t find a Moodle installation there.  The value below has been reset.';
 $string['download'] = 'Download';
+$string['downloadedfilecheckfailed'] = 'Sjekk av nedlastet fil feilet.';
+$string['environmenterrortodo'] = 'Du må løse alle de nevnte problem (feil) identifiserti omgivelsene før du fortsetter å installere denne Moodle versjonen!';
+$string['environmentrecommendinstall'] = 'er anbefalt at du installerer/tillater';
+$string['environmentrecommendversion'] = 'versjon $a->needed er anbefalt og du kjører $a->current';
+$string['environmentrequireinstall'] = 'er påkrevd at du installerer/tillater';
 $string['environmentrequireversion'] = 'Du må ha versjon $a->needed. Du kjører $a->current';
+$string['environmentxmlerror'] = 'En feil oppsto under lesing av omgivelsesdata ($a->error_code)';
 $string['error'] = 'Feil';
 $string['fail'] = 'Fail';
 $string['fileuploads'] = 'File Uploads';
@@ -45,13 +60,15 @@ $string['gdversionhelp'] = '<p>Your server does not seem to have GD installed.</
 
 <p>To add GD to PHP under Unix, compile PHP using the --with-gd parameter.</p>
 
-<p>Under Windows you can usually edit php.ini and uncomment the line referencing libgd.dll.</p>';
+<p>Under Windows you can usually edit php.ini and uncomment the line referencing php_gd2.dll.</p>';
 $string['help'] = 'Hjelp';
 $string['info'] = 'Informasjon';
 $string['installation'] = 'Installation';
+$string['invalidmd5'] = 'Ugyldig md5';
 $string['language'] = 'Språk';
 $string['magicquotesruntime'] = 'Magic Quotes Run Time';
 $string['magicquotesruntimeerror'] = 'This should be off';
+$string['mbstringrecommended'] = 'Installering av det valgfrie bibliotek MBSTRING er  anbefalt for at du skal forbedre ytelsen til nettstedet, spesielt hvis nettstedet støtter ikke-latinske språk.';
 $string['memorylimit'] = 'Memory Limit';
 $string['memorylimiterror'] = 'The PHP memory limit is set quite low ... you may run into problems later.';
 $string['memorylimithelp'] = '<p>The PHP memory limit for your server is currently set to $a.</p>
@@ -73,6 +90,7 @@ $string['memorylimithelp'] = '<p>The PHP memory limit for your server is current
     <p>However, on some servers this will prevent <b>all</b> PHP pages from working 
     (you will see errors when you look at pages) so you\'ll have to remove the .htaccess file.</p></li>
 </ol>';
+$string['missingrequiredfield'] = 'Noen påkrevde felt mangler';
 $string['moodledocslink'] = 'Moodledokumentasjon for denne siden';
 $string['mysqlextensionisnotpresentinphp'] = 'PHP has not been properly configured with the MySQL extension so that it can communicate with MySQL.  Please check your php.ini file or recompile PHP.';
 $string['name'] = 'Navn';
@@ -87,6 +105,8 @@ $string['phpversionhelp'] = '<p>Moodle requires a PHP version of at least 4.1.0.
 <p>You are currently running version $a</p>
 <p>You must upgrade PHP or move to a host with a newer version of PHP!</p>';
 $string['previous'] = 'Forrige';
+$string['remotedownloadnotallowed'] = 'Nedlasting av komponenter til din tjenermaskin er ikke tillatt (allow_url_fopen er satt til ulovlig). <br /> <br />Du må laste ned
+<a href=\"$a->url\">$a->url</a>-filen manuelt, kopiere den til \"$a->dest\" på tjeneren og pakke den ut der.';
 $string['report'] = 'Rapport';
 $string['safemode'] = 'Safe Mode';
 $string['safemodeerror'] = 'Moodle may have trouble with safe mode on';
@@ -96,6 +116,9 @@ $string['status'] = 'Status';
 $string['thischarset'] = 'UTF-8';
 $string['thislanguage'] = 'Norsk - bokmål';
 $string['user'] = 'Bruker';
+$string['wrongdestpath'] = 'Gal resultatmappe';
+$string['wrongsourcebase'] = 'Galt ZIP-filnavn.';
+$string['wrongzipfilename'] = 'Galt ZIP-filnavn.';
 $string['wwwroot'] = 'Web address';
 $string['wwwrooterror'] = 'The web address does not appear to be valid - this Moodle installation doesn\'t appear to be there.';
 ?>

install/lang/pl_utf8/installer.php

@@ -86,7 +86,7 @@ $string['gdversionhelp'] = '<p> Nie masz zainstalowanego GD na swoim serwerze.</
 <p>„GD jest biblioteką wymaganą przez PHP w celu umożliwienia Moodle operacji na obrazach (takich jak ikony profilu użytkownika) i w celu tworzenia nowych obrazów (takich jak wykresy logowań). Moodle będzie pracował bez GD – te możliwości nie będą jednak dla Ciebie dostępne.</p>
 <p> Aby dodać GD do PHP pod Unix-em, skompiluj PHP używając parametru -- with-gd. </p>
 
-<p> Pod Windows-em można zazwyczaj edytować php.ini i pominąć linię odwołującą się do libgd.dll.</p>”';
+<p> Pod Windows-em można zazwyczaj edytować php.ini i pominąć linię odwołującą się do php_gd2.dll.</p>”';
 $string['globalsquotes'] = 'Groźne zarządzanie zmiennymi globalnymi';
 $string['globalsquoteserror'] = 'Ustal swoje ustawienia PHP:  niedostępne register_globals i/lub udostępnione magic_quotes_gpc';
 $string['help'] = 'Pomoc';

install/lang/pt_br_utf8/installer.php

@@ -95,7 +95,7 @@ $string['gdversionerror'] = 'A library GD';
 $string['gdversionhelp'] = '<p>Parece que o seu servidor não tem o GD instalado.</p>
 <p>GD é uma library de PHP necessária à elaboração de imagens como os fotos do perfil do usuário e os gráficos de estatísticas. O Moodle funciona sem o GD mas a elaboração de imagens não será possível.</p>
 <p>Para adicionar o GD ao PHP em Unix, compile o PHP usando o parâmetro --with-gd .</p>
-<p>Em Windows edite php.ini and cancele o comentário à linha que se refere a libgd.dll.</p>';
+<p>Em Windows edite php.ini and cancele o comentário à linha que se refere a php_gd2.dll.</p>';
 $string['globalsquotes'] = 'Tratamento de Globais sem Segurança';
 $string['globalsquoteserror'] = 'Corrija a configuração do seu PHP: desabilitar register_globals e/ou habilitar magic_quotes_gpc';
 $string['help'] = 'Ajuda';

install/lang/pt_utf8/installer.php

@@ -52,36 +52,87 @@ $string['databasesettingssub'] = '<b>Tipo:</b>mysql ou postgres7<br />
 <b>Contrasenha:</b> para acceder à base de dados<br />
 <p>Prefixo das tabelas:</b> um prefixo optativo para os nomes de todas as tabelas na 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['dbconnectionerror'] = 'Não foi possível estabelecer a ligação à base de dados que indicou. Por favor verifique a configuração dessa base de dados.';
+$string['dbcreationerror'] = 'Erro na criação da base de dados. Não foi possível criar a base de com o nome e configurações que indicou.';
 $string['dbhost'] = 'Servidor anfitrão';
 $string['dbprefix'] = 'Prfixo 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['directorysettingshead'] = 'Por favor confira as localizações para esta instalação do Moodle';
+$string['directorysettingssub'] = '<b>Endereço Web:</b>
+Indique o endereço web completo que será usado para aceder ao Moodle. Se o seu sítio pode ser acedido com vários URL diferentes, seleccione o que seja mais natural para os alunos que usarem o Moodle. Não inclua a barra (/) no fim do URL.
+<br />
+<br />
+<b>Directório do Moodle:</b>
+Indique o caminho completo do directório desta instalação, no disco do servidor. Tenha atenção com a distinção entre maiúsculas e minúsculas.
+<br />
+<br />
+<b>Directório de dados:</b>
+Precisa de um local onde armazenar os ficheiros enviados para o Moodle. Esse directório deverá dar permissões de escrita e leitura ao utilizador que estiver a executar o servidor Web (geralmente, \'nobody\', \'apache\' ou \'www-data\'), mas não deverá ser acessível directamente via Web.';
 $string['dirroot'] = 'Directório do Moodle';
+$string['dirrooterror'] = 'O \'Directório do Moodle\' indicado parece esaerrado - não conseguimos encontrar uma instalação do Moodle nesse directório. O nome foi alterado para o valor que se mostra em baixo';
 $string['download'] = 'Descarregar';
 $string['downloadedfilecheckfailed'] = 'Falhou a verificação do ficheiro descarregado.';
+$string['downloadlanguagebutton'] = 'Descarregar o pacote linguístico \"$a\"';
+$string['downloadlanguagehead'] = 'Descarregar pacote linguístico';
+$string['downloadlanguagenotneeded'] = 'Pode continuar com o processo de instalação usando o pacote linguístico \"$a\".';
+$string['downloadlanguagesub'] = 'Agora pode obtar por descarregar um pacote linguístico e contunuar 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['environmenterrortodo'] = 'Deve resolver todos os problemas (erros) do ambiente que encontrou acima antes de proceder à instalação dessa versão do Moodle!';
+$string['environmenthead'] = 'A verificar o seu ambiente ...';
 $string['environmentrecommendinstall'] = 'é recomendado ser';
 $string['environmentrecommendversion'] = 'é recomendada a versão $a->needed e actualmente está a correr a versão $a->current';
 $string['environmentrequireinstall'] = 'é necessário estar instalada/activa';
 $string['environmentrequireversion'] = 'É requerida a versão $a->needed e está a correr a versão $a->current';
+$string['environmentsub'] = 'Estamos a verificar que os vários componentes do seu sistema estejam de acordo com os requerimentos do sistema';
 $string['environmentxmlerror'] = 'Erros ao ler dados do ambiente ($a->error_code)';
 $string['error'] = 'Erro';
 $string['fail'] = 'Falha';
 $string['fileuploads'] = 'Envio de ficheiros';
 $string['fileuploadserror'] = 'Isto deveria estar activo';
 $string['gdversion'] = 'Versão do GD';
+$string['gdversionerror'] = 'A biblioteca GD deverá estar presente para processar e criar imagens.';
+$string['gdversionhelp'] = '<p>O seu servidor não parece ter GD instalado.</p>
+
+<p>GD é uma biblioteca que o PHP precisa para permitir que o Moodle processe imagens (por exemplo, para criar os icones com as fotos dos utilizadores). Moodle poderá ainda funcionar sem GD - simplesmente essas funcionalidades não estarão disponíveis.</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['globalsquoteserror'] = 'Corrija as sua configuração do PHP: desactive o register_globals e/ou active magic_quotes_gpc';
 $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['info'] = 'Informação';
 $string['installation'] = 'Instalação';
 $string['invalidmd5'] = 'md5 não válido';
+$string['langdownloaderror'] = 'Desafortunadamente, a língua \"$a\" não foi instalada. O processo de instalação continuará em inglês.';
+$string['langdownloadok'] = 'A língua \"$a\" foi instalada com êxito. O processo de instalação continuará nessa língua.';
 $string['language'] = 'Língua';
+$string['magicquotesruntime'] = '\"Magic Quotes Run Time\"';
 $string['magicquotesruntimeerror'] = 'Isto deveria estar desactivado';
 $string['mbstringrecommended'] = 'A instalação da biblioteca opcional MBSTRING é altamente recomendada na medida em que vai aumentar o desempenho do seu sítio, particularmente se o seu sítio suporta línguas não-latinas.';
 $string['memorylimit'] = 'Limite de memoria';
+$string['memorylimiterror'] = 'O limite de memoria imposto ao PHP é muito baixo... poderá ter problemas mais tarde.';
+$string['memorylimithelp'] = '<p>Actualmente o seu servidor impõe ao PHP um limite de memoria de $a.</p>
+
+<p>Isso poderá causar mais tarde problemas de memoria, especialmente se tiver um grande número de módulos activos e/ou um número elevado de utilizadores.</p>
+
+<p>Recomendamos que configure o PHP com um limite maior, por exemplo, 16M.
+Existem várias formas que pode tentar para fazer essa alteração:</p>
+<ol>
+<li>Se poder, recompile o PHP com <i>--enable-memory-limit</i>.
+Isso permitirá que o próprio Moodle modifique o limite de memoria.</li>
+<li>Se tiver acesso ao seu ficheiro php.ini, poderá modificar o valor de <b>memory_limit</b> para algo como 16M. Se não tiver acesso, poderá pedir ao adiminstrador do seu sistema que o faça</li>
+<li>Em alguns servidores PHP poderá criar um ficheiro .htaccess, no directório do Moodle, com a linha seguinte:
+<p><blockquote>php_value memory_limit 16M</blockquote></p>
+<p>No entanto, em alguns servidores isso faz com que nenhuma página PHP funcione (verá erros quando tentar ver as páginas) e terá que apagar o ficheiro .htaccess.</p></li>
+</ol>';
 $string['missingrequiredfield'] = 'Falta algum campo necessário';
 $string['moodledocslink'] = 'Documentação Moodle para esta página';
 $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['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'] = 'Como o PHP não tem sido configurado conrrectamente com a extensão MySQL, não pode comunicar com MySQL. Por favor verifique o seu ficheiro php.ini ou recompile o PHP.';
 $string['name'] = 'Nome(s)';
 $string['next'] = 'Próximo';
 $string['ok'] = 'OK';
@@ -91,17 +142,33 @@ $string['password'] = 'Palavra chave';
 $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['phpversion'] = 'Versão do PHP';
 $string['phpversionerror'] = 'A versão do PHP deverá ser, pelo menos, 4.1.0';
+$string['phpversionhelp'] = '<p>Moodle precisa da vesão 4.3.0 ou posterior do PHP (excluindo 5.0.x, que produz vários erros; a partir de 5.1.0 já não há problema).</p>
+<p>Actualmente está a utilizar a versão $a</p>
+<p>Deverá actualizar o PHP ou migrar para outro servidor com uma versão do PHP mais recente!</p>
+(No caso da versão 5.0.x, poderá regredir para uma versão 4.4.x)</p>';
 $string['previous'] = 'Prévio';
 $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';
 $string['safemode'] = 'Modo seguro';
+$string['safemodeerror'] = 'Moodle poderá ter problemas com o modo seguro';
+$string['sessionautostart'] = 'Auto-início de sessão';
+$string['sessionautostarterror'] = 'Isto deveria estar desactivado';
+$string['skipdbencodingtest'] = 'Não testar codificação da Base de Dados';
 $string['status'] = 'Regime';
 $string['thischarset'] = 'UTF-8';
 $string['thislanguage'] = 'Português - Portugal';
 $string['user'] = 'Utilizador';
+$string['welcomep10'] = '$a->installername ($a->installerversion)';
+$string['welcomep20'] = 'Está a ver esta página porque o pacote <strong>$a->packname $a->packversion</strong> foi instalado e posto a funcionar com sucesso no seu computador. Parabens!';
+$string['welcomep30'] = 'Esta versão do <strong>$a->installername</strong> inclui aplicações para criar um ambiente onde o <strong>Moodle</strong> possa funcionar, nomeadamente:';
+$string['welcomep40'] = 'Este pacote também inclui <strong>Moodle $a->moodlerelease ($a->moodleversion)</strong>.';
+$string['welcomep50'] = 'A utilização de todas as aplicações neste pacote está regida pelas respectivas licenças. O pacote <strong>$a->installername</strong> completo é <a href=\"http://www.opensource.org/docs/definition_plain.html\">open source</a> distribuido nos termos da licença <a href=\"http://www.gnu.org/copyleft/gpl.html\">GPL</a>.';
+$string['welcomep60'] = 'As páginas seguintes vão conduzí-lo por alguns passos simples de seguir para configurar o <strong>Moodle</strong> no seu computador. Poderá aceitar as configurações seleccionadas por omissão, ou, opcionalmente, usar outras configurações mais apropriadas às suas necessidades.';
+$string['welcomep70'] = 'Clique no botão \"Seguinte\" em baixo, para continuar com a configuração do <strong>Moodle</strong>.';
 $string['wrongdestpath'] = 'Caminho de destino errado.';
 $string['wrongsourcebase'] = 'URL errada 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.';
 ?>

install/lang/sk_utf8/installer.php

@@ -98,7 +98,7 @@ $string['gdversionhelp'] = '<p>Na Vašom serveri zrejme nie je nainštalovaná G
 
 <p>Keď chcete pridať GD do PHP pod Unixom, vytvorte PHP použitím --with-gd parameter.</p>
 
-<p>Pod Windows môžete upraviť php.ini a odkomentovať riadok obsahujúci libgd.dll.</p>';
+<p>Pod Windows môžete upraviť php.ini a odkomentovať riadok obsahujúci php_gd2.dll.</p>';
 $string['globalsquotes'] = 'Nie bezpečné používanie globálnych premenných';
 $string['globalsquoteserror'] = 'Opravte svoje nastavenia PHP: vypnite register_globals a/alebo zapnite magic_quotes_gpc';
 $string['help'] = 'Pomoc';

install/lang/sl_utf8/installer.php

@@ -116,7 +116,7 @@ $string['gdversionhelp'] = '<p>Na vašem strežniku kot kaže ni nameščen GD.<
 
 <p>Za dodajanje GD v PHP v sistemu Unix, prevedite PHP s parametrom --with-gd.</p>
 
-<p>V okolju Windows lahko običajno uredite php.ini in odkomentirate vrstico, ki se sklicuje na libgd.dll.</p>';
+<p>V okolju Windows lahko običajno uredite php.ini in odkomentirate vrstico, ki se sklicuje na php_gd2.dll.</p>';
 $string['globalsquotes'] = 'Nevarna obravnava globalnih spremenljivk';
 $string['globalsquoteserror'] = 'Popravite vaše PHP nastavitve: onemogočite register_globals in / ali omogočite magic_quotes_gpc';
 $string['help'] = 'Pomoč';

install/lang/sm_utf8/installer.php

@@ -42,7 +42,7 @@ $string['gdversionhelp'] = '<p>Your server does not seem to have GD installed.</
 
 <p>To add GD to PHP under Unix, compile PHP using the --with-gd parameter.</p>
 
-<p>Under Windows you can usually edit php.ini and uncomment the line referencing libgd.dll.</p>';
+<p>Under Windows you can usually edit php.ini and uncomment the line referencing php_gd2.dll.</p>';
 $string['help'] = 'Fesoasoani';
 $string['installation'] = 'Fa\'atu/Install';
 $string['language'] = 'Gagana';

install/lang/sr_cr_utf8/installer.php

@@ -100,7 +100,7 @@ $string['gdversionhelp'] = '<p>На Вашем серверу изгледа н
 
 <p>Да бисте додали GD у PHP под Unix-ом, компајлираjте PHP користећи --with-gd параметар.</p>
 
-<p>Под Windows-ом обично можете изменити php.ini и скинути ознаку коментара у линији која се односи на libgd.dll.</p>';
+<p>Под Windows-ом обично можете изменити php.ini и скинути ознаку коментара у линији која се односи на php_gd2.dll.</p>';
 $string['globalsquotes'] = 'Несигурно руковање глобалним варијаблама';
 $string['globalsquoteserror'] = 'Поправите своја PHP подешавања: онемогућите register_globals и/или омогућите magic_quotes_gpc';
 $string['help'] = 'Помоћ';

install/lang/sr_lt_utf8/installer.php

@@ -100,7 +100,7 @@ $string['gdversionhelp'] = '<p>Na Vašem serveru izgleda nije instaliran GD.</p>
 
 <p>Da biste dodali GD u PHP pod Unix-om, kompajlirajte PHP koristeći --with-gd parametar.</p>
 
-<p>Pod Windows-om obično možete izmeniti php.ini i skinuti oznaku komentara u liniji koja se odnosi na libgd.dll.</p>';
+<p>Pod Windows-om obično možete izmeniti php.ini i skinuti oznaku komentara u liniji koja se odnosi na php_gd2.dll.</p>';
 $string['globalsquotes'] = 'Nesigurno rukovanje globalnim varijablama';
 $string['globalsquoteserror'] = 'Popravite svoja PHP podešavanja: onemogućite register_globals i/ili omogućite magic_quotes_gpc';
 $string['help'] = 'Pomoć';

install/lang/sv_utf8/installer.php

@@ -95,7 +95,7 @@ $string['gdversionerror'] = 'GD biblioteket bör vara tillgängligt för att Du
 $string['gdversionhelp'] = '<p>Det verkar som om GD inte är installerat på Din server. </p>
 <p>GD är ett bibliotek som är nödvändigt i PHP om Moodle ska kunna bearbeta bilder (som t ex bilderna i användarprofilerna) eller skapa nya (som t ex graferna till loggarna). Moodle kommer fortfarande att fungera utan GD men dessa funktioner kommer alltså att saknas. </p>
 <p>Om Du vill lägga till GD under UNIX, så får Du kompilera PHP genom att använda parametern --with-gd.</p>
-<p>Under Windows kan Du vanligtvis redigera php.ini och ta bort kommentarmarkeringen för den rad som refererar till libgd.dll</p>';
+<p>Under Windows kan Du vanligtvis redigera php.ini och ta bort kommentarmarkeringen för den rad som refererar till php_gd2.dll</p>';
 $string['globalsquotes'] = 'Inte säker hantering av globala variabler';
 $string['globalsquoteserror'] = 'Ordna till Dina inställningar för PHP: avaktivera register_globals och/eller avaktivera magic_quotes_gpc';
 $string['help'] = 'Hjälp';

install/lang/ta_utf8/installer.php

@@ -116,7 +116,7 @@ $string['gdversionhelp'] = '<p>Your server does not seem to have GD installed.</
 
 <p>To add GD to PHP under Unix, compile PHP using the --with-gd parameter.</p>
 
-<p>Under Windows you can usually edit php.ini and uncomment the line referencing libgd.dll.</p>';
+<p>Under Windows you can usually edit php.ini and uncomment the line referencing php_gd2.dll.</p>';
 $string['globalsquotes'] = 'Insecure Handling of Globals';
 $string['globalsquoteserror'] = 'Fix your PHP settings: disable register_globals and/or enable magic_quotes_gpc';
 $string['help'] = 'உதவி';

install/lang/th_utf8/installer.php

@@ -11,14 +11,47 @@
 
 $string['admindirerror'] = 'ไดเรกทอรี admin ที่ระบุไม่ถูกต้อง';
 $string['admindirname'] = 'ไดเรกทอรี admin';
+$string['admindirsettinghead'] = 'ตั้งค่าไดเรกทอรี admin';
+$string['admindirsettingsub'] = 'เว็บโฮสติ้งจำนวนน้อยที่ใช้ /admin เป็น url พิเศษเพื่อที่จะเข้าไปยังหน้า control panel หรืออื่น ๆ ซึ่งอาจทำให้เกิดปัญหากับหน้า admin ของ Moodle ท่านสามารถทำการแก้ไขได้โดยการเปลี่ยนชื่อไดเรกทอรี admin ในการติดตั้งและใส่ชื่อใหม่ลงไป  เช่น <br /> <br /><b>moodleadmin</b><br /> <br />
+การเปลี่ยนค่านี้จะเป็นการแก้ไขหน้าลิงก์ admin ใน moodle';
 $string['bypassed'] = 'ข้าม';
 $string['caution'] = 'คำเตือน';
 $string['check'] = 'ตรวจสอบ';
+$string['chooselanguagehead'] = 'เลื่อกภาษา';
+$string['chooselanguagesub'] = 'กรุณาเลือกภาษาที่ใช้ในการติดตั้งเท่านั้น คุณจะสามารถเลือกตั้งค่าภาษาสำหรับเว็บไซต์และสำหรับสมาชิกแต่ละคนในหน้าจอต่อไป';
 $string['closewindow'] = 'ปิดหน้าต่าง';
+$string['compatibilitysettingshead'] = 'ตรวจสอบการตั้งค่า PHP';
+$string['compatibilitysettingssub'] = 'เซิร์ฟเวอร์ของท่านควรผ่านการทดสอบทั้งหมดนี้เพื่อให้ Moodle สามารถทำงานได้เป็นปกติ';
 $string['configfilenotwritten'] = 'ตัวติดตั้งอัตโนมัติไม่สามารถสร้างไฟล์ config.php ได้ อาจเป็นเพราะว่าไม่สามารถเขียนลงไดเรกทอรี moodle ได้ คุณสามารถสร้างไฟล์ดังกล่าวได้เองโดยการก้อปปี้โค้ดต่อไปนี้ลงในไฟล์ที่ต้องการสร้างใหม่';
 $string['configfilewritten'] = 'สร้าง config.php เรียบร้อยแล้ว';
+$string['configurationcompletehead'] = 'ตั้งค่าตัวแปรเสร็จสิ้นแล้ว';
+$string['configurationcompletesub'] = 'Moodle ทำการบันทึกไฟล์การตั้งค่าลงในโฟลเดอร์ moodle หลังจากทำการติดตั้ง';
 $string['continue'] = 'ขั้นต่อไป';
 $string['database'] = 'ฐานข้อมูล';
+$string['databasecreationsettingshead'] = 'คุณจำเป็นต้องตั้งค่าฐานข้อมูลที่ใช้ในการเก็บข้อมูลของ moodle ฐานข้อมูลดังกล่าวจะต้องมีการสร้างไว้แล้วล่วงหน้า';
+$string['databasecreationsettingssub'] = '<b>ประเภท:</b> ตั้งค่าไว้ที่ mysql <br />
+
+<b>โฮสต์:</b> ตั้งค่าไว้ที่ localhost <br />
+
+<b>ชื่อฐานข้อมูล:</b> ชื่อฐานข้อมูล, เช่น moodle<br />
+
+<b>ชื่อผู้ใช้ (user):</b>ตั้งค่าไว้ที่ root <br />
+
+<b>รหัสผ่าน:</b> รหัสผ่านเข้าฐานข้อมูล<br />
+
+<b>คำนำหน้าตาราง:</b> คำนำหน้าตาราง มีประโยชน์หากมีฐานข้อมูลของหลายโปรแกรมทำให้แยกออกได้ง่ายว่า ตารางใดเป็นของโปรแกรมใด เช่น mdl_';
+$string['databasesettingshead'] = 'คุณจำเป็นต้องตั้งค่าฐานข้อมูลที่ใช้ในการเก็บข้อมูลของ moodle ฐานข้อมูลดังกล่าวจะต้องมีการสร้างไว้แล้วล่วงหน้า';
+$string['databasesettingssub'] = '<b>ประเภท:</b> ตั้งค่าไว้ที่ mysql <br />
+
+<b>โฮสต์:</b> ตั้งค่าไว้ที่ localhost <br />
+
+<b>ชื่อฐานข้อมูล:</b> ชื่อฐานข้อมูล, เช่นmoodle<br />
+
+<b>ชื่อผู้ใช้ (username):</b>ตั้งค่าไว้ที่ root <br />
+
+<b>รหัสผ่าน:</b> รหัสผ่านเข้าฐานข้อมูล<br />
+
+<b>คำนำหน้าตาราง:</b> คำนำหน้าตาราง มีประโยชน์หากมีฐานข้อมูลของหลายโปรแกรมทำให้แยกออกได้ง่ายว่า ตารางใดเป็นของโปรแกรมใด เช่น mdl_';
 $string['dataroot'] = 'ไดเรกทอรีข้อมูล';
 $string['datarooterror'] = 'ไม่พบไดเรกทอรีข้อมูลที่คุณระบุไว้หรือไม่สามารถสร้างได้ กรุณาแก้ไข Path ให้ถูกต้องหรือสร้างไดเรกทอรีนี้ใหม่';
 $string['dbconnectionerror'] = 'ไม่สามารถติดต่อฐานข้อมูลที่คุณระบุไว้ได้ กรุณาตรวจสอบค่าที่ตั้งไว้ของฐานข้อมูล';
@@ -26,9 +59,35 @@ $string['dbcreationerror'] = 'มีข้อผิดพลาดในกา
 $string['dbhost'] = 'โฮสต์เซิร์ฟเวอร์';
 $string['dbprefix'] = 'คำนำหน้าตาราง (Table Prefix)';
 $string['dbtype'] = 'ประเภท';
+$string['dbwrongencoding'] = 'ฐานข้อมูลที่เลือกกำลังทำงานด้วยการเข้ารหัส $a ซึ่งไม่แนะนำเป็นอย่างยิ่งแนะนำให้ใช้การเข้ารหัสแบบ unicode (UTF-8) ท่านสามารถเลือกที่จะข้ามการทดสอบได้โดยการเลือกที่ \"ข้ามการทดสอบการเข้ารหัสของฐานข้อมูล\" เช็คข้างล่างนี้แต่ท่านอาจพบปัญหาในอนาคต';
+$string['directorysettingshead'] = 'กรุณายืนยันที่ตั้งของการติดตั้ง Moodle';
+$string['directorysettingssub'] = '<p><b>ที่อยู่ของเว็บ (Web Address):</b>
+
+ระบุที่อยู่ของเว็บไซต์ที่คุณจะนำ Moodle ไปใช้ ถ้าหากเว็บของคุณเข้าผ่าน URLs หลายขั้นให้เลือกที่นักเรียนของคุณจะเข้าไปใช้ ไม่ต้องใส่เครื่องหมาย /  ปิดท้าย</p>
+
+<p><b>ไดเรกทอรี moodle </b>
+
+ระบุ path ของไดเรกทอรีเต็ม ๆ ที่ใช้ในการติดตั้ง ระวังเรื่องการใช้ชื่อตัวพิมพ์ใหญ่พิมพ์เล็กให้ดี ให้แน่ใจว่าถูกต้อง </p>
+
+<p><b>ไดเรกทอรีข้อมูล:</b>
+
+ไดเรกทอรีนี้จะเป็นที่เก็บไฟล์ที่ moodle จะทำการบันทึกไว้ เป็นข้อมูลของเว็บ ดังนั้นควรให้สิทธิ์ในการอ่าน และ เขียนลงไดเรกทอรีนี้  (ทั่วไปแล้ว \'nobody\' หรือ \'apache\') แต่ไม่ควรเข้าไปตรง ๆ ผ่านเว็บได้
+</p>';
 $string['dirroot'] = 'Moodle ไดเรกทอรี';
-$string['dirrooterror'] = 'การตั้งค่า ไดเรกทอรี moodle ไม่ถูกต้อง ไม่พบไฟล์ติดตั้งที่ระบุ  ระบบทำการรีเซ็ตค่าด้านล่างนี้ ';
+$string['dirrooterror'] = 'การตั้งค่า ไดเรกทอรี moodle ไม่ถูกต้อง ไม่พบไฟล์ติดตั้งที่ระบุ  ระบบทำการรีเซ็ตค่าด้านล่างนี้';
 $string['download'] = 'ดาวน์โหลด';
+$string['downloadlanguagebutton'] = 'ดาวน์โหลด \"$a\" ไฟล์ภาษา';
+$string['downloadlanguagehead'] = 'ดาวน์โหลดไฟล์ภาษา';
+$string['downloadlanguagenotneeded'] = 'คุณสามารถดำเนินการติดตั้งโดยใช้ภาษาที่ตั้งค่าไว้ \"$a\"';
+$string['downloadlanguagesub'] = 'คุณมีตัวเลือกในการดาวน์โหลดไฟล์ภาษาและดำเนินการติดตั้งด้วยภาษาดังกล่าว <br /><br /> ถ้าหากคุณไม่สามารถดาวน์โหลดภาษาได้การติดตั้งจะดำเนินการต่อด้วยภาษาอังกฤษ (หลังจากที่ติดตั้งสำเร็จแล้วท่านสามารถดาวน์โหลดภาษาได้ในภายหลัง)';
+$string['environmenterrortodo'] = 'ท่านต้องแก้ไขปัญหาของระบบทั้งหมดที่ตรวจพบข้างต้นก่อนที่จะทำการติดตั้ง Moodle เวอร์ชันนี้';
+$string['environmenthead'] = 'ตรวจสอบความพร้อมของระบบ';
+$string['environmentrecommendinstall'] = 'แนะนำสำหรับการติดตั้ง/เปิดใช้งาน';
+$string['environmentrecommendversion'] = 'ระบบต้องการเวอร์ชัน $a->needed ขณะนี้ท่านกำลังใช้งานเวอร์ชัน $a->current';
+$string['environmentrequireinstall'] = 'ต้องการเพื่อทำการติดตั้ง/เปิดใช้งาน';
+$string['environmentrequireversion'] = 'ต้องการเวอร์ชัน $a->needed ขณะนี้ท่านกำลังใช้งานเวอร์ชัน $a->current';
+$string['environmentsub'] = 'กำลังทำการตรวจสอบคอมโพเนนท์ต่าง ๆ ของระบบว่าตรงตามความต้องการของ Moodle หรือไม่';
+$string['environmentxmlerror'] = 'มีข้อผิดพลาดในการอ่านข้อมูล ($a->error_code)';
 $string['error'] = 'มีข้อผิดพลาด';
 $string['fail'] = 'ล้มเหลว';
 $string['fileuploads'] = 'ไฟล์อัพโหลด';
@@ -41,15 +100,19 @@ $string['gdversionhelp'] = '<p>เซิร์ฟเวอร์ของคุ
 
 <p> การติดตั้ง GD ใน PHP ภายใต้ยูนิกซ์เซิร์ฟเวอร์นั้น ใช้ตัวเปร  --with-gd</p>
 
-<p>ส่วนภายใต้การใช้งานวินโดว์คุณสามารถติดตั้งโดยการแก้ไขไฟล์  php.ini และเอาเครื่องหมายคอมเมนต์ด้านหน้า libgd.dll ออก</p>';
+<p>ส่วนภายใต้การใช้งานวินโดว์คุณสามารถติดตั้งโดยการแก้ไขไฟล์  php.ini และเอาเครื่องหมายคอมเมนต์ด้านหน้า php_gd2.dll ออก</p>';
 $string['globalsquotes'] = 'การใช้งานแบบ Globals ยังไม่ปลอดภัย';
 $string['globalsquoteserror'] = 'แก้ไขค่า PHP ของท่านโดยปิดการใช้งาน register_globals และ/หรือ เปิดการใช้งาน magic_quotes_gpc';
 $string['help'] = 'ช่วยเหลือ';
+$string['iconvrecommended'] = 'ควรทำการติดตั้งไลบรารี ICONV เพื่อช่วยให้การทำงานของเว็บไซต์ดีขึ้น โดยเฉพาะอย่างยิ่งถ้าเว็บไซต์ของท่านมีการใช้งานภาษาอื่นนอกเหนือจากละติน';
 $string['info'] = 'ข้อมูล';
 $string['installation'] = 'การติดตั้ง';
+$string['langdownloaderror'] = 'ภาษา \"$a\" ไม่ได้รับการติดตั้ง กระบวนการติดตั้งจะดำเนินไปด้วยภาษาอังกฤษ';
+$string['langdownloadok'] = 'ภาษา\"$a\" ได้รับการติดตั้งเรียบร้อยแล้ว กระบวนการติดตั้งจะดำเนินไปด้วยภาษานี้';
 $string['language'] = 'ภาษาที่ใช้ในเว็บ';
 $string['magicquotesruntime'] = 'Magic Quotes Run Time';
 $string['magicquotesruntimeerror'] = 'ควรจะปิด (off)';
+$string['mbstringrecommended'] = 'แนะนำให้ติดตั้งไลบราลี MBSTRING เพื่อช่วยให้เว็บไซต์ทำงานได้ดีขึ้นสำหรับเว็บที่ไม่ใช้งานภาษาละติน';
 $string['memorylimit'] = 'ความจำสูงสุด (Memory Limit)';
 $string['memorylimiterror'] = 'ความจำสูงสุดที่คุณตั้งไว้ค่อนข้างต่ำ อาจมีปัญหาในภายหลังค่ะ';
 $string['memorylimithelp'] = '<p>ค่าความจำสูงสุดของเซิร์ฟเวอร์ของคุณตั้งไว้ที่  $a</p>
@@ -71,6 +134,8 @@ $string['memorylimithelp'] = '<p>ค่าความจำสูงสุด
 <p>อย่างไรก็ตามในบางเซิร์ฟเวอร์คุณไม่สามารถใช้ วิธีนี้ได้ โดยจะมีการแสดง error ขึ้นมาคุณจำเป็นต้องลบไฟล์ดังกล่าวนี้ทิ้ง 
 </ol>';
 $string['moodledocslink'] = 'เอกสารช่วยเหลือสำหรับหน้านี้';
+$string['mysql416bypassed'] = 'ถ้าหากเว็บไซต์ของท่านใช้งานภาษาละติดเท่านนั้น iso-8859-1 (latin) ท่านสามารถที่จะทำการติดตั้งและใช้งาน MySQL 4.1.12 หรือสูงกว่าได้เลย';
+$string['mysql416required'] = 'สำหรับ moodle 1.6 นี้เพื่อให้ฐานข้อมูลทั้งหมดเปลี่ยนเป็น Unicode จำเป็นต้องมีการใช้งาน MySQL 4.1.16 ขึ้นไป';
 $string['mysqlextensionisnotpresentinphp'] = 'การตั้งค่า  PHP ให้ใช้กับ MySQL ไม่ถูกต้องกรุณาตรวจสอบใน php.ini อีกครั้งหรือรีคอมไฟล์ php';
 $string['name'] = 'ชื่อ';
 $string['next'] = 'ต่อไป';
@@ -93,10 +158,19 @@ $string['safemode'] = 'Safe Mode';
 $string['safemodeerror'] = 'moodle อาจมีปัญหาหาก safe mode on';
 $string['sessionautostart'] = 'Session Auto Start';
 $string['sessionautostarterror'] = 'ควรจะปิด (off)';
+$string['skipdbencodingtest'] = 'ข้ามการทดสอบการเข้ารหัสของฐานข้อมูล';
 $string['status'] = 'สถานะ';
 $string['thischarset'] = 'UTF-8';
 $string['thislanguage'] = 'Thai';
 $string['user'] = 'สมาชิก';
+$string['welcomep10'] = '$a->installername ($a->installerversion)';
+$string['welcomep20'] = 'ท่านได้ทำการติดตั้ง<strong>$a->packname $a->packversion</strong> สำเร็จแล้ว';
+$string['welcomep30'] = 'เวอร์ชั่น <strong>$a->installername</strong>รวมโปรแกรมสำหรับสร้างความให้กับระบบซึ่ง Moodle สามารถทำงานได้';
+$string['welcomep40'] = 'แพ็กเกจนี้รวม <strong>Moodle $a->moodlerelease ($a->moodleversion)</strong>.';
+$string['welcomep50'] = 'การใช้งานโปรแกรมต่าง ๆ ในแพ็กเกจนี้สามารถทำได้โดยไม่ละเมิดสัญญานุญาตของแต่ละโปรแกรม  โปแกรม<strong>$a->installername</strong>เต็มรูปแบบนั้นจัดเป็นโปรแกรมประเภท 
+<a href=\"http://www.opensource.org/docs/definition_plain.html\">โอเพ่นซอร์ส</a> และเผยแพร่ภายใต้สํญญานุญาต <a href=\"http://www.gnu.org/copyleft/gpl.html\">GPL</a>';
+$string['welcomep60'] = 'หน้าถัดจากนี้ไปจะเป็นการตั้งค่า Moodle บนคอมพิวเตอร์คุณสามารถยอมรับค่าที่ตั้งไว้ทั้งหมดหรือเปลี่ยนแปลงให้เหมาะกับความต้องการ';
+$string['welcomep70'] = 'คลิกที่ \"ต่อไป\" เพื่อติดตั้ง Moodle ต่อไป';
 $string['wwwroot'] = 'ที่อยู่ของเว็บ';
 $string['wwwrooterror'] = 'ที่อยู่ของเว็บไม่ถูกต้อง ระบบไม่พบว่ามี Moodle อยู่ที่นั่น';
 ?>

install/lang/tl_utf8/installer.php

@@ -24,7 +24,7 @@ $string['cannotsavemd5file'] = 'Hindi maisilid ang sakong md5.';
 $string['cannotsavezipfile'] = 'Hindi maisilid ang sakong ZIP.';
 $string['cannotunzipfile'] = 'Hindi mai-unzip ang sako.';
 $string['caution'] = 'Mag-ingat';
-$string['check'] = 'Tsekan';
+$string['check'] = 'Suriin';
 $string['chooselanguagehead'] = 'Pumilì ng wika';
 $string['chooselanguagesub'] = 'Pumili po ng wika para sa pagluluklok LAMANG.  Sa mga susunod na iskrin ay makakapili ka ng wika para sa site o tagagamit.';
 $string['closewindow'] = 'Isara ang bintanang ito';
@@ -53,6 +53,42 @@ $string['databasesettingssub'] = '<b>Uri:</b> mysql o postgres7<br />
        <b>Tagagamit:</b> ang iyong bansag para sa datosan<br />
        <b>Kontrasenyas:</b> ang iyong kontrasenyas ng datosan<br />
        <b>Unlapi ng mga Teybol:</b> opsiyonal na unlapi na gagamitin sa lahat ng pangalan ng teybol';
+$string['databasesettingssub_mssql'] = '<b>Uri:</b> SQL*Server (hindi UTF-8) <b><font color=\"red\">Eksperimental! (hindi dapat gamitin sa produksiyon)</font></b><br />
+       <b>Host:</b> eg localhost o db.isp.com<br />
+       <b>Pangalan:</b> pangalan ng datosan, eg moodle<br />
+       <b>Tagagamit:</b> ang iyong bansag para sa datosan<br />
+       <b>Kontrasenyas:</b> ang iyong kontrasenyas ng datosan<br />
+       <b>Unlapi ng mga Teybol:</b> unlapi na gagamitin sa lahat ng pangalan ng teybol (kinakailangan)';
+$string['databasesettingssub_mssql_n'] = '<b>Uri:</b> SQL*Server (gumagana ang UTF-8)<br />
+       <b>Host:</b> eg localhost o db.isp.com<br />
+       <b>Pangalan:</b> pangalan ng datosan, eg moodle<br />
+       <b>Tagagamit:</b> ang iyong bansag para sa datosan<br />
+       <b>Kontrasenyas:</b> ang iyong kontrasenyas ng datosan<br />
+       <b>Unlapi ng mga Teybol:</b> unlapi na gagamitin sa lahat ng pangalan ng teybol (kinakailangan)';
+$string['databasesettingssub_mysql'] = '<b>Uri:</b> MySQL<br />
+       <b>Host:</b> eg localhost o db.isp.com<br />
+       <b>Pangalan:</b> pangalan ng datosan, eg moodle<br />
+       <b>Tagagamit:</b> ang iyong bansag para sa datosan<br />
+       <b>Kontrasenyas:</b> ang iyong kontrasenyas ng datosan<br />
+       <b>Unlapi ng mga Teybol:</b> unlapi na gagamitin sa lahat ng pangalan ng teybol (opsiyonal)';
+$string['databasesettingssub_oci8po'] = '<b>Uri:</b> Oracle<br />
+       <b>Host:</b> hindi ginagamit, dapat ay iwang blangko<br />
+       <b>Pangalan:</b> ibinigay na pangalan ng koneksiyong tnsnames.ora<br />
+       <b>Tagagamit:</b> ang iyong bansag para sa datosan<br />
+       <b>Kontrasenyas:</b> ang iyong kontrasenyas ng datosan<br />
+       <b>Unlapi ng mga Teybol:</b> unlapi na gagamitin sa lahat ng pangalan ng teybol (kinakailangan, 2cc. max)';
+$string['databasesettingssub_odbc_mssql'] = '<b>Uri:</b> SQL*Server (sa pamamgitan ng ODBC) <b><font color=\"red\">Eksperimental! (huwag gamitin sa produksiyon)</font></b><br />
+       <b>Host:</b> ibinigay na pangalan ng DSN sa OBDC control panel<br />
+       <b>Pangalan:</b> pangalan ng datosan, eg moodle<br />
+       <b>Tagagamit:</b> ang iyong bansag para sa datosan<br />
+       <b>Kontrasenyas:</b> ang iyong kontrasenyas ng datosan<br />
+       <b>Unlapi ng mga Teybol:</b> unlapi na gagamitin sa lahat ng pangalan ng teybol (kinakailangan)';
+$string['databasesettingssub_postgres7'] = '<b>Uri:</b> PostgreSQL<br />
+       <b>Host:</b> eg localhost o db.isp.com<br />
+       <b>Pangalan:</b> pangalan ng datosan, eg moodle<br />
+       <b>Tagagamit:</b> ang iyong bansag para sa datosan<br />
+       <b>Kontrasenyas:</b> ang iyong kontrasenyas ng datosan<br />
+       <b>Unlapi ng mga Teybol:</b> unlapi na gagamitin sa lahat ng pangalan ng teybol (kinakailangan)';
 $string['dataroot'] = 'Bugsok ng Datos';
 $string['datarooterror'] = 'Hindi matagpuan o malikha ang \'Bugsok ng Datos\' na ibinigay mo.  Alin sa dalawa, iwasto mo ang landas o lumikha ng bugsok nang mano-mano.';
 $string['dbconnectionerror'] = 'Hindi kami makakonekta sa ibinigay mong datosan.  Pakitsek ang kaayusan ng iyong datosan.';
@@ -60,6 +96,9 @@ $string['dbcreationerror'] = 'Nagka-error sa paglikha ng datosan.  Hindi malikha
 $string['dbprefix'] = 'Unlapi ng mga teybol';
 $string['dbtype'] = 'Uri';
 $string['dbwrongencoding'] = 'Ang piniling datosan ay gumagana alinsunod sa hindi iminumungkahing encoding ($a).  Mas makabubuti na gamitin ang isa sa mga inencode sa Unicode (UTF-8) na datosan.  Magkagayunman, maaari mong lagpasan ang pagsubok na ito sa pamamagitan ng pagpili sa tsek ng \"Lagpasan ang Pagsubok ng DB Encoding\" sa ibaba, pero maaari kang makaranas ng mga problema sa hinaharap.';
+$string['dbwronghostserver'] = 'Kailangan mong sundin ang mga patakaran ng \"Host\" tulad ng ipinaliwanag sa itaas.';
+$string['dbwrongnlslang'] = 'Kailangang gamitin ng pangkapaligirang baryabol na NLS_LANG sa inyong web server ang AL32UTF8 charset.  Tingnan ang dokumentasyon ng PHP hinggil sa kung paano aayusin ang katangiang OCI8.';
+$string['dbwrongprefix'] = 'Kailangan mong sundin ang mga patakaran ng \"Tables Prefix\" tulad ng ipinaliwanag sa itaas.';
 $string['directorysettingshead'] = 'Pakikumpirma ang mga lokasyon ng iluluklok na Moodle';
 $string['directorysettingssub'] = '<b>Web Address:</b>
 Ibigay ang buong web address kung saan papasukin ang Moodle.
@@ -88,7 +127,7 @@ $string['downloadlanguagehead'] = 'Ilusong ang pakete ng wika';
 $string['downloadlanguagenotneeded'] = 'Maaari mong ipagpatuloy ang proseso ng pagluluklok sa pamamagitan ng umiiral na pakete ng wika, na \"$a\".';
 $string['downloadlanguagesub'] = 'May opsiyon ka ngayon na maglusong ng pakete ng wika at ipagpatuloy ang proseso ng pagluluklok sa
 wikang ito.<br /><br />Kung hindi mo mailusong ang pakete ng wika, ang proseso ng pagluluklok ay magpapatuloy sa Ingles.(Kapag tapos na ang proseso ng pagluluklok, magkakaroon ka ng pagkakataon na maglusong at magluklok ng iba pang pakete ng wika.)';
-$string['environmenterrortodo'] = 'Kailangan mo munang lutasin ang lahat ng suliraning pangkapaligiran (mga error) bago mo maituloy ang pagluklok ng bersiyon ng Moodle na ito.';
+$string['environmenterrortodo'] = 'Kailangan mo munang lutasin ang lahat ng suliraning pangkapaligiran (mga error) na natuklasan sa itaas bago mo maituloy ang pagluklok ng bersiyon ng Moodle na ito!';
 $string['environmenthead'] = 'Sinusuri ang kapaligiran mo...';
 $string['environmentrecommendinstall'] = 'ay iminumungkahing maluklok/mabuhay';
 $string['environmentrecommendversion'] = 'ang bersiyon $a->needed ay iminumungkahi at ang pinatatakbo mo ay $a->current';
@@ -110,7 +149,7 @@ $string['gdversionhelp'] = '<p>Mukhang hindi nakaluklok ang GD sa server mo.</p>
 
 <p>Para maidagdag ang GD sa PHP sa loob ng Unix, ikompayl ang PHP gamit ang  --with-gd na parameter.</p>
 
-<p>Sa loob ng Windows kadalasan ay maeedit mo ang php.ini at tanggalin ang comment sa linya na tumutukoy sa  libgd.dll.</p>';
+<p>Sa loob ng Windows kadalasan ay maeedit mo ang php.ini at tanggalin ang comment sa linya na tumutukoy sa  php_gd2.dll.</p>';
 $string['globalsquotes'] = 'Di-ligtas na Pagmanipula ng mga Global';
 $string['globalsquoteserror'] = 'Ayusin ang iyong mga kaayusan ng PHP:  patayin ang register_globals at/o buhayin ang magic_quotes_gpc';
 $string['help'] = 'Tulong';
@@ -145,13 +184,19 @@ $string['memorylimithelp'] = '<p>Ang memory limit ng PHP para sa server mo ay ka
 </ol>';
 $string['missingrequiredfield'] = 'May ilang nawawalang pitak na kailangan';
 $string['moodledocslink'] = 'Mga Dokyu ng Moodle para sa pahinang ito';
+$string['mssql_n'] = 'SQL*Server na may UTF-8 support (mssql_n)';
+$string['mssqlextensionisnotpresentinphp'] = 'Ang PHP ay hindi wastong naisaayos na may MSSQL extension para magawa nitong makipag-ugnayan sa SQL*Server.  Pakisuri po ang inyong sakong php.ini o muli ikompayl ang PHP.';
 $string['mysql416bypassed'] = 'Magkagayuman, kung TANGING iso-8859-1 (latin) na wika ang ginagamit ng site mo, maaari mong ipagpatuloy ang kasalukuyan mong nakaluklok na MySQL 4.1.12 (o mas bago).';
 $string['mysql416required'] = 'Ang MySQL 4.1.16 ang minimum na bersiyong kinakailangan ng Moodle 1.6 upang matiyak na lahat ng datos ay makukumberte sa UTF-8, sa hinaharap.';
 $string['mysqlextensionisnotpresentinphp'] = 'Hindi isinaayos ang PHP na may MySQL extension para magawa nitong makipag-usap sa MySQL.  Pakitsek ang iyong sakong php.ini o muling ikompayl ang PHP.';
 $string['name'] = 'Pangalan';
 $string['next'] = 'Susunod';
+$string['ociextensionisnotpresentinphp'] = 'Ang PHP ay hindi wastong naisaayos na may OCI8 extension para magawa nitong makipag-ugnayan sa Oracle.  Pakisuri po ang inyong sakong php.ini o muli ikompayl ang PHP.';
+$string['odbc_mssql'] = 'SQL*Server sa pamamagitan ng ODBC (odbc_mssql)';
+$string['odbcextensionisnotpresentinphp'] = 'Ang PHP ay hindi wastong naisaayos na may ODBC extension para magawa nitong makipag-ugnayan sa SQL*Server.  Pakisuri po ang inyong sakong php.ini o muli ikompayl ang PHP.';
 $string['pass'] = 'Pasado';
 $string['password'] = 'Kontrasenyas';
+$string['pgsqlextensionisnotpresentinphp'] = 'Ang PHP ay hindi wastong naisaayos na may PGSQL extension para magawa nitong makipag-ugnayan sa PostgreSQL.  Pakisuri po ang inyong sakong php.ini o muli ikompayl ang PHP.';
 $string['php50restricted'] = 'Ang PHP 5.0.x ay maraming problema, itaas po ang bersiyon sa 5.1.x o ibaba sa 4.3.x o 4.4.x';
 $string['phpversion'] = 'Bersiyon ng PHP';
 $string['phpversionerror'] = 'Ang pinakamababang bersiyon ng PHP na puwedeng gamitin ay 4.3.0 o 5.1.0 (ang 5.0.x ay maraming problema)';
@@ -170,6 +215,8 @@ $string['skipdbencodingtest'] = 'Lagpasan ang Pagsubok sa DB Encoding';
 $string['status'] = 'Katayuan';
 $string['thischarset'] = 'UTF-8';
 $string['thislanguage'] = 'Tagalog';
+$string['unicoderecommended'] = 'Iminumungkahi ang pag-imbak ng lahat ng datos mo sa Unicode (UTF-8).  Ang bagong luklok ay dapat may mga datosan na ang umiiral na set ng karakter ay Unicode.  Kung ginagawa mong bago ang iniluklok mo, dapat mong isakatuparan ang proseso ng pagsalin sa UTF-8 (tingnan ang pahinang pang-Admin).';
+$string['unicoderequired'] = 'Kinakailangan na imbakin ang lahat ng datos mo sa anyong Unicode (UTF-8). Ang bagong luklok ay dapat may mga datosan na ang umiiral na set ng karakter ay Unicode.  Kung ginagawa mong bago ang iniluklok mo, dapat mong isakatuparan ang proseso ng pagsalin sa UTF-8 (tingnan ang pahinang pang-Admin).';
 $string['user'] = 'Tagagamit';
 $string['welcomep10'] = '$a->installername ($a->installerversion)';
 $string['welcomep20'] = 'Nakikita mo ang pahinang ito dahil matagumpay mong nailuklok at napagana ang paketeng <strong>$a->packname $a->packversion</strong> sa iyong kompyuter.  Maligayang bati!';

install/lang/to_utf8/installer.php

@@ -40,7 +40,7 @@ $string['gdversionhelp'] = '<p>Ngalingali \'oku te\'ekiai ke fokotu\'u e GD \'i
 
 <p>Ke tanaki e GD ki he PHP \'ihe Unix, fakatahataha\'i e PHP ngaue\'aki e --moe-gd tafatafa\'aki.</p>
 
-<p>\'Ihe Uinitou, teke fa\'amalava pee \'o \'etita\'i php.ini mo to\'o e komeni \'oe laine fakahinohino libgd.dll.</p>';
+<p>\'Ihe Uinitou, teke fa\'amalava pee \'o \'etita\'i php.ini mo to\'o e komeni \'oe laine fakahinohino php_gd2.dll.</p>';
 $string['help'] = 'Tokoni';
 $string['installation'] = 'Fokotu\'u';
 $string['language'] = 'Lea';

install/lang/tr_utf8/installer.php

@@ -144,7 +144,7 @@ Moodle GD olmadan da çalışır, ancak yukarıda bahsedilen özelliklerden yara
 
 <p>Unix altında PHP\'ye GD desteğini sağlamak için, PHP\'yi --with-gd parametresiyle derleyin.</p>
 
-<p>Windows altında php.ini dosyasını düzenler ve libgd.dll\'yi referans eden satırdaki yorumları kaldırırsınız.</p>';
+<p>Windows altında php.ini dosyasını düzenler ve php_gd2.dll\'yi referans eden satırdaki yorumları kaldırırsınız.</p>';
 $string['globalsquotes'] = 'Güvensiz Global Değişkenler';
 $string['globalsquoteserror'] = 'PHP ayarlarınızı düzeltin. register_globals\'ı kapalı ve/veya magic_quotes_gpc açık tutun.';
 $string['help'] = 'Yardım';
@@ -221,6 +221,8 @@ $string['skipdbencodingtest'] = 'Veritabanı Dil Kodlama Testini Atla';
 $string['status'] = 'Durum';
 $string['thischarset'] = 'UTF-8';
 $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['user'] = 'Kullanıcı';
 $string['welcomep10'] = '$a->installername ($a->installerversion)';
 $string['welcomep20'] = 'Bilgisayarınıza <strong>$a->packname $a->packversion</strong> paketini başarıyla kurdunuz. Tebrikler!';

install/lang/vi_utf8/installer.php

@@ -27,6 +27,7 @@ $string['dbtype'] = 'Type';
 $string['dirroot'] = 'Thư mục Moodle';
 $string['dirrooterror'] = '  Thiết lập \'Thư mục Moodle\' dường như không đúng - chúng tôi không thể tìm thấy các file cài đặt Moodle ở đó. Giá trị dưới đây được đặt lại.';
 $string['download'] = 'Tải xuống';
+$string['environmentrequireinstall'] = 'cầnphải được cài hay kích hoạt.';
 $string['error'] = 'Lỗi';
 $string['fail'] = 'Thất bại';
 $string['fileuploads'] = 'File tải lên';
@@ -42,7 +43,7 @@ $string['gdversionhelp'] = '<p> Máy chủ của bạn hình như không cài GD
 
 <p>Để thêm GD vào PHP dưới hệ điều hành Unix, biên dịch PHP sử dụng tham số--with-gd. </p>
 
-<p>Dưới hệ điều hành Windows bạn có thể soạn thảo file php.ini và bỏ dấu chú thích dòng tham chiếu đến libgd.dll.</p>';
+<p>Dưới hệ điều hành Windows bạn có thể soạn thảo file php.ini và bỏ dấu chú thích dòng tham chiếu đến php_gd2.dll.</p>';
 $string['help'] = 'Trợ giúp';
 $string['installation'] = 'Cài đặt';
 $string['language'] = 'Ngôn ngữ';

install/lang/zh_cn_utf8/installer.php

@@ -96,7 +96,7 @@ $string['gdversionhelp'] = '<p>您的服务器看上去并没有安装GD。</p>
 
 <p>在Unix上为PHP增加GD功能，可以用--with-gd选项来编译PHP。</p>
 
-<p>在Windows上，修改php.ini并去掉libgd.dll行前的注释符号就可以了。</p>';
+<p>在Windows上，修改php.ini并去掉php_gd2.dll行前的注释符号就可以了。</p>';
 $string['globalsquotes'] = '处理全局变量的方式不安全';
 $string['globalsquoteserror'] = '修正您的PHP设置：禁用register_globals和/或启动magic_quotes_gpc。';
 $string['help'] = '帮助';

lang/en_utf8/admin.php

@@ -2,6 +2,7 @@
       // admin.php - created with Moodle 1.7 beta + (2006101003)
 
 
+$string['accessdenied'] = 'Access denied';
 $string['accounts'] = 'Accounts';
 $string['adminseesall'] = 'Admins See All';
 $string['adminseesallevents'] = 'Administrators see all events';
@@ -427,9 +428,9 @@ $string['timezoneforced'] = 'This is forced by the site administrator';
 $string['timezoneisforcedto'] = 'Force all users to use';
 $string['timezonenotforced'] = 'Users can choose their own timezone';
 $string['unbookmarkthispage'] = 'unbookmark this page';
-$string['unicodeupgradenotice'] = 'In Moodle 1.6 we have migrated all languages to Unicode.  To complete the upgrade for this site, you need to convert all the data in your database to Unicode using our migration script.  <a href=\"utfdbmigrate.php\">Click here to run the migration script now</a>!';
-$string['unicoderecommended'] = 'UTF-8 database migration is recommended, new installations should be performed into unicode enabled databases';
-$string['unicoderequired'] = 'Unicode enabled database is required for installation or upgrade. Please make sure that database is properly migrated to unicode before upgrading to this version.';
+$string['unicodeupgradenotice'] = 'In Moodle 1.6 we have migrated all languages to Unicode.  To complete the upgrade for this site, you need to convert all the data in your database to Unicode (UTF-8) using our migration script.  <a href=\"utfdbmigrate.php\">Click here to run the migration script now</a>!';
+$string['unicoderecommended'] = 'Storing all your data in Unicode (UTF-8) is recommended. New installations should be performed into databases that have their default character set as Unicode.  If you are upgrading, you should perform the UTF-8 migration process (see the Admin page).';
+$string['unicoderequired'] = 'It is required that you store all your data in Unicode format (UTF-8). New installations must be performed into databases that have their default character set as Unicode.  If you are upgrading, you should perform the UTF-8 migration process (see the Admin page).';
 $string['uninstall'] = 'Uninstall selected language pack';
 $string['uninstallconfirm'] = 'You are about to completely uninstall language pack $a, are you sure?';
 $string['unsupported'] = 'Unsupported';

lang/en_utf8/assignment.php

@@ -83,7 +83,7 @@ $string['noassignments'] = 'There are no assignments yet';
 $string['noattempts'] = 'No attempts have been made on this assignment';
 $string['nofiles'] = 'No files were submitted';
 $string['nofilesyet'] = 'No files submitted yet';
-$string['notavailableyet'] = 'Sorry, this assignment is not yet available.<br />Assignment instructions will be displayed here on the date given bellow.';
+$string['notavailableyet'] = 'Sorry, this assignment is not yet available.<br />Assignment instructions will be displayed here on the date given below.';
 $string['notes'] = 'Notes';
 $string['notesempty'] = 'No entry';
 $string['notesupdateerror'] = 'Error when updating notes';

lang/en_utf8/enrol_authorize.php

@@ -1,5 +1,5 @@
 <?PHP // $Id$ 
-      // enrol_authorize.php - created with Moodle 1.7 beta + (2006101003)
+      // enrol_authorize.php - created with Moodle 1.8 dev (2006102600)
 
 
 $string['adminacceptccs'] = 'Which credit card types will be accepted?';
@@ -9,7 +9,7 @@ $string['adminauthorizeemail'] = 'Email Sending Settings';
 $string['adminauthorizesettings'] = 'Authorize.net Settings';
 $string['adminauthorizewide'] = 'Site-Wide Settings';
 $string['adminavs'] = 'Check this if you have activated Address Verification System (AVS) in your authorize.net account. This demands address fields like street, state, country and zip when user fills out payment form.';
-$string['adminconfighttps'] = 'Please ensure that you have \"<a href=\"$a->url\">turned loginhttps ON</a>\" to use this plugin<br />in Admin &gt;&gt; Variables &gt;&gt; Security &gt;&gt; HTTP security.';
+$string['adminconfighttps'] = 'Please ensure that you have \"<a href=\"$a->url\">turned loginhttps ON</a>\" to use this plugin<br />in Admin >> Variables >> Security >> HTTP security.';
 $string['adminconfighttpsgo'] = 'Go to the <a href=\"$a->url\">secure page</a> to configure this plugin.';
 $string['admincronsetup'] = 'The cron.php maintenance script has not been run for at least 24 hours.<br />Cron must be enabled if you want to use scheduled-capture feature.<br /><b>Enable</b> \'Authorize.net plugin\' and <b>setup cron</b> properly; or <b>uncheck an_review</b> again.<br />If you disable scheduled-capture, transactions will be cancelled unless you review them within 30 days.<br />Check <b>an_review</b> and enter <b>\'0\' to an_capture_day</b> field<br />if you want to <b>manually</b> accept/deny payments within 30 days.';
 $string['adminemailexpired'] = 'This is useful for \'Manual-Capture\'. Admins are notified <b>$a</b> days prior to pending orders expiring.';
@@ -81,7 +81,7 @@ $string['ccno'] = 'Credit Card Number';
 $string['cctype'] = 'Credit Card Type';
 $string['ccvv'] = 'Card Verification';
 $string['ccvvhelp'] = 'Look at the back of card (last 3 digits)';
-$string['choosemethod'] = 'If you know the enrolment key of the cource, please enter it; otherwise you need to pay for this course.';
+$string['choosemethod'] = 'If you know the enrolment key of the cource, please enter it below;<br />Otherwise you need to pay for this course.';
 $string['chooseone'] = 'Fill one or both of the following two fields. The password isn\'t shown.';
 $string['costdefaultdesc'] = '<strong>In course settings, enter -1</strong> to use this default cost to course cost field.';
 $string['cutofftime'] = 'Transaction Cut-Off Time. When the last transaction is picked up for settlement?';
@@ -103,6 +103,7 @@ $string['invalidaba'] = 'Invalid ABA number';
 $string['invalidaccnum'] = 'Invalid account number';
 $string['invalidacctype'] = 'Invalid account type';
 $string['logindesc'] = 'This option must be ON. <br /><br />Please ensure that you have turned <a href=\"$a->url\">loginhttps ON</a> in Admin >> Variables >> Security.<br /><br />Turning this on will make Moodle use a secure https connection just for the login and payment pages.';
+$string['logininfo'] = 'Login name, password and transaction key are not shown due to security precautions. There is no need to enter again if you have configured these fields before. You see a green text left of the box if some fields were already configured. If you enter these fields for the first time, the login name (*) is required and you must enter <strong>either</strong> the transaction key (#1) <strong>or</strong> the password (#2) in the appropriate box. We recommend you enter the transaction key due to security precautions. If you want to delete the current password, tick the checkbox.';
 $string['methodcc'] = 'Credit Card';
 $string['methodecheck'] = 'eCheck (ACH)';
 $string['missingaba'] = 'Missing ABA number';
@@ -113,6 +114,7 @@ $string['missingccexpire'] = 'Missing expiration date';
 $string['missingcctype'] = 'Missing card type';
 $string['missingcvv'] = 'Missing verification number';
 $string['missingzip'] = 'Missing postal code';
+$string['mypaymentsonly'] = 'Show my payments only';
 $string['nameoncard'] = 'Name on Card';
 $string['new'] = 'New';
 $string['noreturns'] = 'No returns!';
@@ -121,6 +123,13 @@ $string['orderid'] = 'OrderID';
 $string['paymentmanagement'] = 'Payment Management';
 $string['paymentmethod'] = 'Payment Method';
 $string['paymentpending'] = 'Your payment is pending for this course with this order number $a->orderid.  See <a href=\'$a->url\'>Order Details</a>.';
+$string['pendingecheckemail'] = 'Dear manager,
+
+There are $a->count pending echecks now and you have to upload a csv file to get the users enrolled.
+
+Click the link and read the help file on the page seen:
+$a->url';
+$string['pendingechecksubject'] = '$a->course: Pending eChecks($a->count)';
 $string['pendingordersemail'] = 'Dear admin,
 
 $a->pending transactions for course \"$a->course\" will expire unless you accept payment within $a->days days.

lang/en_utf8/forum.php

@@ -75,7 +75,7 @@ $string['forum:deleteownpost'] = 'Delete own posts (within deadline)';
 $string['forum:editanypost'] = 'Edit any post';
 $string['forum:managesubscriptions'] = 'Manage subscriptions';
 $string['forum:movediscussions'] = 'Move discussions';
-$string['forum:nothrottling'] = 'No throttling';
+$string['forum:throttlingapplies'] = 'Throttling applies';
 $string['forum:rate'] = 'Rate posts';
 $string['forum:replypost'] = 'Reply to posts';
 $string['forum:splitdiscussions'] = 'Split discussions';
@@ -127,6 +127,7 @@ $string['movedmarker'] = '(Moved)';
 $string['movethisdiscussionto'] = 'Move this discussion to ...';
 $string['namenews'] = 'News forum';
 $string['namesocial'] = 'Social forum';
+$string['nameteacher'] = 'Teacher forum'; //depreciated after 1.7
 $string['newforumposts'] = 'New forum posts';
 $string['nodiscussions'] = 'There are no discussion topics yet in this forum';
 $string['noguestpost'] = 'Sorry, guests are not allowed to post.';
@@ -134,6 +135,8 @@ $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['nopostdiscussion'] = 'Sorry, you cannot post in this discussion';
+$string['nopostforum'] = 'Sorry, you cannot post in 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/data/mods.html

@@ -0,0 +1,4 @@
+<p><img alt="" src="<?php echo $CFG->wwwroot?>/mod/data/icon.gif" />&nbsp;<b>Database Activity</b></p>
+<div class="indent">
+The Database module allows the teacher and/or students to build, display and search a bank of record entries about any conceivable topic. The format and structure of these entries can be almost unlimited, including images, files, URLs, numbers and text amongst other things. You may be familiar with similar technology from building Microsoft Access or Filemaker databases.
+</div>

lang/en_utf8/help/enrol/authorize/uploadcsv.html

@@ -0,0 +1,24 @@
+<p align="center"><strong>Uploading Authorize.net CSV file</strong></p>
+<p>
+   This action must be performed if you have enabled eCheck (ACH) transactions.
+</p>
+<p>
+<ol>
+   <li>Login to your authorize.net account.</li>
+   <li>Run a REPORT or SEARCH transactions.</li>
+   <li>Select the date range if you search transactions.</li>
+   <li>A button called '<i>Download to File</i>' appears.</li>
+   <li>After clicked the button, tick '<i>Include Column Headings</i>' and select file type to be downloaded:
+       '<i>Expanded Fields/Comma Separated</i>' or '<i>Expanded Fields with CAVV Response/Comma Separated</i>'.</li>
+   <li>For more information click the help link on the page seen.</li>
+   <li>Click Submit button.</li>
+   <li>Once the file has been created, a pop up window will appear prompting you
+       to select the location where the file should be saved.</li>
+   <li>Please leave this window open until the pop up window prompting for your file location appears.
+       You may minimize this window by clicking the _ in the upper right hand corner to continue working.
+       Closing this window by clicking the X will cancel this action and your file will not be downloaded.</li>
+   <li>Once your file has been downloaded and saved to your local machine,
+       click the X in the upper right hand corner of this window to Close.</li>
+   <li>Finally, upload this CSV file to Moodle to enrol the users making payment by echeck.</li>
+</ol>
+</p>

lang/en_utf8/help/hotpot/clickreporttable.html

@@ -0,0 +1,74 @@
+<p align="center"><b>Click Trail</b></p>
+<p>
+    This table shows details of every click by every student 
+    during completed attempts at a particular Hot Potatoes quiz.
+</p>
+<p>
+    Please note that this report is very wide and can be very 
+    long, so it is intended to be downloaded and viewed using 
+    a spreadsheet program, such as Microsoft Excel.
+</p>
+<p>
+	Each row in the table contains the following information:
+</p>
+
+<p>
+    <b>Which click?</b><br />
+    The following details identify to which click in which attempt 
+    by which student at which quiz in which section of which course 
+    this row refers:
+</p>
+<ul>
+    <li>Course name, Section number, Exercise number, Exercise name, Exercise type, Number of questions</li>
+    <li>Student's full name, Login date, Login time, Logoff time</li>
+    <li>Attempt number, Attempt start time, Attempt finish time</li>
+    <li>Click number, Click time, Click type</li>
+</ul>
+
+<p>
+    <b>Which questions were affected?</b><br />
+    The following details are shown of which questions, 
+    if any, were affected by the current click:
+</p>
+<ul>
+    <li>questions which were checked, or given a hint or clue on the current click</li>
+    <li>the status of each question after the current click 
+        <ul>
+            <li><b>0</b> means &quot;correct&quot;</li>
+            <li><b>X</b> means &quot;wrong&quot;</li>
+            <li><b>-</b> means &quot;not attempted&quot;</li>
+        </ul>
+    </li>
+    <li>new answers which were received on the current click (answers that did not change are not shown)</li>
+    <li>questions for which new answers were received on the current click</li>
+    <li>questions for which new answers were received, or for which a hint or clue was given, on the current click</li>
+</ul>
+
+<p>
+    <b>How many questions were affected?</b><br />
+    The following details are shown of the total number 
+    of questions, if any, affected by the current click 
+    and the total number of questions affected so far 
+    in the quiz:
+</p>
+<ul>
+    <li>the number of questions attempted</li>
+    <li>the number of questions not attempted</li>
+    <li>the number of questions whose status is &quot;right&quot;</li>
+    <li>the number of questions whose status is &quot;wrong&quot;</li>
+    <li>the number of questions for which hints have been given</li>
+    <li>the number of questions for which clues have been given</li>
+    <li>the number of questions for which new answers have been received</li>
+    <li>the number of questions for which new answers have been received, or for which a hint or clue has been given</li>
+</ul>
+
+<p>
+    <b>Scores</b><br />
+    The following details are shown about scores for this click 
+    and for the quiz so far:
+</p>
+<ul>
+    <li>the raw score</li>
+    <li>the maximum score</li>
+    <li>the score as a percentage</li>
+</ul>

lang/en_utf8/help/hotpot/reportcontent.html

@@ -5,9 +5,7 @@
 <div class="indent">
     <p>
         <b>Overview</b><br />
-        This report is a list of attempts at this quiz.
-        &quot;abandoned&quot; attempts are included,
-        but &quot;in progress&quot; attempts are not shown.
+        This report is a list of all attempts at this quiz.
 
         It shows the picture and name of each user, along with their
         grade for the quiz and the score, time and duration of each attempt. 
@@ -15,11 +13,9 @@
         Attempts may be selected and then deleted if required.
     </p>
     <p>
-        <b>Simple statistics</b></br />
-        This report is a list of all completed attempts at this quiz.
-
-        Attempts marked as &quot;abandoned&quot; or 
-        &quot;in progress&quot; are not included.
+        <b>Simple statistics</b><br />
+        This report is a list of all attempts at this quiz, 
+        except &quot;in progress&quot; attempts.
 
         It shows the picture and name of each user, along with their
         grade for the quiz, and the score of each question in each attempt.
@@ -29,10 +25,8 @@
     </p>
     <p>
         <b>Detailed statistics</b><br />
-        This report shows full details of all completed attempts at this quiz,
-
-        Attempts marked as &quot;abandoned&quot; or 
-        &quot;in progress&quot; are not included.
+        This report shows full details of all attempts at this quiz, 
+        except &quot;in progress&quot; attempts.
 
         The report contains the following tables:
     </p>
@@ -45,8 +39,8 @@
     </ul>
     <p>
         <b>Click trail report</b><br />
-        This report shows details of every click by every student during completed attempts 
-        at the Hot Potatoes quiz.
+        This report shows details of every click by every student in all attempts at this quiz, 
+        except &quot;in progress&quot; attempts.
 
         The report can be very large and is intended to be downloaded and viewed in a spreadsheet 
         program, such as Microsoft Excel.
@@ -55,12 +49,17 @@
         <a href="help.php?module=hotpot&file=clickreporttable.html">click trail table</a>
         help file.
     </p>
+    <p>
+        The click trail report is only available if 
+        <a href="help.php?module=hotpot&file=clickreporting.html">click reporting</a> 
+        has been enabled for this HotPot activity.
+    </p>
 </div>
 
 <p><b>Selecting users</b></p>
 <div class="indent">
 	<p>	
-		<b>All Users</b><br />
+		<b>All users</b><br />
 		The report will show responses by all users who have attempted this quiz. 
         This includes users who are not currently enrolled on the course, 
         the &quot;guest&quot; user, course creators and Moodle administrators.
@@ -69,17 +68,23 @@
 		<b>All participants</b><br />
 		The report will show responses by all students and teachers who are currently 
         enrolled on this course, as well as responses by the &quot;guest&quot; user, 
-        and course creators and Moodle administrators.
+        course creators and Moodle administrators.
 	</p>
 	<p>	
-		<b>Enrolled Students</b><br />
+		<b>Group: group name</b><br />
+		The report will show responses by all students in the group selected.
+        The group options will not appear on the drop-down menu if there are 
+        no groups defined for this course.
+	</p>
+	<p>	
+		<b>Enrolled students</b><br />
 		The report will show responses by students currently enrolled in this course. 
 		Teacher's responses will not be included in the report.
 	</p>
     <p>
         <b>Single student</b><br />
         The report will show responses by a single student selected from a drop-down list 
-        of students' names
+        of students' names.
     </p>
 </div>
 
@@ -87,18 +92,18 @@
 <div class="indent">
     <p>
         <b>All attempts</b><br />
-        The report will include the responses from all the attempts by each user
+        The report will include the responses from all the attempts by each user.
     </p>
     <p>
         <b>Best attempt</b><br />
-        The report will only include the responses from the highest scoring attempt by each user
+        The report will only include the responses from the highest scoring attempt by each user.
     </p>
     <p>
         <b>First attempt</b><br />
-        The report will only include the responses from the first attempt by each user
+        The report will only include the responses from the first attempt by each user.
     </p>
     <p>
         <b>Last attempt</b><br />
-        The report will only include the responses from the most recent attempt by each user
+        The report will only include the responses from the most recent attempt by each user.
     </p>
 </div>

lang/en_utf8/help/lesson/mediafile.html

@@ -4,4 +4,18 @@
 Also, a link will be printed out on every lesson page that re-opens the pop-up if necessary.</p>
 
 <p>Optionally a "Close Window" button be printed at the bottom of the pop-up and the 
-height and width of the window can be set as well.</p>
+height and width of the window can be set as well.</p>
+
+<p>Supported embedded file types:
+    <ul>
+        <li>MP3</li>
+        <li>Media Player</li>
+        <li>Quicktime</li>
+        <li>Realmedia</li>
+        <li>HTML</li>
+        <li>Plain Text</li>
+        <li>GIF</li>
+        <li>JPEG</li>
+        <li>PNG</li>
+    </ul>
+    All other file types will default to a link for download.</p>