merge

main/admin/settings.php

@@ -374,7 +374,7 @@ $action_images['plugins'] 		= 'plugin.gif';
 $action_images['stylesheets'] 	= 'theme.gif';
 $action_images['templates'] 	= 'template.gif';
 $action_images['search']        = 'search.gif';
-
+$action_images['editor']		= 'html.png';
 
 // grabbing the categories
 //$selectcategories = "SELECT DISTINCT category FROM ".$table_settings_current." WHERE category NOT IN ('stylesheets','Plugins')";

main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/inc/class.upload.php

@@ -204,7 +204,7 @@ class Upload
 		{
 			$this->fileBaseName = $fileBaseName;
 		}
-		$this->fileBaseName=disable_dangerous_file(replace_dangerous_char(str_replace(' ','_',$this->fileBaseName)));// Juan Carlos Raña replace space by _ because fix long names. See: ajaxfilemanager/inc/class.manager.php. And add cleaning from dokeos replace_dangerous_char() and disable_dangerous_file()
+		$this->fileBaseName=disable_dangerous_file(replace_dangerous_char(str_replace(' ','_',$this->fileBaseName),'strict'));// Juan Carlos Raña replace space by _ because fix long names. See: ajaxfilemanager/inc/class.manager.php. And add cleaning from dokeos replace_dangerous_char() and disable_dangerous_file()
 		$fileName = $this->fileBaseName . $this->fileExtension;
 		$filePath = $dest . $fileName;
 

main/inc/lib/fckeditor/editor/plugins/asciimath/lang/es.js

@@ -6,17 +6,17 @@
  * Author:
  */
 
-FCKLang["DlgAsciiMath"] = 'AsciiMath Formula Input' ;
+FCKLang["DlgAsciiMath"] = 'Insertar una fórmula AsciiMath' ;
-FCKLang["DlgAsciiMathFormulaEditor"] = 'Formula Editor' ;
+FCKLang["DlgAsciiMathFormulaEditor"] = 'Editor de ecuaciones' ;
-FCKLang["DlgAsciiMathInput"] = 'Input' ;
+FCKLang["DlgAsciiMathInput"] = 'Insertar' ;
-FCKLang["DlgAsciiMathClear"] = 'Clear' ;
+FCKLang["DlgAsciiMathClear"] = 'Limpiar' ;
-FCKLang["DlgAsciiMathDelete"] = 'Delete' ;
+FCKLang["DlgAsciiMathDelete"] = 'Eliminar' ;
-FCKLang["DlgAsciiMathPreview"] = 'Preview' ;
+FCKLang["DlgAsciiMathPreview"] = 'Previsualización' ;
-FCKLang["DlgAsciiMathBasedOn"] = 'Based on ASCIIMathML by ' ;
+FCKLang["DlgAsciiMathBasedOn"] = 'Basado en ASCIIMathML por ' ;
-FCKLang["DlgAsciiMathForMoreInfo"] = 'For more information on AsciiMathML visit this page: ' ;
+FCKLang["DlgAsciiMathForMoreInfo"] = 'Para más información sobre AsciiMathML visite esta página: ' ;
-FCKLang["DlgAsciiMathShowMathML"] = 'Show MathML' ;
+FCKLang["DlgAsciiMathShowMathML"] = 'Mostrar MathML' ;
-FCKLang["DlgAsciiMathFormulaPreview"] = 'Formula Preview' ;
+FCKLang["DlgAsciiMathFormulaPreview"] = 'Previsualización de la ecuación' ;
-FCKLang["DlgAsciiIncompatibleBrowser"] = 'Your browser is not able to show mathematical formulas. Please, use %s1 or Internet Explorer with %s2 plugin.' ;
+FCKLang["DlgAsciiIncompatibleBrowser"] = 'Su navegador no puede mostrar fórmulas matemáticas. Use %s1 o Internet Explorer con el plugin %s2 ' ;
-FCKLang["DlgAsciiMathOldIE"] = 'Your browser is not able to show mathematical formulas. You need to upgrade to Internet Explorer 6.0+. Then you need to install the MathPlayer 2 plugin for Internet Explorer. Please, see %s for more information.' ;
+FCKLang["DlgAsciiMathOldIE"] = 'Su navegador no puede mostrar fórmulas matemáticas. Actualícese a Internet Explorer 6.0+. Tras esto, tendra que instalar el plugin MathPlayer 2 para Internet Explorer. Para más información vea %s' ;
-FCKLang["DlgAsciiMathInstallMathPlayer"] = 'Your browser is not able to show mathematical formulas. You need to install the MathPlayer 2 plugin for Internet Explorer. Please, see %s for more information.' ;
+FCKLang["DlgAsciiMathInstallMathPlayer"] = 'Su navegador no puede mostrar fórmulas matemáticas. Necesita instalar el plugin MathPlayer 2 para Internet Explorer. Para más información vea %s' ;
-FCKLang["DlgAsciiMathOldMathPlayer"] = 'Your browser is not able to show mathematical formulas. You need to upgrade the MathPlayer plugin for Internet Explorer to version 2. Please, see %s for more information.' ;
+FCKLang["DlgAsciiMathOldMathPlayer"] = 'Su navegador no puede mostrar fórmulas matemáticas. Necesita actualizar el plugin MathPlayer para Internet Explorer a la version 2. Para más información vea %s' ;

main/inc/lib/fckeditor/myconfig.php

@@ -66,9 +66,20 @@
 // Then, you may modify the newly copied toolbar definitions at your will, just keep correct php-syntax.
 // It is not mandatory you to create custom files for all the toolbars. In case of missing file in the directory with the
 // custom toobar definitions the system would read the correspondent "factory" toolbar definition (form 'default' directory).
-$config['ToolbarSets']['Directory'] = 'default';
+
-// You may try this provided example of custom toolbars:
+
-//$config['ToolbarSets']['Directory'] = 'extended';
+// This is the visible toolbar set when the editor is maximized.
+// If it has not been defined, then the toolbar set for the "normal" size is used.
+// if do you prefer configure for each toolbar edit main/inc/lib/fckeditor/toolbars/
+
+if ((api_get_setting('more_buttons_maximized_mode') == 'true'))
+{
+	$config['ToolbarSets']['Directory'] = 'extended';
+}
+else
+{	
+	$config['ToolbarSets']['Directory'] = 'default';
+}
 
 
 /*
@@ -119,8 +130,15 @@ $config['LoadPlugin'][] = 'fckEmbedMovies';
 $config['LoadPlugin'][] = 'flvPlayer';
 
 // youtube : Adds a dilog for inserting YouTube video-streams.
-if (api_is_allowed_to_edit() || api_is_platform_admin()) { // (not for students)
+if ((api_get_setting('youtube_for_students') == 'true')) {
+	
 	$config['LoadPlugin'][] = 'youtube';
+	
+}
+else{
+	if (api_is_allowed_to_edit() || api_is_platform_admin()) { // (not for students)
+		$config['LoadPlugin'][] = 'youtube';
+	}
 }
 
 // googlemaps : Adds a dilog for inserting Google maps.
@@ -136,8 +154,11 @@ $config['LoadPlugin'][] = 'googlemaps';
 // mimetex : Adds a dilog for inserting mathematical formulas. In order this plugin to work prpoperly, preliminary changes
 // in your server configuration have to be done. The MimeTex executable file has to be installed, see the installation guide.
 //
-// Uncomment the line below (remove the double slash at the beginning) to enable the 'mimetex' plugin:
+if ((api_get_setting('math_mimetex') == 'true')) {
-//$config['LoadPlugin'][] = 'mimetex';
+	
+	$config['LoadPlugin'][] = 'mimetex';
+}
+
 //
 // Some additional settings become active only when the 'mimetex' plugin has been enabled:
 //
@@ -166,7 +187,11 @@ $config['MimetexExecutableDetectionTimeout'] = 0.05;
 // After enabling it, this plugin is configured to work with full-page html documents out-of-the box.
 // You may try it in the "Documents" and "Wiki" tools.
 // Browser compatibility: Internet Explorer 6.0+ with MathPlayer plugin, Mozilla Firefox 2.0+, Opera 9.5+
-//$config['LoadPlugin'][] = 'asciimath';
+
+if ((api_get_setting('math_asciimathML') == 'true')) {
+	
+	$config['LoadPlugin'][] = 'asciimath';
+}
 
 // wikilink : Adds a dialog for inserting wiki-formatted links.
 $config['LoadPlugin'][] = 'wikilink';
@@ -279,6 +304,15 @@ $config['FontFormats'] = 'p;h1;h2;h3;h4;h5'; // A reduced format list.
 // for all browsers. You may disable or change it if you wish.
 $config['EditorAreaStyles'] = 'body { background-color: #ffffff; }';
 
+// A setting for blocking copy/paste functions of the editor.
+// This setting activates on leaners only. For users with other statuses there is no blocking copy/paste.
+// if do you prefer configure for each toolbar edit main/inc/lib/fckeditor/toolbars/
+if ((api_get_setting('block_copy_paste_for_students') == 'true'))
+{
+
+	$config['BlockCopyPaste'] = true;
+}
+
 /*
  * Additional note:
  * For debugging purposes the editor may run using original source versions of its javascripts, not the "compressed" versions.

main/inc/lib/fileUpload.lib.php

@@ -248,8 +248,8 @@ function handle_uploaded_document($_course,$uploaded_file,$base_work_dir,$upload
 	}
 	else
 	{
-		//clean up the name, only ASCII characters should stay.
+		//clean up the name, only ASCII characters should stay. (and strict)
-		$clean_name = replace_dangerous_char($uploaded_file['name']);
+		$clean_name = replace_dangerous_char($uploaded_file['name'], 'strict');
 		//no "dangerous" files
 		$clean_name = disable_dangerous_file($clean_name);
 		if(!filter_extension($clean_name))
@@ -703,7 +703,7 @@ function treat_uploaded_file($uploadedFile, $baseWorkDir, $uploadPath, $maxFille
 		$fileName = trim($uploadedFile['name']);
 
 		// CHECK FOR NO DESIRED CHARACTERS
-		$fileName = replace_dangerous_char($fileName);
+		$fileName = replace_dangerous_char($fileName, 'strict');
 
 		// TRY TO ADD AN EXTENSION TO FILES WITOUT EXTENSION
 		$fileName = add_ext_on_mime($fileName,$uploadedFile['type']);
@@ -1875,7 +1875,7 @@ $handle=opendir($path);
 	    else
 		{
 			//rename
-			$safe_file=disable_dangerous_file(replace_dangerous_char($file));
+			$safe_file=disable_dangerous_file(replace_dangerous_char($file, 'strict'));
 			@rename($base_work_dir.$current_path.'/'.$file,$base_work_dir.$current_path.'/'.$safe_file);
 
 			if(!DocumentManager::get_document_id($_course, $current_path.'/'.$safe_file))

main/install/dokeos_main.sql

@@ -219,9 +219,6 @@ CREATE TABLE course_field (
     PRIMARY KEY(id)
 );
 
-INSERT INTO course_field (field_type, field_variable, field_display_text, field_default_value, field_visible, field_changeable) values (10, 'special_course','SpecialCourse', 'Yes', 1 , 1);
-
-
 --
 -- Table structure for table course_field_values
 --
@@ -647,7 +644,7 @@ VALUES
 ('service_ppt2lp', 'ftp_password', 'textfield', NULL, NULL, 'FtpPassword', NULL, NULL, NULL, 0),
 ('service_ppt2lp', 'path_to_lzx', 'textfield', NULL, NULL, '', NULL, NULL, NULL, 0),
 ('service_ppt2lp', 'size', 'radio', NULL, '720x540', '', NULL, NULL, NULL, 0),
-('wcag_anysurfer_public_pages', NULL, 'radio','Platform','false','PublicPagesComplyToWAITitle','PublicPagesComplyToWAIComment', NULL, NULL, 0),
+('wcag_anysurfer_public_pages', NULL, 'radio','Editor','false','PublicPagesComplyToWAITitle','PublicPagesComplyToWAIComment', NULL, NULL, 0),
 ('stylesheets', NULL, 'textfield','stylesheets','dokeos_blue','',NULL, NULL, NULL, 1),
 ('upload_extensions_list_type', NULL, 'radio', 'Security', 'blacklist', 'UploadExtensionsListType', 'UploadExtensionsListTypeComment', NULL, NULL, 0),
 ('upload_extensions_blacklist', NULL, 'textfield', 'Security', '', 'UploadExtensionsBlacklist', 'UploadExtensionsBlacklistComment', NULL, NULL, 0),
@@ -669,7 +666,6 @@ VALUES
 ('show_tabs', 'platform_administration', 'checkbox', 'Platform', 'true', 'ShowTabsTitle','ShowTabsComment',NULL,'TabsPlatformAdministration', 1),
 ('show_tabs', 'my_agenda', 'checkbox', 'Platform', 'true', 'ShowTabsTitle','ShowTabsComment',NULL,'TabsMyAgenda', 1),
 ('show_tabs', 'my_profile', 'checkbox', 'Platform', 'true', 'ShowTabsTitle','ShowTabsComment',NULL,'TabsMyProfile', 1),
-('show_tabs', 'social', 'checkbox', 'Platform', 'true', 'ShowTabsTitle','ShowTabsComment',NULL,'TabsSocial', 0),
 ('default_forum_view', NULL, 'radio', 'Course', 'flat', 'DefaultForumViewTitle','DefaultForumViewComment',NULL,NULL, 0),
 ('platform_charset',NULL,'textfield','Platform','iso-8859-15','PlatformCharsetTitle','PlatformCharsetComment','platform',NULL, 0),
 ('noreply_email_address', '', 'textfield', 'Platform', '', 'NoReplyEmailAddress', 'NoReplyEmailAddressComment', NULL, NULL, 0),
@@ -720,7 +716,7 @@ VALUES
 ('course_create_active_tools','survey','checkbox','Tools','true','CourseCreateActiveToolsTitle','CourseCreateActiveToolsComment',NULL,'Survey', 0),
 ('course_create_active_tools','glossary','checkbox','Tools','true','CourseCreateActiveToolsTitle','CourseCreateActiveToolsComment',NULL,'Glossary', 0),
 ('course_create_active_tools','notebook','checkbox','Tools','true','CourseCreateActiveToolsTitle','CourseCreateActiveToolsComment',NULL,'Notebook', 0),
-('advanced_filemanager',NULL,'radio','Platform','false','AdvancedFileManagerTitle','AdvancedFileManagerComment',NULL,NULL, 0),
+('advanced_filemanager',NULL,'radio','Editor','false','AdvancedFileManagerTitle','AdvancedFileManagerComment',NULL,NULL, 0),
 ('allow_reservation', NULL, 'radio', 'Tools', 'false', 'AllowReservationTitle', 'AllowReservationComment', NULL, NULL, 0),
 ('profile','apikeys','checkbox','User','false','ProfileChangesTitle','ProfileChangesComment',NULL,'ApiKeys', 0),
 ('allow_message_tool', NULL, 'radio', 'Tools', 'false', 'AllowMessageToolTitle', 'AllowMessageToolComment', NULL, NULL,0),
@@ -739,7 +735,13 @@ VALUES
 ('show_glossary_in_extra_tools', NULL, 'radio', 'Course', 'false', 'ShowGlossaryInExtraToolsTitle', 'ShowGlossaryInExtraToolsComment', NULL, NULL,1),
 ('dokeos_database_version', NULL, 'textfield', NULL,'1.8.6.2.9070','DokeosDatabaseVersion','',NULL,NULL,0),
 ('send_email_to_admin_when_create_course',NULL,'radio','Platform','false','SendEmailToAdminTitle','SendEmailToAdminComment',NULL,NULL, 1),
-('go_to_course_after_login',NULL,'radio','Course','false','GoToCourseAfterLoginTitle','GoToCourseAfterLoginComment',NULL,NULL, 0);
+('go_to_course_after_login',NULL,'radio','Course','false','GoToCourseAfterLoginTitle','GoToCourseAfterLoginComment',NULL,NULL, 0),
+('math_mimetex',NULL,'radio','Editor','false','MathMimetexTitle','MathMimetexComment',NULL,NULL, 0),
+('math_asciimathML',NULL,'radio','Editor','false','MathASCIImathMLTitle','MathASCIImathMLComment',NULL,NULL, 0),
+('youtube_for_students',NULL,'radio','Editor','true','YoutubeForStudentsTitle','YoutubeForStudentsComment',NULL,NULL, 0),
+('block_copy_paste_for_students',NULL,'radio','Editor','false','BlockCopyPasteForStudentsTitle','BlockCopyPasteForStudentsComment',NULL,NULL, 0),
+('more_buttons_maximized_mode',NULL,'radio','Editor','false','MoreButtonsForMaximizedModeTitle','MoreButtonsForMaximizedModeComment',NULL,NULL, 0);
+
 UNLOCK TABLES;
 /*!40000 ALTER TABLE settings_current ENABLE KEYS */;
 
@@ -928,7 +930,17 @@ VALUES
 ('send_email_to_admin_when_create_course','true','Yes'),
 ('send_email_to_admin_when_create_course','false','No'),
 ('go_to_course_after_login','true','Yes'),
-('go_to_course_after_login','false','No');
+('go_to_course_after_login','false','No'),
+('math_mimetex','true','Yes'),
+('math_mimetex','false','No'),
+('math_asciimathML','true','Yes'),
+('math_asciimathML','false','No'),
+('youtube_for_students','true','Yes'),
+('youtube_for_students','false','No'),
+('block_copy_paste_for_students','true','Yes'),
+('block_copy_paste_for_students','false','No'),
+('more_buttons_maximized_mode','true','Yes'),
+('more_buttons_maximized_mode','false','No');
 
 UNLOCK TABLES;
 
@@ -2277,6 +2289,7 @@ CREATE TABLE session_category (
 -- Table structure for table user tag
 --
 
+
 CREATE TABLE tag (
 	id int NOT NULL auto_increment,
 	tag varchar(255) NOT NULL,
@@ -2336,8 +2349,9 @@ CREATE TABLE IF NOT EXISTS message_attachment (
   message_id int NOT NULL,
   filename varchar(255) NOT NULL,
   PRIMARY KEY  (id)
-);
+)
+
 
-INSERT INTO user_field (field_type, field_variable, field_display_text, field_visible, field_changeable) values (1, 'rssfeeds','RSS',0,0);
+INSERT INTO user_field (field_type, field_variable, field_display_text, field_visible, field_changeable) values (10, 'tags','tags',0,0);
-INSERT INTO user_field (field_type, field_variable, field_display_text, field_visible, field_changeable) values (10,'tags','tags',0,0);
+INSERT INTO user_field (field_type, field_variable, field_display_text, field_visible, field_changeable) values (9, 'rssfeeds','RSS',0,0);
 

main/lang/asturian/admin.inc.php

@@ -979,6 +979,7 @@ $SoberBrown = "Marr
 $SteelGrey = "Gris aceru";
 $TastyOlive = "Sabor oliva";
 $AddNews  = "Criar anunciu";
+$ExportCourses = "Esportar cursos";
 $SearchDatabaseOpeningError = "Nun pudo abrise la base de datos del motor d\'indexáu, preba a amestar un recursu nuevu (exerciciu, enllaz, lleición, etc) el cual será indexáu al guetador";
 $SearchDatabaseVersionError = "La base de datos ta nun formatu nun sofitáu";
 $SearchDatabaseModifiedError = "La base de datos foi camudada";
@@ -1096,4 +1097,8 @@ $ShowGlossaryInExtraToolsComment = "Dende equ
 $FieldTypeTag = "Etiqueta d\'usuariu";
 $SendEmailToAdminTitle = "Avisu por corréu electrónicu, de la criación d\'un cursu nuevu";
 $SendEmailToAdminComment = "Unviar un corréu electrónicu al alministrador de la plataforma, cada vegada qu\'un mayestru crie un cursu nuevu";
+$UserTag = "Etiqueta d\'usuariu";
+$SelectSession = "Seleicionar sesión";
+$GroupPermissions = "Permisos del grupu";
+$SpecialCourse = "Cursu especial";
 ?>

main/lang/asturian/course_home.inc.php

@@ -27,4 +27,5 @@ $IntroductionTextDeleted = "Testu d\'entamu esborr
 $SessionIdentifier = "Identificador de la sesión";
 $SessionName = "Nome de la sesión";
 $SessionCategory = "Categoría de la sesión";
+$SessionData = "Datos de la sesión";
 ?>

main/lang/asturian/slideshow.inc.php

@@ -18,4 +18,6 @@ $lang_next_slide = "Diapositiva siguiente";
 $lang_image = "Imaxe";
 $lang_of = "de";
 $lang_view_slideshow = "Ver presentación";
+$FirstSlide = "Primer diapositiva";
+$LastSlide = "Cabera diapositiva";
 ?>

main/lang/asturian/userInfo.inc.php

@@ -92,4 +92,6 @@ $SendInvitation = "Unviar invitaci
 $SocialInvitationToFriends = "Invitar a xunise a la mio rede de collacios";
 $MyCertificates = "Los mios certificaos";
 $ToChangeYourEmailMustTypeYourPassword = "Pa camudar el to corréu electrónicu tienes qu\'escribir la to contraseña";
+$Invitations = "Invitaciones";
+$MyGroups = "Los mios grupos";
 ?>

main/lang/english/admin.inc.php

@@ -1100,4 +1100,19 @@ $SendEmailToAdminComment = "Send an email to administardor of the platform, each
 $UserTag = "User tag";
 $SelectSession = "Select session";
 $GroupPermissions = "Group Permissions";
+$SpecialCourse = "Special course";
+$MathMimetexTitle = "mimeTEX mathematical editor";
+$MathMimetexComment = "Enable mimeTeX mathematical editor";
+$MathASCIImathMLTitle = "SCIImathML mathematical editor";
+$MathASCIImathMLComment = "Enable SCIImathML mathematical editor";
+$YoutubeForStudentsTitle = "Allow students to insert videos from YouTube";
+$YoutubeForStudentsComment = "Enable the possibility that students can insert Youtube videos";
+$BlockCopyPasteForStudentsTitle = "Block students copy and paste";
+$BlockCopyPasteForStudentsComment = "Block students the ability to copy and paste into the WYSIWYG editor";
+$MoreButtonsForMaximizedModeTitle = "Buttons bar extended";
+$MoreButtonsForMaximizedModeComment = "Enable button bars extended when the WYSIWYG editor is maximized";
+$Editor = "WYSIWYG Editor";
+$GoToCourseAfterLoginTitle = "Go directly to the course after login";
+$GoToCourseAfterLoginComment = "When a user is registered in one course, go directly to the course after login";
+$GroupList = "Group List";
 ?>

main/lang/greek/accessibility.inc.php

@@ -2,12 +2,13 @@
 for more information: see languages.txt in the lang folder. 
 */
 $langClarContent = "Εδώ, καθηγητές και βοηθοί δημιουργούν και διαχειρίζονται τους δικτυακούς τόπους των μαθημάτων τους. Οι φοιτητές μπορούν να διαβάσουν τα έγγραφα,  τα προγράμματα, την ατζέντα, κλπ., να κάνουν ασκήσεις, να δημοσιεύσουν εργασίες, να συμμετάσχουν σε συζητήσεις, κ.α.</p> <p><b>Εγγραφή</b></p><p>Αν είστε φοιτητής, θα πρέπει να εγγραφείτε επιλέγοντας «Παρακολούθηση μαθημάτων», και μετά να επιλέξετε τα μαθήματα που επιθυμείτε να παρακολουθήσετε.</p><p>Αν είστε καθηγητής ή βοηθός, θα πρέπει και πάλι να εγγραφείτε, επιλέγοντας όμως «Δημιουργία μαθημάτων». Στη συνέχεια, θα συμπληρώσετε μια φόρμα με τα στοιχεία του μαθήματός σας: τίτλο και κωδικό μαθήματος και σχολή/τμήμα που ανήκει. Μόλις επικυρώσετε τα στοιχεία αυτά, θα μεταφερθείτε στη σελίδα που μόλις θα έχει δημιουργηθεί για το μάθημα, και θα μπορείτε να αλλάξετε τα περιεχόμενά και την οργάνωσή της ανάλογα με τις ανάγκες σας.</p><p>Αν η σελίδα αυτή δεν ανταποκρίνεται στις ανάγκες σας, παρακαλούμε ενημερώστε μας μέσω της λίστας «Να γίνουν», που εμφανίζεται στην αρχική σελίδα της τάξης ";
-$test = "test";
+$test = "&#964;&#949;&#963;&#964;";
 $WCAGImage = "&#917;&#953;&#954;&#972;&#957;&#945;";
 $WCAGLabel = "&#932;&#943;&#964;&#955;&#959;&#962; &#949;&#953;&#954;&#972;&#957;&#945;&#962;";
 $WCAGLink = "&#931;&#973;&#957;&#948;&#949;&#963;&#956;&#959;&#962;";
 $WCAGLinkLabel = "&#932;&#943;&#964;&#955;&#959;&#962; &#931;&#965;&#957;&#948;&#941;&#963;&#956;&#959;&#965;";
 $errorNoLabel = "&#922;&#945;&#957;&#941;&#957;&#945;&#962; &#964;&#943;&#964;&#955;&#959;&#962; &#947;&#953;&#945; &#945;&#965;&#964;&#942; &#964;&#951;&#957; &#949;&#953;&#954;&#972;&#957;&#945;.";
+$AllLanguages = "&#972;&#955;&#949;&#962; &#959;&#953; &#947;&#955;&#974;&#963;&#963;&#949;&#962;";
 $WCAGEditor = "WCAG Editor";
 $WCAGGoMenu = "&#924;&#949;&#957;&#959;&#973; &#956;&#949;&#964;&#940;&#946;&#945;&#963;&#951;&#962;";
 $WCAGGoContent = "&#928;&#949;&#961;&#953;&#949;&#967;&#972;&#956;&#949;&#957;&#959; &#956;&#949;&#964;&#940;&#946;&#945;&#963;&#951;&#962;";

main/lang/italian/admin.inc.php

@@ -979,6 +979,7 @@ $SoberBrown = "Sober brown";
 $SteelGrey = "Steel grey";
 $TastyOlive = "Tasty olive";
 $AddNews  = "Aggiungi avvisi";
+$ExportCourses = "Esporta corsi";
 $SearchDatabaseOpeningError = "Non è possibile accedere al database di indicizzazione dei contenuti";
 $SearchDatabaseVersionError = "Il formato del database non è supportato";
 $SearchDatabaseModifiedError = "Database di indicizzazione modificato";
@@ -1097,4 +1098,7 @@ $FieldTypeTag = "Tag utente";
 $SendEmailToAdminTitle = "Avviso della creazione di un nuovo corso tramite e-mail";
 $SendEmailToAdminComment = "Ogni volta che un docente crea un nuovo corso, verrà inviata un\'e-mail all\'amministratore";
 $UserTag = "Etichetta utente";
+$SelectSession = "Seleziona la sessione";
+$GroupPermissions = "Permessi del gruppo";
+$SpecialCourse = "Corso speciale";
 ?>

main/lang/italian/course_home.inc.php

@@ -27,4 +27,5 @@ $IntroductionTextDeleted = "Testo introduttivo eliminato";
 $SessionIdentifier = "Identificatore della sessione";
 $SessionName = "Nome della sessione";
 $SessionCategory = "Categoria della sessione";
+$SessionData = "Dati della sessione";
 ?>

main/lang/italian/slideshow.inc.php

@@ -18,4 +18,6 @@ $lang_next_slide = "Prossima Diapositiva";
 $lang_image = "Immagine";
 $lang_of = "di";
 $lang_view_slideshow = "Mostra presentazione";
+$FirstSlide = "Prima diapositiva";
+$LastSlide = "Ultima diapositiva";
 ?>

main/lang/italian/userInfo.inc.php

@@ -92,4 +92,6 @@ $SendInvitation = "Manda un invito";
 $SocialInvitationToFriends = "Invita ad unirsi al mio gruppo di amici";
 $MyCertificates = "Il mio certificato";
 $ToChangeYourEmailMustTypeYourPassword = "Per cambiare l\'indirizzo e-mail devi riscrivere la password";
+$Invitations = "Inviti";
+$MyGroups = "I miei gruppi";
 ?>

main/lang/spanish/admin.inc.php

@@ -1100,4 +1100,19 @@ $SendEmailToAdminComment = "Enviar un correo electr
 $UserTag = "Etiqueta de usuario";
 $SelectSession = "Seleccionar sesión";
 $GroupPermissions = "Permisos del grupo";
+$SpecialCourse = "Curso especial";
+$MathMimetexTitle = "Editor matemático mimeTEX";
+$MathMimetexComment = "Habilitar el editor matemático mimeTEX";
+$MathASCIImathMLTitle = "Editor matemático SCIImathML";
+$MathASCIImathMLComment = "Habilitar el editor matemático SCIImathML";
+$YoutubeForStudentsTitle = "Permitir a los estudiantes insertar videos de YouTube";
+$YoutubeForStudentsComment = "Habilitar la posibilidad de que los estudiantes puedan insertar videos de Youtube";
+$BlockCopyPasteForStudentsTitle = "Bloquear a los estudiantes copiar y pegar";
+$BlockCopyPasteForStudentsComment = "Bloquear a los estudiantes la posibilidad de copiar y pegar en el editor WYSIWYG";
+$MoreButtonsForMaximizedModeTitle = "Barras de botones extendidas";
+$MoreButtonsForMaximizedModeComment = "Habilitar las barras de botones extendidas cuando el editor WYSIWYG está maximizado";
+$Editor = "Editor WYSIWYG";
+$GoToCourseAfterLoginTitle = "Ir directamente al curso tras identificarse";
+$GoToCourseAfterLoginComment = "Cuando un usuario está inscrito sólamente en un curso, ir directamente al curso despúes de identificarse";
+$GroupList = "Lista de grupos";
 ?>

main/lang/spanish/trad4all.inc.php

@@ -291,7 +291,7 @@ $Documents = "Documentos";
 $DocumentAdded = "Documento añadido";
 $DocumentUpdated = "Documento actualizado";
 $DocumentInFolderUpdated = "Documento actualizado en la carpeta";
-$Course_description = "Descripción";
+$Course_description = "Descripción del curso";
 $Calendar_event = "Agenda";
 $Document = "Documentos";
 $Learnpath = "Lecciones";

main/lang/spanish/wiki.inc.php

@@ -122,7 +122,7 @@ $AssignmentDescExtra = "Esta p
 $AssignmentWorkExtra = "Esta página es el trabajo de un alumno";
 $NoAreSeeingTheLastVersion = "Atención no esta viendo la última versión de la página";
 $AssignmentFirstComToStudent = "Modifica esta página para realizar tu tarea sobre la tarea propuesta";
-$AssignmentLinkstoStudentsPage = "Acceso a las tareas realizadas por los alumnos sobre la tarea propuesta en esta página";
+$AssignmentLinkstoStudentsPage = "Acceso a las páginas de los alumnos";
 $AllowLaterSends = "Permitir envíos retrasados";
 $WikiStandBy = "El Wiki está a la espera de que un profesor lo inicialice";
 $NotifyDiscussByEmail = "La notificacion por correo electrónico de nuevos comentarios sobre la página está habilitada";

main/work/work.php

@@ -1486,11 +1486,13 @@ if (!$display_upload_form && !$display_tool_options) {
 			echo $form_filter;
 			
 		}
-		if(!empty($publication['description'])){
-			echo '<br /><b>'.get_lang('Description').'</b>&nbsp;&nbsp;'.$publication['description'].'<br /><br />';
-		}
-
 	}
+	if(!empty($publication['description'])){
+			echo '<div class="actions">';
+			echo '<br /><b>'.get_lang('Description').':</b>&nbsp;&nbsp;'.$publication['description'].'<br /><br />';
+			echo '</div>';
+	}
+	
 	display_student_publications_list($base_work_dir . '/' . $my_cur_dir_path, 'work/' . $my_cur_dir_path, $currentCourseRepositoryWeb, $link_target_parameter, $dateFormatLong, $origin,$add_query);