Merge

main/admin/sub_language.class.php

@@ -76,7 +76,7 @@ class SubLanguageManager {
    }
      /**
      * Get all information of chamilo file
-     * @param String The dokeos path file (/var/www/chamilo/main/lang/spanish/gradebook.inc.php)
+     * @param String The chamilo path file (/var/www/chamilo/main/lang/spanish/gradebook.inc.php)
      * @return Array Contains all information of chamilo file
      */
    public static function get_all_language_variable_in_file ($system_path_file) {

main/conference/get_translation.lib.php

@@ -1,11 +1,11 @@
 <?php
-/* See license terms in /dokeos_license.txt */
+/* See license terms in /chamilo_license.txt */
 /**
- * Library for language translation from Dokeos language files to XML for videoconference
+ * Library for language translation from Chamilo language files to XML for videoconference
  * @uses main_api.lib.php for api_get_path()
  */
 /**
- * This function reads a Dokeos language file and transforms it into XML,
+ * This function reads a Chamilo language file and transforms it into XML,
  * then returns the XML string to the caller.
  */
 function get_language_file_as_xml($language='english')