diff --git a/main/auth/inscription.php b/main/auth/inscription.php
index 7b0ce68d19..91ccfd2ed1 100755
--- a/main/auth/inscription.php
+++ b/main/auth/inscription.php
@@ -447,11 +447,15 @@ if (!CustomPages::enabled()) {
                     $language = api_get_language_id($language);
                     $term_preview = LegalManager::get_last_condition($language);
                 }
-                $tool_name = get_lang('TermsAndConditions');
-                Display::display_header($tool_name);
-
+                Display::display_header(get_lang('TermsAndConditions'));
                 if (!empty($term_preview['content'])) {
                     echo $term_preview['content'];
+
+                    $termExtraFields = new ExtraFieldValue('terms_and_condition');
+                    $values = $termExtraFields->getAllValuesByItem($term_preview['id']);
+                    foreach ($values as $value) {
+                        echo '<h3>'.$value['display_text'].'</h3><br />'.$value['value'].'<br />';
+                    }
                 } else {
                     echo get_lang('ComingSoon');
                 }
@@ -538,6 +542,17 @@ if (api_get_setting('allow_terms_conditions') === 'true' && $user_already_regist
     $form->addHidden('legal_accept_type', $term_preview['version'].':'.$term_preview['language_id']);
     $form->addHidden('legal_info', $term_preview['id'].':'.$term_preview['language_id']);
 
+    // Show if only HTML type
+    if ($term_preview['type'] == '2') {
+        $termExtraFields = new ExtraFieldValue('terms_and_condition');
+        $values = $termExtraFields->getAllValuesByItem($term_preview['id']);
+        foreach ($values as $value) {
+            //if ($value['variable'] === 'category') {
+            $form->addLabel($value['display_text'], $value['value']);
+            //}
+        }
+    }
+
     if ($term_preview['type'] == 1) {
         $form->addElement(
             'checkbox',
@@ -709,7 +724,7 @@ if ($form->validate()) {
 
         // Update the extra fields
         $count_extra_field = count($extras);
-        if ($count_extra_field > 0 && is_integer($user_id)) {
+        if ($count_extra_field > 0 && is_int($user_id)) {
             foreach ($extras as $key => $value) {
                 // For array $value -> if exists key 'tmp_name' then must not be empty
                 // This avoid delete from user field value table when doesn't upload a file
diff --git a/main/exercise/TestCategory.php b/main/exercise/TestCategory.php
index bab69e5ae8..fa138bcd42 100644
--- a/main/exercise/TestCategory.php
+++ b/main/exercise/TestCategory.php
@@ -801,7 +801,7 @@ class TestCategory
         }
         $category_name_list = self::getListOfCategoriesNameForTest($exerciseId);
 
-        $table = new HTML_Table(['class' => 'table table-bordered']);
+        $table = new HTML_Table(['class' => 'table table-bordered', 'id' => 'category_results']);
         $table->setHeaderContents(0, 0, get_lang('Categories'));
         $table->setHeaderContents(0, 1, get_lang('AbsoluteScore'));
         $table->setHeaderContents(0, 2, get_lang('RelativeScore'));
@@ -1254,6 +1254,7 @@ class TestCategory
      */
     public function displayCategories($courseId, $sessionId = 0)
     {
+        $sessionId = (int) $sessionId;
         $categories = $this->getCategories($courseId, $sessionId);
         $html = '';
         foreach ($categories as $category) {
@@ -1266,11 +1267,16 @@ class TestCategory
             $content .= '<div class="sectioncomment">';
             $content .= $category['description'];
             $content .= '</div>';
-            $links = '<a href="'.api_get_self().'?action=editcategory&category_id='.$category['id'].'&'.api_get_cidreq().'">'.
-                Display::return_icon('edit.png', get_lang('Edit'), [], ICON_SIZE_SMALL).'</a>';
-            $links .= ' <a href="'.api_get_self().'?'.api_get_cidreq().'&action=deletecategory&category_id='.$category['id'].'" ';
-            $links .= 'onclick="return confirmDelete(\''.self::protectJSDialogQuote(get_lang('DeleteCategoryAreYouSure').'['.$rowname).'] ?\', \'id_cat'.$category['id'].'\');">';
-            $links .= Display::return_icon('delete.png', get_lang('Delete'), [], ICON_SIZE_SMALL).'</a>';
+            $links = '';
+
+            if (!$sessionId) {
+                $links .= '<a href="'.api_get_self().'?action=editcategory&category_id='.$category['id'].'&'.api_get_cidreq().'">'.
+                    Display::return_icon('edit.png', get_lang('Edit'), [], ICON_SIZE_SMALL).'</a>';
+                $links .= ' <a href="'.api_get_self().'?'.api_get_cidreq().'&action=deletecategory&category_id='.$category['id'].'" ';
+                $links .= 'onclick="return confirmDelete(\''.self::protectJSDialogQuote(get_lang('DeleteCategoryAreYouSure').'['.$rowname).'] ?\', \'id_cat'.$category['id'].'\');">';
+                $links .= Display::return_icon('delete.png', get_lang('Delete'), [], ICON_SIZE_SMALL).'</a>';
+            }
+
             $html .= Display::panel($content, $category['title'].$links);
         }
 
diff --git a/main/exercise/hotpotatoes_exercise_report.php b/main/exercise/hotpotatoes_exercise_report.php
index 4d080222dd..077bdd3c55 100755
--- a/main/exercise/hotpotatoes_exercise_report.php
+++ b/main/exercise/hotpotatoes_exercise_report.php
@@ -96,7 +96,7 @@ $nameTools = get_lang('Results');
 
 if ($is_allowedToEdit || $is_tutor) {
     $nameTools = get_lang('StudentScore');
-    $interbreadcrumb[] = ["url" => "exercise.php".api_get_cidreq(), "name" => get_lang('Exercises')];
+    $interbreadcrumb[] = ["url" => "exercise.php?".api_get_cidreq(), "name" => get_lang('Exercises')];
     $objExerciseTmp = new Exercise();
 } else {
     $interbreadcrumb[] = ["url" => "exercise.php?".api_get_cidreq(), "name" => get_lang('Exercises')];
diff --git a/main/exercise/overview.php b/main/exercise/overview.php
index c3c605c904..68f1930a6b 100755
--- a/main/exercise/overview.php
+++ b/main/exercise/overview.php
@@ -83,6 +83,11 @@ if ($is_allowed_to_edit && $objExercise->sessionId == $sessionId) {
         Display::return_icon('edit.png', get_lang('Edit'), [], ICON_SIZE_SMALL),
         api_get_path(WEB_CODE_PATH).'exercise/admin.php?'.api_get_cidreq().'&exerciseId='.$objExercise->id
     );
+} elseif (api_is_teacher()) {
+    $edit_link = Display::url(
+        Display::return_icon('test_results.png', get_lang('Results'), [], ICON_SIZE_SMALL),
+        'exercise_report.php?'.api_get_cidreq().'&exerciseId='.$objExercise->id
+    );
 }
 $iconExercise = Display::return_icon('test-quiz.png', null, [], ICON_SIZE_MEDIUM);
 // Exercise name.
diff --git a/main/inc/ajax/admin.ajax.php b/main/inc/ajax/admin.ajax.php
index 180d5d2973..ede7638720 100755
--- a/main/inc/ajax/admin.ajax.php
+++ b/main/inc/ajax/admin.ajax.php
@@ -1,5 +1,9 @@
 <?php
 /* For licensing terms, see /license.txt */
+
+use Chamilo\CoreBundle\Entity\BranchSync;
+use Chamilo\CoreBundle\Entity\Repository\BranchSyncRepository;
+
 /**
  * Responses to AJAX calls.
  */
@@ -109,10 +113,8 @@ function version_check()
  * Check if the current installation is up to date
  * The code is borrowed from phpBB and slighlty modified.
  *
- * @author The phpBB Group <support@phpbb.com> (the code)
- * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University (the modifications)
- * @author Yannick Warnier <ywarnier@beeznest.org> for the move to HTTP request
- * @copyright (C) 2001 The phpBB Group
+ * @throws \Exception
+ * @throws \InvalidArgumentException
  *
  * @return string language string with some layout (color)
  */
@@ -162,6 +164,16 @@ function check_system_version()
             $packager = 'chamilo';
         }
 
+        $uniqueId = '';
+        $entityManager = Database::getManager();
+        /** @var BranchSyncRepository $branch */
+        $repository = $entityManager->getRepository('ChamiloCoreBundle:BranchSync');
+        /** @var BranchSync $branch */
+        $branch = $repository->getTopBranch();
+        if (is_a($branch, '\Chamilo\CoreBundle\Entity\BranchSync')) {
+            $uniqueId = $branch->getUniqueId();
+        }
+
         $data = [
             'url' => api_get_path(WEB_PATH),
             'campus' => api_get_setting('siteName'),
@@ -183,6 +195,7 @@ function check_system_version()
             // the default config file (main/install/configuration.dist.php)
             // or in the installed config file. The default value is 'chamilo'
             'packager' => $packager,
+            'unique_id' => $uniqueId,
         ];
 
         $version = null;
diff --git a/main/inc/lib/CourseChatUtils.php b/main/inc/lib/CourseChatUtils.php
index 18ab921abf..8127e76a16 100644
--- a/main/inc/lib/CourseChatUtils.php
+++ b/main/inc/lib/CourseChatUtils.php
@@ -92,7 +92,7 @@ class CourseChatUtils
         }
         $user = api_get_user_entity($this->userId);
         $courseInfo = api_get_course_info_by_id($this->courseId);
-        $isMaster = (bool) api_is_course_admin();
+        $isMaster = api_is_course_admin();
         $document_path = api_get_path(SYS_COURSE_PATH).$courseInfo['path'].'/document';
         $basepath_chat = '/chat_files';
         $group_info = [];
diff --git a/main/inc/lib/course.lib.php b/main/inc/lib/course.lib.php
index dab8416642..d9dc172e3d 100755
--- a/main/inc/lib/course.lib.php
+++ b/main/inc/lib/course.lib.php
@@ -6715,6 +6715,51 @@ class CourseManager
         return api_get_path(WEB_COURSE_PATH).$course->getDirectory().'/course-pic85x85.png';
     }
 
+    /**
+     * @return int
+     */
+    public static function getCountOpenCourses()
+    {
+        $visibility = [
+            COURSE_VISIBILITY_REGISTERED,
+            COURSE_VISIBILITY_OPEN_PLATFORM,
+            COURSE_VISIBILITY_OPEN_WORLD,
+        ];
+
+        $table = Database::get_main_table(TABLE_MAIN_COURSE);
+        $sql = "SELECT count(id) count 
+                FROM $table 
+                WHERE visibility IN (".implode(',', $visibility).")";
+        $result = Database::query($sql);
+        $row = Database::fetch_array($result);
+
+        return (int) $row['count'];
+    }
+
+    /**
+     * @return int
+     */
+    public static function getCountExercisesFromOpenCourse()
+    {
+        $visibility = [
+            COURSE_VISIBILITY_REGISTERED,
+            COURSE_VISIBILITY_OPEN_PLATFORM,
+            COURSE_VISIBILITY_OPEN_WORLD,
+        ];
+
+        $table = Database::get_main_table(TABLE_MAIN_COURSE);
+        $tableExercise = Database::get_course_table(TABLE_QUIZ_TEST);
+        $sql = "SELECT count(e.iid) count 
+                FROM $table c INNER JOIN $tableExercise e
+                ON (c.id = e.c_id)
+                WHERE e.active <> -1 AND visibility IN (".implode(',', $visibility).")";
+        $result = Database::query($sql);
+        $row = Database::fetch_array($result);
+
+        return (int) $row['count'];
+    }
+
+
     /**
      * @param ToolChain $toolList
      */
diff --git a/main/inc/lib/document.lib.php b/main/inc/lib/document.lib.php
index a33b309d2c..56f2e9933f 100644
--- a/main/inc/lib/document.lib.php
+++ b/main/inc/lib/document.lib.php
@@ -6400,6 +6400,49 @@ class DocumentManager
         ];
     }
 
+    /**
+     * @param int $userId
+     *
+     * @return array Example [ 0 => ['code' => 'ABC', 'directory' => 'ABC0', 'path' => '/images/gallery/test.png', 'code_path' => 'ABC:/images/gallery/test.png'], 1 => ...]
+     */
+    public static function getAllDocumentsCreatedByUser($userId)
+    {
+        $tblItemProperty = Database::get_course_table(TABLE_ITEM_PROPERTY);
+        $tblDocument = Database::get_course_table(TABLE_DOCUMENT);
+        $tblCourse = Database::get_main_table(TABLE_MAIN_COURSE);
+        $userId = (int) $userId;
+
+        $sql = "SELECT DISTINCT c.code, c.directory, docs.path
+                FROM $tblItemProperty AS last
+                INNER JOIN $tblDocument AS docs
+                ON (
+                    docs.id = last.ref AND
+                    docs.c_id = last.c_id AND
+                    docs.filetype <> 'folder'
+                )
+                INNER JOIN $tblCourse as c
+                ON (
+                    docs.c_id = c.id
+                )
+                WHERE                                
+                    last.tool = '".TOOL_DOCUMENT."' AND   
+                    last.insert_user_id = $userId AND
+                    docs.path NOT LIKE '%_DELETED_%'                     
+                ORDER BY c.directory, docs.path
+                ";
+        $result = Database::query($sql);
+
+        $list = [];
+        if (Database::num_rows($result) != 0) {
+            while ($row = Database::fetch_array($result, 'ASSOC')) {
+                $row['code_path'] = $row['code'].':'.$row['path'];
+                $list[] = $row;
+            }
+        }
+
+        return $list;
+    }
+
     /**
      * Parse file information into a link.
      *
diff --git a/main/inc/lib/extra_field.lib.php b/main/inc/lib/extra_field.lib.php
index d619845e20..0e000a09b0 100755
--- a/main/inc/lib/extra_field.lib.php
+++ b/main/inc/lib/extra_field.lib.php
@@ -143,6 +143,9 @@ class ExtraField extends Model
             case 'scheduled_announcement':
                 $this->extraFieldType = EntityExtraField::SCHEDULED_ANNOUNCEMENT;
                 break;
+            case 'terms_and_condition':
+                $this->extraFieldType = EntityExtraField::TERMS_AND_CONDITION_TYPE;
+                break;
         }
 
         $this->pageUrl = 'extra_fields.php?type='.$this->type;
@@ -176,6 +179,7 @@ class ExtraField extends Model
             'career',
             'user_certificate',
             'survey',
+            'terms_and_condition',
         ];
 
         if (api_get_configuration_value('allow_scheduled_announcements')) {
@@ -258,9 +262,9 @@ class ExtraField extends Model
         $conditions = Database::parse_conditions(['where' => $conditions]);
 
         if (empty($conditions)) {
-            $conditions .= " WHERE extra_field_type = ".$this->extraFieldType;
+            $conditions .= ' WHERE extra_field_type = '.$this->extraFieldType;
         } else {
-            $conditions .= " AND extra_field_type = ".$this->extraFieldType;
+            $conditions .= ' AND extra_field_type = '.$this->extraFieldType;
         }
 
         $sql = "SELECT * FROM $this->table
@@ -304,24 +308,26 @@ class ExtraField extends Model
         $result = Database::query($sql);
         if (Database::num_rows($result)) {
             $row = Database::fetch_array($result, 'ASSOC');
-            $row['display_text'] = self::translateDisplayName(
-                $row['variable'],
-                $row['display_text']
-            );
+            if ($row) {
+                $row['display_text'] = self::translateDisplayName(
+                    $row['variable'],
+                    $row['display_text']
+                );
 
-            // All the options of the field
-            $sql = "SELECT * FROM $this->table_field_options
+                // All the options of the field
+                $sql = "SELECT * FROM $this->table_field_options
                     WHERE field_id='".intval($row['id'])."'
                     ORDER BY option_order ASC";
-            $result = Database::query($sql);
-            while ($option = Database::fetch_array($result)) {
-                $row['options'][$option['id']] = $option;
-            }
+                $result = Database::query($sql);
+                while ($option = Database::fetch_array($result)) {
+                    $row['options'][$option['id']] = $option;
+                }
 
-            return $row;
-        } else {
-            return false;
+                return $row;
+            }
         }
+
+        return false;
     }
 
     /**
@@ -368,7 +374,7 @@ class ExtraField extends Model
      */
     public function getFieldInfoByFieldId($fieldId)
     {
-        $fieldId = intval($fieldId);
+        $fieldId = (int) $fieldId;
         $sql = "SELECT * FROM {$this->table}
                 WHERE
                     id = '$fieldId' AND
@@ -441,18 +447,10 @@ class ExtraField extends Model
         $types[self::FIELD_TYPE_VIDEO_URL] = get_lang('FieldTypeVideoUrl');
         $types[self::FIELD_TYPE_LETTERS_ONLY] = get_lang('FieldTypeOnlyLetters');
         $types[self::FIELD_TYPE_ALPHANUMERIC] = get_lang('FieldTypeAlphanumeric');
-        $types[self::FIELD_TYPE_LETTERS_SPACE] = get_lang(
-            'FieldTypeLettersSpaces'
-        );
-        $types[self::FIELD_TYPE_ALPHANUMERIC_SPACE] = get_lang(
-            'FieldTypeAlphanumericSpaces'
-        );
-        $types[self::FIELD_TYPE_GEOLOCALIZATION] = get_lang(
-            'Geolocalization'
-        );
-        $types[self::FIELD_TYPE_GEOLOCALIZATION_COORDINATES] = get_lang(
-            'GeolocalizationCoordinates'
-        );
+        $types[self::FIELD_TYPE_LETTERS_SPACE] = get_lang('FieldTypeLettersSpaces');
+        $types[self::FIELD_TYPE_ALPHANUMERIC_SPACE] = get_lang('FieldTypeAlphanumericSpaces');
+        $types[self::FIELD_TYPE_GEOLOCALIZATION] = get_lang('Geolocalization');
+        $types[self::FIELD_TYPE_GEOLOCALIZATION_COORDINATES] = get_lang('GeolocalizationCoordinates');
         $types[self::FIELD_TYPE_SELECT_WITH_TEXT_FIELD] = get_lang('FieldTypeSelectWithTextField');
         $types[self::FIELD_TYPE_TRIPLE_SELECT] = get_lang('FieldTypeTripleSelect');
 
@@ -481,7 +479,8 @@ class ExtraField extends Model
      *
      * @throws Exception
      *
-     * @return array|bool If relevant, returns a one-element array with JS code to be added to the page HTML headers. Returns false if the form object was not given
+     * @return array|bool If relevant, returns a one-element array with JS code to be added to the page HTML headers.
+     *                    Returns false if the form object was not given
      */
     public function addElements(
         $form,
@@ -502,7 +501,6 @@ class ExtraField extends Model
         $extraData = false;
         if (!empty($itemId)) {
             $extraData = self::get_handler_extra_data($itemId);
-
             if ($form) {
                 if (!empty($showOnlyTheseFields)) {
                     $setData = [];
@@ -1051,6 +1049,11 @@ class ExtraField extends Model
                     $freezeElement = $field_details['visible_to_self'] == 0 || $field_details['changeable'] == 0;
                 }
 
+                $translatedDisplayText = get_lang($field_details['display_text'], true);
+                if (!empty($translatedDisplayText)) {
+                    $field_details['display_text'] = $translatedDisplayText;
+                }
+
                 switch ($field_details['field_type']) {
                     case self::FIELD_TYPE_TEXT:
                         $form->addElement(
diff --git a/main/inc/lib/extra_field_value.lib.php b/main/inc/lib/extra_field_value.lib.php
index f2489153f1..8c7b546f70 100755
--- a/main/inc/lib/extra_field_value.lib.php
+++ b/main/inc/lib/extra_field_value.lib.php
@@ -886,7 +886,7 @@ class ExtraFieldValue extends Model
         $itemId = (int) $itemId;
         $extraFieldType = $this->getExtraField()->getExtraFieldType();
 
-        $sql = "SELECT s.value, sf.variable, sf.field_type, sf.id 
+        $sql = "SELECT s.value, sf.variable, sf.field_type, sf.id, sf.display_text
                 FROM {$this->table} s
                 INNER JOIN {$this->table_handler_field} sf
                 ON (s.field_id = sf.id)
diff --git a/main/inc/lib/groupmanager.lib.php b/main/inc/lib/groupmanager.lib.php
index 9dcac83319..6fe619029e 100755
--- a/main/inc/lib/groupmanager.lib.php
+++ b/main/inc/lib/groupmanager.lib.php
@@ -547,7 +547,7 @@ class GroupManager
     public static function get_group_properties($group_id, $useIid = false)
     {
         $course_id = api_get_course_int_id();
-        if (empty($group_id) || !is_integer(intval($group_id))) {
+        if (empty($group_id) || !is_int(intval($group_id))) {
             return null;
         }
 
diff --git a/main/inc/lib/javascript/chat/js/chat.js b/main/inc/lib/javascript/chat/js/chat.js
index 3a706cc4a6..0dd0b10914 100755
--- a/main/inc/lib/javascript/chat/js/chat.js
+++ b/main/inc/lib/javascript/chat/js/chat.js
@@ -184,7 +184,7 @@ function stopChatHeartBeat()
 
 function startChatHeartBeat()
 {
-    timer = setInterval('chatHeartbeat();', chatHeartbeatTime);
+    timer = setInterval(chatHeartbeat, chatHeartbeatTime);
 }
 
 /*
diff --git a/main/inc/lib/javascript/ckeditor/config_js.php b/main/inc/lib/javascript/ckeditor/config_js.php
index d6db660fb3..813ef10e3f 100644
--- a/main/inc/lib/javascript/ckeditor/config_js.php
+++ b/main/inc/lib/javascript/ckeditor/config_js.php
@@ -1,6 +1,8 @@
 <?php
 /* For licensing terms, see /license.txt */
 
+use Chamilo\CoreBundle\Component\Utils\ChamiloApi;
+
 require_once __DIR__.'/../../../global.inc.php';
 
 $moreButtonsInMaximizedMode = false;
@@ -9,7 +11,18 @@ if (api_get_setting('more_buttons_maximized_mode') === 'true') {
 }
 
 $template = new Template();
-$template->setStyleMenuInCkEditor();
+$template->assign(
+    'bootstrap_css',
+    api_get_path(WEB_PUBLIC_PATH).'assets/bootstrap/dist/css/bootstrap.min.css'
+);
+$template->assign(
+    'font_awesome_css',
+    api_get_path(WEB_PUBLIC_PATH).'assets/fontawesome/css/font-awesome.min.css'
+);
+$template->assign(
+    'css_editor',
+    ChamiloApi::getEditorBlockStylePath()
+);
 $template->assign('moreButtonsInMaximizedMode', $moreButtonsInMaximizedMode);
 $courseId = api_get_course_int_id();
 $courseCondition = '';
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/dialogs/image2_chamilo.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/dialogs/image2_chamilo.js
index 35333b9101..17a58dbd21 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/dialogs/image2_chamilo.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/dialogs/image2_chamilo.js
@@ -20,6 +20,8 @@ CKEDITOR.dialog.add( 'image2_chamilo', function( editor ) {
 		lang = editor.lang.image2_chamilo,
 		commonLang = editor.lang.common,
 
+		colorDialog = editor.plugins.colordialog,
+
 		lockResetStyle = 'margin-top:18px;width:40px;height:20px;',
 		lockResetHtml = new CKEDITOR.template(
 			'<div>' +
@@ -378,7 +380,7 @@ CKEDITOR.dialog.add( 'image2_chamilo', function( editor ) {
 
 	return {
 		title: lang.title,
-		minWidth: 250,
+		minWidth: 270,
 		minHeight: 100,
 		onLoad: function() {
 			// Create a "global" reference to the document for this dialog instance.
@@ -555,6 +557,188 @@ CKEDITOR.dialog.add( 'image2_chamilo', function( editor ) {
 					}
 				]
 			},
+			{
+				id: 'advanced',
+				label: lang.advanced,
+				hidden: false,
+				elements: [
+					{
+						type: 'vbox',
+						title: 'Border',
+						children: [
+							{
+								type: 'hbox',
+								widths: ['60%'],
+								children: [
+									{
+										id: 'borderWidth',
+										type: 'text',
+										label: lang.borderWidth,
+										width: '90%',
+										setup: function (widget) {
+											this.setValue(widget.data.borderWidth);
+										},
+										commit: function (widget) {
+											widget.setData(this.id, this.getValue());
+										}
+									},
+									{
+										type: 'html',
+										html: '<ul>' +
+										'<li>4px</li>' +
+										'<li>1.2rem</li>' +
+										'<li>2px 1.5em</li>' +
+										'<li>1px 2em 1.5cm</li>' +
+										'<li>1px 2em 0 4rem</li>' +
+										'</ul>'
+									}
+								]
+							},
+							{
+								type: 'hbox',
+								widths: ['60%'],
+								children: [
+									{
+										type: 'hbox',
+										widths: ['', '100%'],
+										children: [
+											{
+												id: 'borderColor',
+												type: 'text',
+												label: lang.borderColor,
+												setup: function (widget) {
+													this.setValue(widget.data.borderColor);
+												},
+												commit: function (widget) {
+													widget.setData(this.id, this.getValue());
+												}
+											},
+											colorDialog ? {
+												type: 'button',
+												id: 'btnBorderColorChoose',
+												label: 'Color',
+												onLoad: function() {
+													// Stick the element to the bottom (https://dev.ckeditor.com/ticket/5587)
+													this.getElement()
+														.getParent()
+														.setStyle('vertical-align', 'bottom');
+												},
+												onClick: function () {
+													editor.getColorFromDialog(function (color) {
+														if (color) {
+															this.getDialog()
+																.getContentElement('advanced', 'borderColor')
+																.setValue(color);
+														}
+
+														this.focus();
+													}, this);
+												}
+											} : {
+												type: 'html',
+												html: '&nbsp;'
+											}
+										]
+									},
+									{
+										id: 'borderStyle',
+										type: 'select',
+										label: lang.borderStyle,
+										items: [
+											[lang.borderStyleNone, 'none'],
+											[lang.borderStyleDotted, 'dotted'],
+											[lang.borderStyleDashed, 'dashed'],
+											[lang.borderStyleSolid, 'solid'],
+											[lang.borderStyleDouble, 'double'],
+											[lang.borderStyleGroove, 'groove'],
+											[lang.borderStyleRidge, 'ridge'],
+											[lang.borderStyleInset, 'inset'],
+											[lang.borderStyleOutset, 'outset']
+										],
+										'default': 'solid',
+										setup: function (widget) {
+											this.setValue(widget.data.borderStyle);
+										},
+										commit: function (widget) {
+											widget.setData(this.id, this.getValue());
+										}
+									}
+								]
+							},
+							{
+								type: 'hbox',
+								widths: ['60%'],
+								children: [
+									{
+										id: 'borderRadius',
+										type: 'text',
+										label: lang.borderRadius,
+										width: '90%',
+										setup: function (widget) {
+											this.setValue(widget.data.borderRadius);
+										},
+										commit: function (widget) {
+											widget.setData(this.id, this.getValue());
+										}
+									},
+									{
+										type: 'html',
+										html: '<ul>' +
+										'<li>30px</li>' +
+										'<li>25% 10%</li>' +
+										'<li>10% 30% 50% 70%</li>' +
+										'<li>10% / 50%</li>' +
+										'<li>10px 100px / 120px</li>' +
+										'<li>50% 20% / 10% 40%</li>' +
+										'</ul>'
+									}
+								]
+							},
+							{
+								type: 'hbox',
+								widths: ['', '100%'],
+								children: [
+									{
+										id: 'backgroundColor',
+										type: 'text',
+										label: lang.backgroundColor,
+										setup: function (widget) {
+											this.setValue(widget.data.backgroundColor);
+										},
+										commit: function (widget) {
+											widget.setData(this.id, this.getValue());
+										}
+									},
+									colorDialog ? {
+										type: 'button',
+										id: 'btnBackgroundColorChoose',
+										label: lang.color,
+										onLoad: function() {
+											this.getElement()
+												.getParent()
+												.setStyle('vertical-align', 'bottom');
+										},
+										onClick: function () {
+											editor.getColorFromDialog(function (color) {
+												if (color) {
+													this.getDialog()
+														.getContentElement('advanced', 'backgroundColor')
+														.setValue(color);
+												}
+
+												this.focus();
+											}, this);
+										}
+									} : {
+										type: 'html',
+										html: '&nbsp;'
+									}
+								]
+							}
+						]
+					}
+				]
+			},
 			{
 				id: 'Upload',
 				hidden: true,
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/af.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/af.js
index 027aa04953..d99b28681b 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/af.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/af.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'af', {
 	uploadTab: 'Oplaai',
 	urlMissing: 'Die URL na die afbeelding ontbreek.',
 	altMissing: 'Alternative text is missing.', // MISSING
-	responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/ar.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/ar.js
index bf21a31034..2de54576d9 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/ar.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/ar.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'ar', {
 	uploadTab: 'رفع',
 	urlMissing: 'عنوان مصدر الصورة مفقود',
 	altMissing: 'Alternative text is missing.', // MISSING
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/az.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/az.js
index 97d11d8b8c..53dbda2040 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/az.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/az.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'az', {
 	uploadTab: 'Serverə yüklə',
 	urlMissing: 'Şəklin ünvanı yanlışdır.',
 	altMissing: 'Alternativ mətn tapılmayıb',
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/bg.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/bg.js
index 640e0ea774..9d676e089a 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/bg.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/bg.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'bg', {
 	uploadTab: 'Качване',
 	urlMissing: 'URL адреса на изображението липсва.',
 	altMissing: 'Alternative text is missing.', // MISSING
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/bn.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/bn.js
index dbaac1ac5b..2eebdbf2fa 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/bn.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/bn.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'bn', {
 	uploadTab: 'আপলোড',
 	urlMissing: 'Image source URL is missing.', // MISSING
 	altMissing: 'Alternative text is missing.', // MISSING
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/bs.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/bs.js
index a3a9e9db56..83d58775ec 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/bs.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/bs.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'bs', {
 	uploadTab: 'Šalji',
 	urlMissing: 'Image source URL is missing.', // MISSING
 	altMissing: 'Alternative text is missing.', // MISSING
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/ca.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/ca.js
index 0ba30797fa..0ebb043c02 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/ca.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/ca.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'ca', {
 	uploadTab: 'Puja',
 	urlMissing: 'Falta la URL de la imatge.',
 	altMissing: 'Alternative text is missing.', // MISSING
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/cs.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/cs.js
index fd6e2d0cdf..1f6fe53827 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/cs.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/cs.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'cs', {
 	uploadTab: 'Odeslat',
 	urlMissing: 'Zadané URL zdroje obrázku nebylo nalezeno.',
 	altMissing: 'Alternative text is missing.', // MISSING
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/cy.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/cy.js
index 00467bbf0d..551bdb9b9d 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/cy.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/cy.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'cy', {
 	uploadTab: 'Lanlwytho',
 	urlMissing: 'URL gwreiddiol y ddelwedd ar goll.',
 	altMissing: 'Alternative text is missing.', // MISSING
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/da.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/da.js
index bda4380741..ccdf9d5fb9 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/da.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/da.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'da', {
 	uploadTab: 'Upload',
 	urlMissing: 'Kilde på billed-URL mangler',
 	altMissing: 'Alternative text is missing.', // MISSING
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/de-ch.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/de-ch.js
index 82232ce777..64198dca3f 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/de-ch.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/de-ch.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'de-ch', {
 	uploadTab: 'Hochladen',
 	urlMissing: 'Bildquellen-URL fehlt.',
 	altMissing: 'Alternative text is missing.', // MISSING
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/de.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/de.js
index 5e99c4e60b..c08e9db92d 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/de.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/de.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'de', {
 	uploadTab: 'Hochladen',
 	urlMissing: 'Bildquellen-URL fehlt.',
 	altMissing: 'Alternativer Text fehlt.',
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/el.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/el.js
index c30d72622c..1fff06dd09 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/el.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/el.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'el', {
 	uploadTab: 'Αποστολή',
 	urlMissing: 'Λείπει το πηγαίο URL της εικόνας.',
 	altMissing: 'Alternative text is missing.', // MISSING
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/en-au.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/en-au.js
index 0a188e9f2b..c484e980ee 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/en-au.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/en-au.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'en-au', {
 	uploadTab: 'Upload',
 	urlMissing: 'Image source URL is missing.', // MISSING
 	altMissing: 'Alternative text is missing.', // MISSING
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/en-ca.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/en-ca.js
index 2050425af2..7459a01bf4 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/en-ca.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/en-ca.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'en-ca', {
 	uploadTab: 'Upload',
 	urlMissing: 'Image source URL is missing.', // MISSING
 	altMissing: 'Alternative text is missing.', // MISSING
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/en-gb.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/en-gb.js
index 4b27ba35ef..944b72189a 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/en-gb.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/en-gb.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'en-gb', {
 	uploadTab: 'Upload',
 	urlMissing: 'Image source URL is missing.',
 	altMissing: 'Alternative text is missing.', // MISSING
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/en.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/en.js
index d0627a8b05..bc449252e8 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/en.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/en.js
@@ -26,5 +26,21 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'en', {
 	alignSuper: 'Super',
 	alignSub: 'Sub',
 	alignTextTop: 'Text-top',
-	alignTextBottom: 'Text-bottom'
+	alignTextBottom: 'Text-bottom',
+    advanced: 'Advanced',
+	borderWidth: 'Border width',
+    borderColor: 'Border color',
+    borderStyle: 'Border style',
+    borderRadius: 'Border radius',
+    backgroundColor: 'Background color',
+	color: 'Color',
+    borderStyleNone: 'None',
+    borderStyleDotted: 'Dotted',
+    borderStyleDashed: 'Dashed',
+    borderStyleSolid: 'Solid',
+    borderStyleDouble: 'Double',
+    borderStyleGroove: 'Groove',
+    borderStyleRidge: 'Ridge',
+    borderStyleInset: 'Inset',
+    borderStyleOutset: 'Outset'
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/eo.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/eo.js
index 71a026401a..fdabcfb2e5 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/eo.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/eo.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'eo', {
 	uploadTab: 'Alŝuti',
 	urlMissing: 'La fontretadreso de la bildo mankas.',
 	altMissing: 'Alternative text is missing.', // MISSING
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/es.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/es.js
index 31c30c74b6..c21c5f468d 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/es.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/es.js
@@ -26,5 +26,21 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'es', {
     alignSuper: 'Superíndice',
     alignSub: 'Subíndice',
     alignTextTop: 'Parte superior de la línea',
-    alignTextBottom: 'Parte inferior de la línea'
+	alignTextBottom: 'Parte inferior de la línea',
+	advanced: 'Avanzado',
+	borderWidth: 'Ancho de borde',
+	borderColor: 'Color de borde',
+	borderStyle: 'Estilo de borde',
+	borderRadius: 'Radio del borde',
+	backgroundColor: 'Color de fondo',
+	color: 'Color',
+    borderStyleNone: 'Ninguno',
+	borderStyleDotted: 'Punteado',
+	borderStyleDashed: 'Discontinuo',
+	borderStyleSolid: 'Sólido',
+	borderStyleDouble: 'Doble',
+	borderStyleGroove: 'Ranura',
+	borderStyleRidge: 'Cresta',
+	borderStyleInset: 'Recuadro',
+	borderStyleOutset: 'Comienzo',
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/et.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/et.js
index 0379579db4..467bb23978 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/et.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/et.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'et', {
 	uploadTab: 'Lae üles',
 	urlMissing: 'Pildi lähte-URL on puudu.',
 	altMissing: 'Alternative text is missing.', // MISSING
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/eu.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/eu.js
index ba70b6c98a..ef7063a387 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/eu.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/eu.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'eu', {
 	uploadTab: 'Kargatu',
 	urlMissing: 'Irudiaren iturburuaren URLa falta da.',
 	altMissing: 'Alternative text is missing.', // MISSING
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/fa.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/fa.js
index 9ef964c6b3..e94de17fa6 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/fa.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/fa.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'fa', {
 	uploadTab: 'بالاگذاری',
 	urlMissing: 'آدرس URL اصلی تصویر یافت نشد.',
 	altMissing: 'Alternative text is missing.', // MISSING
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/fi.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/fi.js
index c47309c45b..9794ecb1ba 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/fi.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/fi.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'fi', {
 	uploadTab: 'Lisää tiedosto',
 	urlMissing: 'Kuvan lähdeosoite puuttuu.',
 	altMissing: 'Alternative text is missing.', // MISSING
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/fo.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/fo.js
index c6b5d70e71..35bb6b4728 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/fo.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/fo.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'fo', {
 	uploadTab: 'Send til ambætaran',
 	urlMissing: 'URL til mynd manglar.',
 	altMissing: 'Alternative text is missing.', // MISSING
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/fr-ca.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/fr-ca.js
index 51110c2125..2821d0db8c 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/fr-ca.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/fr-ca.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'fr-ca', {
 	uploadTab: 'Téléverser',
 	urlMissing: 'L\'URL de la source de l\'image est manquant.',
 	altMissing: 'Alternative text is missing.', // MISSING
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/fr.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/fr.js
index f63d7aa26a..ffde2e809c 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/fr.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/fr.js
@@ -18,13 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'fr', {
 	uploadTab: 'Téléverser',
 	urlMissing: 'L\'URL source de l\'image est manquante.',
 	altMissing: 'Texte alternatif manquant.',
-        responsive: 'Image adaptive',
-        alignBaseline: 'Sur la ligne',
-        alignTop: 'En haut',
-        alignBottom: 'En bas',
-        alignMiddle: 'Au milieu',
-        alignSuper: 'Superieur',
-        alignSub: 'Inférieur',
-        alignTextTop: 'Text-en-haut',
-        alignTextBottom: 'Text-en-bas'
+	responsive: 'Image adaptive',
+	alignBaseline: 'Sur la ligne',
+	alignTop: 'En haut',
+	alignBottom: 'En bas',
+	alignMiddle: 'Au milieu',
+	alignSuper: 'Superieur',
+	alignSub: 'Inférieur',
+	alignTextTop: 'Text-en-haut',
+	alignTextBottom: 'Text-en-bas',
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/gl.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/gl.js
index aea3fb980e..0a17844c35 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/gl.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/gl.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'gl', {
 	uploadTab: 'Cargar',
 	urlMissing: 'Non se atopa o URL da imaxe.',
 	altMissing: 'Alternative text is missing.', // MISSING
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/gu.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/gu.js
index b24996de6d..28afd0aa08 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/gu.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/gu.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'gu', {
 	uploadTab: 'અપલોડ',
 	urlMissing: 'ઈમેજની મૂળ URL છે નહી.',
 	altMissing: 'Alternative text is missing.', // MISSING
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/he.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/he.js
index c293c9abcb..8d92d5306f 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/he.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/he.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'he', {
 	uploadTab: 'העלאה',
 	urlMissing: 'כתובת התמונה חסרה.',
 	altMissing: 'Alternative text is missing.', // MISSING
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/hi.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/hi.js
index 952ed81e31..a02dedb365 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/hi.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/hi.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'hi', {
 	uploadTab: 'अपलोड',
 	urlMissing: 'Image source URL is missing.', // MISSING
 	altMissing: 'Alternative text is missing.', // MISSING
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/hr.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/hr.js
index e88e1d85ae..707c785f88 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/hr.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/hr.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'hr', {
 	uploadTab: 'Pošalji',
 	urlMissing: 'Nedostaje URL slike.',
 	altMissing: 'Alternative text is missing.', // MISSING
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/hu.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/hu.js
index f3edd8ba3d..a6b2b08632 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/hu.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/hu.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'hu', {
 	uploadTab: 'Feltöltés',
 	urlMissing: 'Hiányzik a kép URL-je',
 	altMissing: 'Alternative text is missing.', // MISSING
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/id.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/id.js
index cb1c99187b..48c4f323f9 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/id.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/id.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'id', {
 	uploadTab: 'Unggah',
 	urlMissing: 'Image source URL is missing.', // MISSING
 	altMissing: 'Alternative text is missing.', // MISSING
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/is.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/is.js
index 3feb5417bd..aac15fbf5b 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/is.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/is.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'is', {
 	uploadTab: 'Senda upp',
 	urlMissing: 'Image source URL is missing.', // MISSING
 	altMissing: 'Alternative text is missing.', // MISSING
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/it.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/it.js
index 1a1de6db2a..27364e95bb 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/it.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/it.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'it', {
 	uploadTab: 'Carica',
 	urlMissing: 'Manca l\'URL dell\'immagine.',
 	altMissing: 'Testo alternativo mancante.',
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/ja.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/ja.js
index 0c6a357358..7913e0c419 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/ja.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/ja.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'ja', {
 	uploadTab: 'アップロード',
 	urlMissing: '画像のURLを入力してください。',
 	altMissing: 'Alternative text is missing.', // MISSING
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/ka.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/ka.js
index ee04e536f0..8959fb50ce 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/ka.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/ka.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'ka', {
 	uploadTab: 'აქაჩვა',
 	urlMissing: 'სურათის URL არაა შევსებული.',
 	altMissing: 'Alternative text is missing.', // MISSING
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/km.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/km.js
index f5776544fd..73d4f11b04 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/km.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/km.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'km', {
 	uploadTab: 'ផ្ទុក​ឡើង',
 	urlMissing: 'ខ្វះ URL ប្រភព​រូប​ភាព។',
 	altMissing: 'Alternative text is missing.', // MISSING
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/ko.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/ko.js
index 9be001f68b..80dec734e2 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/ko.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/ko.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'ko', {
 	uploadTab: '업로드',
 	urlMissing: '이미지 원본 주소(URL)가 없습니다.',
 	altMissing: 'Alternative text is missing.', // MISSING
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/ku.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/ku.js
index 7a6489cdb3..fe9617df0a 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/ku.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/ku.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'ku', {
 	uploadTab: 'بارکردن',
 	urlMissing: 'سەرچاوەی بەستەری وێنه بزره',
 	altMissing: 'Alternative text is missing.', // MISSING
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/lt.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/lt.js
index 1b1345429c..1227791838 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/lt.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/lt.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'lt', {
 	uploadTab: 'Siųsti',
 	urlMissing: 'Paveiksliuko nuorodos nėra.',
 	altMissing: 'Alternative text is missing.', // MISSING
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/lv.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/lv.js
index 602109f55d..eef97d1ff5 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/lv.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/lv.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'lv', {
 	uploadTab: 'Augšupielādēt',
 	urlMissing: 'Trūkst attēla atrašanās adrese.',
 	altMissing: 'Alternative text is missing.', // MISSING
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/mk.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/mk.js
index 4f786e23f1..c72dca40f9 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/mk.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/mk.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'mk', {
 	uploadTab: 'Прикачи',
 	urlMissing: 'Недостасува URL-то на сликата.',
 	altMissing: 'Alternative text is missing.', // MISSING
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/mn.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/mn.js
index 1592c9a1ed..724b4ec066 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/mn.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/mn.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'mn', {
 	uploadTab: 'Илгээж ачаалах',
 	urlMissing: 'Зургийн эх сурвалжийн хаяг (URL) байхгүй байна.',
 	altMissing: 'Alternative text is missing.', // MISSING
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/ms.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/ms.js
index f82677f1a7..d5a1cd9d16 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/ms.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/ms.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'ms', {
 	uploadTab: 'Muat Naik',
 	urlMissing: 'Image source URL is missing.', // MISSING
 	altMissing: 'Alternative text is missing.', // MISSING
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/nb.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/nb.js
index 719bd9dd56..d4070eba4c 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/nb.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/nb.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'nb', {
 	uploadTab: 'Last opp',
 	urlMissing: 'Bildets adresse mangler.',
 	altMissing: 'Alternativ tekst mangler.',
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/nl.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/nl.js
index 7c2a1c8c32..e7eb073895 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/nl.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/nl.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'nl', {
 	uploadTab: 'Uploaden',
 	urlMissing: 'De URL naar de afbeelding ontbreekt.',
 	altMissing: 'Alternatieve tekst ontbreekt.',
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/no.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/no.js
index 1bcbb0dcd6..68d54fec6c 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/no.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/no.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'no', {
 	uploadTab: 'Last opp',
 	urlMissing: 'Bildets adresse mangler.',
 	altMissing: 'Alternative text is missing.', // MISSING
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/oc.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/oc.js
index fc66540e39..43dd1a55b8 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/oc.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/oc.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'oc', {
 	uploadTab: 'Mandar',
 	urlMissing: 'L\'URL font de l\'imatge es mancanta.',
 	altMissing: 'Lo tèxte alternatiu es mancant.',
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/pl.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/pl.js
index 5c57574ca1..9e43b7e88c 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/pl.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/pl.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'pl', {
 	uploadTab: 'Wyślij',
 	urlMissing: 'Podaj adres URL obrazka.',
 	altMissing: 'Podaj tekst zastępczy obrazka.',
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/pt-br.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/pt-br.js
index 9f65fc389a..5cc611e52c 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/pt-br.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/pt-br.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'pt-br', {
 	uploadTab: 'Enviar ao Servidor',
 	urlMissing: 'URL da imagem está faltando.',
 	altMissing: 'Texto alternativo não informado.',
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/pt.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/pt.js
index 13ca8454b7..cdff04a221 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/pt.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/pt.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'pt', {
 	uploadTab: 'Carregar',
 	urlMissing: 'O URL da fonte da imagem está em falta.',
 	altMissing: 'Alternative text is missing.', // MISSING
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/ro.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/ro.js
index d9d67bdab4..3f2e9baafa 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/ro.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/ro.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'ro', {
 	uploadTab: 'Încarcă',
 	urlMissing: 'Sursa URL a imaginii lipsește.',
 	altMissing: 'Alternative text is missing.', // MISSING
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/ru.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/ru.js
index d838e2a961..57b9c56570 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/ru.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/ru.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'ru', {
 	uploadTab: 'Загрузка файла',
 	urlMissing: 'Не указана ссылка на изображение.',
 	altMissing: 'Не задан альтернативный текст',
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/si.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/si.js
index 083a38030b..94676e7c16 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/si.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/si.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'si', {
 	uploadTab: 'උඩුගතකිරීම',
 	urlMissing: 'රුප මුලාශ්‍ර URL නැත.',
 	altMissing: 'Alternative text is missing.', // MISSING
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/sk.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/sk.js
index 88905ae82e..b86d4d9c6f 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/sk.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/sk.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'sk', {
 	uploadTab: 'Nahrať',
 	urlMissing: 'Chýba URL zdroja obrázka.',
 	altMissing: 'Alternative text is missing.', // MISSING
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/sl.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/sl.js
index 43c4398c16..ee8fc05557 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/sl.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/sl.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'sl', {
 	uploadTab: 'Naloži',
 	urlMissing: 'Manjka vir (URL) slike.',
 	altMissing: 'Alternative text is missing.', // MISSING
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/sq.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/sq.js
index dd1da4839c..c823d428b7 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/sq.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/sq.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'sq', {
 	uploadTab: 'Ngarko',
 	urlMissing: 'Mungon URL e burimit të fotografisë.',
 	altMissing: 'Alternative text is missing.', // MISSING
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/sr-latn.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/sr-latn.js
index 571e9a13b8..4c2ba8f143 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/sr-latn.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/sr-latn.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'sr-latn', {
 	uploadTab: 'Pošalji',
 	urlMissing: 'Image source URL is missing.', // MISSING
 	altMissing: 'Alternative text is missing.', // MISSING
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/sr.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/sr.js
index 29b782b4ef..fb9829eae4 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/sr.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/sr.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'sr', {
 	uploadTab: 'Пошаљи',
 	urlMissing: 'Недостаје УРЛ слике.',
 	altMissing: 'Alternative text is missing.', // MISSING
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/sv.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/sv.js
index 77401a75ea..a51a8da558 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/sv.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/sv.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'sv', {
 	uploadTab: 'Ladda upp',
 	urlMissing: 'Bildkällans URL saknas.',
 	altMissing: 'Alternativ text saknas',
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/th.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/th.js
index 40935e8338..a783d811bb 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/th.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/th.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'th', {
 	uploadTab: 'อัพโหลดไฟล์',
 	urlMissing: 'Image source URL is missing.', // MISSING
 	altMissing: 'Alternative text is missing.', // MISSING
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/tr.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/tr.js
index 790a7d4ac7..cfad5a9aa4 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/tr.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/tr.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'tr', {
 	uploadTab: 'Karşıya Yükle',
 	urlMissing: 'Resmin URL kaynağı bulunamadı.',
 	altMissing: 'Alternatif yazı eksik.',
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/tt.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/tt.js
index 94579ff0bc..039b667d42 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/tt.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/tt.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'tt', {
 	uploadTab: 'Йөкләү',
 	urlMissing: 'Image source URL is missing.', // MISSING
 	altMissing: 'Alternative text is missing.', // MISSING
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/ug.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/ug.js
index 6885e1c1d1..2321173302 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/ug.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/ug.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'ug', {
 	uploadTab: 'يۈكلە',
 	urlMissing: 'سۈرەتنىڭ ئەسلى ھۆججەت ئادرېسى كەم',
 	altMissing: 'Alternative text is missing.', // MISSING
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/uk.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/uk.js
index d4b594f1ab..7e1816ce5d 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/uk.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/uk.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'uk', {
 	uploadTab: 'Надіслати',
 	urlMissing: 'Вкажіть URL зображення.',
 	altMissing: 'Alternative text is missing.', // MISSING
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/vi.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/vi.js
index f39a7fac5a..7f48ec6c54 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/vi.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/vi.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'vi', {
 	uploadTab: 'Tải lên',
 	urlMissing: 'Thiếu đường dẫn hình ảnh',
 	altMissing: 'Alternative text is missing.', // MISSING
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/zh-cn.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/zh-cn.js
index 6c4f85b532..ecba9c3c47 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/zh-cn.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/zh-cn.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'zh-cn', {
 	uploadTab: '上传',
 	urlMissing: '缺少图像源文件地址',
 	altMissing: '缺少替换文本',
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/zh.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/zh.js
index 8e72342d40..b0984eb79b 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/zh.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/zh.js
@@ -18,5 +18,29 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'zh', {
 	uploadTab: '上傳',
 	urlMissing: '遺失圖片來源之 URL ',
 	altMissing: '替代文字遺失。',
-    responsive: 'Responsive image' // MISSING
+    responsive: 'Responsive image', // MISSING
+    alignBaseline: 'Baseline', // MISSING
+    alignTop: 'Top', // MISSING
+    alignBottom: 'Bottom', // MISSING
+    alignMiddle: 'Middle', // MISSING
+    alignSuper: 'Super', // MISSING
+    alignSub: 'Sub', // MISSING
+    alignTextTop: 'Text-top', // MISSING
+    alignTextBottom: 'Text-bottom', // MISSING
+    advanced: 'Advanced', // MISSING
+    borderWidth: 'Border width', // MISSING
+    borderColor: 'Border color', // MISSING
+    borderStyle: 'Border style', // MISSING
+    borderRadius: 'Border radius', // MISSING
+    backgroundColor: 'Background color', // MISSING
+    color: 'Color', // MISSING
+    borderStyleNone: 'None', // MISSING
+    borderStyleDotted: 'Dotted', // MISSING
+    borderStyleDashed: 'Dashed', // MISSING
+    borderStyleSolid: 'Solid', // MISSING
+    borderStyleDouble: 'Double', // MISSING
+    borderStyleGroove: 'Groove', // MISSING
+    borderStyleRidge: 'Ridge', // MISSING
+    borderStyleInset: 'Inset', // MISSING
+    borderStyleOutset: 'Outset' // MISSING
 } );
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/plugin.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/plugin.js
index 05f250a4b7..4571415e10 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/plugin.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/plugin.js
@@ -355,6 +355,20 @@
 					alt: this.data.alt
 				} );
 
+				if (this.data.hasCaption) {
+					this.parts.image.setStyle('border-width', null);
+					this.parts.image.setStyle('border-style', null);
+					this.parts.image.setStyle('border-color', null);
+					this.parts.image.setStyle('border-radius', null);
+					this.parts.image.setStyle('background-color', null);
+				} else {
+					this.parts.image.setStyle('border-width', this.data.borderWidth);
+					this.parts.image.setStyle('border-style', this.data.borderStyle);
+					this.parts.image.setStyle('border-color', this.data.borderColor);
+					this.parts.image.setStyle('border-radius', this.data.borderRadius);
+					this.parts.image.setStyle('background-color', this.data.backgroundColor);
+				}
+
 				// If shifting non-captioned -> captioned, remove classes
 				// related to styles from <img/>.
 				if ( this.oldData && !this.oldData.hasCaption && this.data.hasCaption ) {
@@ -382,7 +396,12 @@
 						height: image.getAttribute( 'height' ) || '',
 						isResponsive: !!image.$.className.match(/img-responsive/i),
 						// Lock ratio is on by default (#10833).
-						lock: this.ready ? helpers.checkHasNaturalRatio( image ) : true
+						lock: this.ready ? helpers.checkHasNaturalRatio( image ) : true,
+						borderWidth: !this.parts.caption ? image.getStyle('border-width') : '',
+						borderStyle: !this.parts.caption ? image.getStyle('border-style') : 'solid',
+						borderColor: !this.parts.caption ? image.getStyle('border-color') : '',
+						borderRadius: !this.parts.caption ? image.getStyle('border-radius') : '',
+						backgroundColor: !this.parts.caption ? image.getStyle('background-color') : '',
 					};
 
 				// If we used 'a' in widget#parts definition, it could happen that
@@ -580,7 +599,8 @@
 					}
 
 					// Finally set display for figure.
-					if ( !alignClasses && el.is( 'figure' ) ) {
+					// if ( !alignClasses && el.is( 'figure' ) ) {
+					if ( el.is( 'figure' ) ) { // Force set display inline-block for figure regardless class
 						if ( newValue == 'center' )
 							el.setStyle( 'display', 'inline-block' );
 						else
@@ -1594,7 +1614,8 @@
 					match: centerWrapperChecker( editor )
 				},
 				img: {
-					attributes: '!src,alt,width,height'
+					attributes: '!src,alt,width,height',
+					styles: 'border-width,border-style,border-color,border-radius,background-color'
 				},
 				figure: {
 					classes: '!' + editor.config.image2_chamilo_captionedClass
@@ -1647,6 +1668,21 @@
 				},
 				responsive: {
 					requiredContent: 'img'
+				},
+				borderWidth: {
+					requiredContent: 'img{border-width}'
+				},
+				borderStyle: {
+					requiredContent: 'img{border-style}'
+				},
+				borderColor: {
+					requiredContent: 'img{border-color}'
+				},
+				borderRadius: {
+					requiredContent: 'img{border-radius}'
+				},
+				backgroundColor: {
+					requiredContent: 'img{background-color}'
 				}
 			};
 
diff --git a/main/inc/lib/javascript/ckeditor/plugins/toolbarswitch/plugin.js b/main/inc/lib/javascript/ckeditor/plugins/toolbarswitch/plugin.js
index 4a190a0b33..e1067d3c3d 100644
--- a/main/inc/lib/javascript/ckeditor/plugins/toolbarswitch/plugin.js
+++ b/main/inc/lib/javascript/ckeditor/plugins/toolbarswitch/plugin.js
@@ -29,25 +29,26 @@
 
 
 function switchMe(editor, callback) {
+    var origToolbar =  editor.config.toolbar;
+    var origSmallToolbar = editor.config.smallToolbar;
+    var origMaximizedToolbar = editor.config.maximizedToolbar;
+    var newToolbar = origToolbar == origSmallToolbar ? origMaximizedToolbar : origSmallToolbar;
 
-	var origCustomConfig = editor.config.customConfig;
-	var origContentCss = editor.config.contentsCss;
-	var origExtraPlugins = editor.config.extraPlugins;
+	var origConfig = editor.config,
+		newConfig = jQuery.extend(true, {}, origConfig);
 
-        var origMinToolbar = editor.config.toolbar_minToolbar;
-        var origMaxToolbar = editor.config.toolbar_maxToolbar;
+    newConfig.toolbar = newToolbar;
+    newConfig.on = {
+        instanceReady: function(e) {
+            if (typeof CKeditor_OnComplete !== 'undefined') {
+                CKeditor_OnComplete(e.editor);
+            }
+            if (callback) {
+                callback.call(null, e);
+            }
+        }
+    };
 
-	var origToolbar =  editor.config.toolbar;
-	var origSmallToolbar = editor.config.smallToolbar;
-	var origMaximizedToolbar = editor.config.maximizedToolbar;
-	var origStartupOutlineBlocks = editor.config.startupOutlineBlocks;
-	var newToolbar;
-	if (origToolbar == origSmallToolbar) {
-		newToolbar = origMaximizedToolbar;
-	} else {
-		newToolbar = origSmallToolbar;
-	}
-	
 	// Copy data to original text element before getting rid of the old editor
 	var data = editor.getData();
 	var domTextElement = editor.element.$;
@@ -57,27 +58,7 @@ function switchMe(editor, callback) {
 	var id = domTextElement.id;
 	editor.destroy(true);
 
-	CKEDITOR.replace(id, {
-		startupOutlineBlocks: origStartupOutlineBlocks,
-		customConfig : origCustomConfig,
-		contentsCss : origContentCss,
-		toolbar_minToolbar: origMinToolbar,
-		toolbar_maxToolbar: origMaxToolbar,
-		toolbar : newToolbar,
-		smallToolbar: origSmallToolbar,
-		maximizedToolbar: origMaximizedToolbar,
-		extraPlugins : origExtraPlugins,
-		on: {
-			instanceReady: function(e) {
-				if (typeof CKeditor_OnComplete !== 'undefined') {
-					CKeditor_OnComplete(e.editor);
-                                }
-				if (callback) {
-					callback.call(null, e);
-				}
-			}
-		}
-	});
+	CKEDITOR.replace(id, newConfig);
 }
 
 CKEDITOR.plugins.add('toolbarswitch', {
diff --git a/main/inc/lib/javascript/record_audio/record_audio.js b/main/inc/lib/javascript/record_audio/record_audio.js
index 63de448e95..2f8dd94e3f 100644
--- a/main/inc/lib/javascript/record_audio/record_audio.js
+++ b/main/inc/lib/javascript/record_audio/record_audio.js
@@ -13,7 +13,7 @@ window.RecordAudio = (function () {
             btnSave = rtcInfo.btnSaveId ? $(rtcInfo.btnSaveId) : null,
             tagAudio = $(rtcInfo.plyrPreviewId);
 
-        function saveAudio () {
+        function saveAudio() {
             var recordedBlob = recordRTC.getBlob();
 
             if (!recordedBlob) {
@@ -28,7 +28,7 @@ window.RecordAudio = (function () {
             formData.append('audio_dir', rtcInfo.directory);
 
             $.ajax({
-                url: _p.web_ajax + 'record_audio_rtc.ajax.php?tool=' + (!!txtName.length ? 'document' : 'exercise'),
+                url: _p.web_ajax + 'record_audio_rtc.ajax.php?type='+rtcInfo.type+'&tool=' + (!!txtName.length ? 'document' : 'exercise'),
                 data: formData,
                 processData: false,
                 contentType: false,
@@ -44,8 +44,10 @@ window.RecordAudio = (function () {
                 }
             }).done(function (response) {
                 if (!!txtName.length) {
-                    window.location.reload();
-                    return;
+                    if (rtcInfo.reload_page == 1) {
+                        window.location.reload();
+                        return;
+                    }
                 }
 
                 $(response.message).insertAfter($(rtcInfo.blockId).find('.well'));
@@ -194,7 +196,8 @@ window.RecordAudio = (function () {
                 recordUrl: _p.web_ajax + 'record_audio_wami.ajax.php?' + $.param({
                     waminame: fileName + '.wav',
                     wamidir: wamiInfo.directory,
-                    wamiuserid: wamiInfo.userId
+                    wamiuserid: wamiInfo.userId,
+                    type: wamiInfo.type
                 }),
                 buttonUrl: _p.web_lib + 'wami-recorder/buttons.png',
                 buttonNoUrl: _p.web_img + 'blank.gif'
diff --git a/main/inc/lib/javascript/svgedit/extensions/imagelib/groups.php b/main/inc/lib/javascript/svgedit/extensions/imagelib/groups.php
index efb21a90d5..96313d7d63 100644
--- a/main/inc/lib/javascript/svgedit/extensions/imagelib/groups.php
+++ b/main/inc/lib/javascript/svgedit/extensions/imagelib/groups.php
@@ -33,15 +33,17 @@ $docs_and_folders = DocumentManager::getAllDocumentData(
 
 //get all group filenames
 $array_to_search = !empty($docs_and_folders) ? $docs_and_folders : [];
+$all_files = [];
 
 if (count($array_to_search) > 0) {
-	while (list($key) = each($array_to_search)) {
+    foreach ($array_to_search as $key => $value) {
 		$all_files[] = basename($array_to_search[$key]['path']);
 	}
 }
 
 //get all svg and png group files
 $accepted_extensions = array('.svg', '.png');
+$png_svg_files = [];
 
 if (is_array($all_files) && count($all_files) > 0) {
     foreach ($all_files as & $file) {
diff --git a/main/inc/lib/javascript/svgedit/extensions/imagelib/index.php b/main/inc/lib/javascript/svgedit/extensions/imagelib/index.php
index 41cb1facaf..7b4b33c80a 100644
--- a/main/inc/lib/javascript/svgedit/extensions/imagelib/index.php
+++ b/main/inc/lib/javascript/svgedit/extensions/imagelib/index.php
@@ -26,15 +26,17 @@ $docs_and_folders = DocumentManager::getAllDocumentData(
 
 //get all filenames
 $array_to_search = !empty($docs_and_folders) ? $docs_and_folders : [];
+$all_files = [];
 
 if (count($array_to_search) > 0) {
-	while (list($key) = each($array_to_search)) {
-		$all_files[] = basename($array_to_search[$key]['path']);
-	}
+    foreach ($array_to_search as $key => $value) {
+        $all_files[] = basename($array_to_search[$key]['path']);
+    }
 }
 
 //get all svg and png files
 $accepted_extensions = array('.svg', '.png');
+$png_svg_files = [];
 
 if (is_array($all_files) && count($all_files) > 0) {
 	foreach ($all_files as & $file) {
diff --git a/main/inc/lib/javascript/svgedit/svg-editor.php b/main/inc/lib/javascript/svgedit/svg-editor.php
index 8ddd906b7b..25eb4a6d83 100644
--- a/main/inc/lib/javascript/svgedit/svg-editor.php
+++ b/main/inc/lib/javascript/svgedit/svg-editor.php
@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 use ChamiloSession as Session;
 
@@ -12,10 +13,6 @@ require_once '../../../../inc/global.inc.php';//hack for Chamilo
 
 api_protect_course_script();
 api_block_anonymous_users();
-$drawDir = Session::read('draw_dir');
-if (empty($drawDir)) {
-    die();
-}
 $svgEditPath = api_get_path(WEB_LIBRARY_PATH).'javascript/svgedit/';
 ?>
 <!DOCTYPE html>
diff --git a/main/inc/lib/javascript/webcam_recorder.js b/main/inc/lib/javascript/webcam_recorder.js
new file mode 100644
index 0000000000..7abd31af4f
--- /dev/null
+++ b/main/inc/lib/javascript/webcam_recorder.js
@@ -0,0 +1,128 @@
+(function () {
+    var config = {
+        selectors: {
+            btnFreeze: '#btnCapture',
+            btnUnFreeze: '#btnClean',
+            btnSave: '#btnSave',
+            btnAuto: '#btnAuto',
+            btnStop: '#btnStop',
+            camera: '#chamilo-camera',
+            results: '#upload_results'
+        },
+        urlReceiver: '',
+        video: {
+            fps: 1000,
+            maxClip: 25
+        },
+        callbacks: {
+            save: null,
+            auto: null
+        }
+    };
+
+    function snap() {
+        var deferred = $.Deferred();
+
+        Webcam.snap(function (dataUri) {
+            Webcam.upload(dataUri, config.urlReceiver, function (code, response) {
+                $(config.selectors.results).html(
+                    '<h3>' + response + '</h3>'
+                    + '<div>'
+                    + '<img src="' + dataUri + '" class="webcamclip_bg">'
+                    + '</div>'
+                );
+
+                deferred.resolve();
+            });
+        });
+
+        return deferred.promise();
+    };
+
+    var videoInterval = 0,
+        videoDeferred = $.Deferred();
+
+    function startVideo() {
+        var counter = 0;
+
+        videoDeferred = $.Deferred();
+        videoInterval = window.setInterval(function () {
+            counter++;
+
+            if (config.video.maxClip >= counter) {
+                snap();
+            } else {
+                stopVideo();
+            }
+        }, config.video.fps);
+
+        return videoDeferred.promise();
+    }
+
+    function stopVideo() {
+        if (!videoInterval) {
+            return;
+        }
+
+        window.clearTimeout(videoInterval);
+        videoDeferred.resolve();
+    }
+
+    window.RecordWebcam = {
+        init: function (params) {
+            config = $.extend(true, config, params);
+
+            $(document).ready(function () {
+                Webcam.set({
+                    width: 320,
+                    height: 240,
+                    image_format: 'jpeg',
+                    jpeg_quality: 90
+                });
+                Webcam.attach(config.selectors.camera);
+
+                $('video').addClass('skip');
+
+                $(config.selectors.btnFreeze).on('click', function (e) {
+                    e.preventDefault();
+
+                    Webcam.freeze();
+                });
+
+                $(config.selectors.btnUnFreeze).on('click', function (e) {
+                    e.preventDefault();
+
+                    Webcam.unfreeze();
+                });
+
+                $(config.selectors.btnSave).on('click', function (e) {
+                    e.preventDefault();
+
+                    snap()
+                        .always(function () {
+                            if (config.callbacks.save) {
+                                config.callbacks.save.apply(null, []);
+                            }
+                        });
+                });
+
+                $(config.selectors.btnAuto).on('click', function (e) {
+                    e.preventDefault();
+
+                    startVideo()
+                        .always(function () {
+                            if (config.callbacks.auto) {
+                                config.callbacks.auto.apply(null, []);
+                            }
+                        });
+                });
+
+                $(config.selectors.btnStop).on('click', function (e) {
+                    e.preventDefault();
+
+                    stopVideo();
+                });
+            })
+        }
+    };
+})();
\ No newline at end of file
diff --git a/main/inc/lib/legal.lib.php b/main/inc/lib/legal.lib.php
index eaf42cb441..35ca1411b2 100755
--- a/main/inc/lib/legal.lib.php
+++ b/main/inc/lib/legal.lib.php
@@ -18,21 +18,46 @@ class LegalManager
     /**
      * Add a new Term and Condition.
      *
-     * @param int    $language language id
-     * @param string $content  content
-     * @param int    $type     term and condition type (0 for HTML text or 1 for link to another page)
-     * @param string $changes  explain changes
+     * @param int    $language               language id
+     * @param string $content                content
+     * @param int    $type                   term and condition type (0 for HTML text or 1 for link to another page)
+     * @param string $changes                explain changes
+     * @param array  $extraFieldValuesToSave
      *
-     * @return bool success
+     * @return int
      */
-    public static function add($language, $content, $type, $changes)
+    public static function add($language, $content, $type, $changes, $extraFieldValuesToSave = [])
     {
         $legalTable = Database::get_main_table(TABLE_MAIN_LEGAL);
         $last = self::get_last_condition($language);
         $type = (int) $type;
         $time = time();
 
-        if ($last['content'] != $content) {
+        $changeList = [];
+
+        if (isset($last['id'])) {
+            $id = $last['id'];
+
+            // Check if extra fields changed
+            $extraFieldValue = new ExtraFieldValue('terms_and_condition');
+            $values = $extraFieldValue->getAllValuesByItem($id);
+            $oldValues = array_column($values, 'value', 'variable');
+            foreach ($extraFieldValuesToSave as $key => $value) {
+                if (is_numeric(strpos($key, 'extra_'))) {
+                    $replace = str_replace('extra_', '', $key);
+                    if (isset($oldValues[$replace])) {
+                        if ($value != $oldValues[$replace]) {
+                            $changeList[] = $replace;
+                        }
+                    } else {
+                        // It means there's a new extra field that was not included before.
+                        $changeList[] = $replace;
+                    }
+                }
+            }
+        }
+
+        if ($last['content'] != $content || !empty($changeList)) {
             $version = self::getLastVersion($language);
             $version++;
             $params = [
@@ -43,9 +68,12 @@ class LegalManager
                 'version' => $version,
                 'date' => $time,
             ];
-            Database::insert($legalTable, $params);
 
-            return true;
+            $id = Database::insert($legalTable, $params);
+
+            self::updateExtraFields($id, $extraFieldValuesToSave);
+
+            return $id;
         } elseif ($last['type'] != $type && $language == $last['language_id']) {
             // Update
             $id = $last['id'];
@@ -55,11 +83,30 @@ class LegalManager
                 'date' => $time,
             ];
             Database::update($legalTable, $params, ['id = ?' => $id]);
+            self::updateExtraFields($id, $extraFieldValuesToSave);
 
-            return true;
-        } else {
+            return $id;
+        }
+
+        return 0;
+    }
+
+    /**
+     * @param int   $itemId
+     * @param array $values
+     *
+     * @return bool
+     */
+    public static function updateExtraFields($itemId, $values)
+    {
+        if (empty($itemId)) {
             return false;
         }
+        $extraFieldValues = new ExtraFieldValue('terms_and_condition');
+        $values['item_id'] = $itemId;
+        $extraFieldValues->saveFieldValues($values);
+
+        return true;
     }
 
     /**
@@ -92,9 +139,9 @@ class LegalManager
         $row = Database::fetch_array($result);
         if (Database::num_rows($result) > 0) {
             return (int) $row['version'];
-        } else {
-            return 0;
         }
+
+        return 0;
     }
 
     /**
@@ -148,9 +195,9 @@ class LegalManager
         $result = Database::query($sql);
         if (Database::num_rows($result) > 0) {
             return true;
-        } else {
-            return false;
         }
+
+        return false;
     }
 
     /**
@@ -197,9 +244,9 @@ class LegalManager
             $version = explode(':', $version[0]);
 
             return $version[0];
-        } else {
-            return false;
         }
+
+        return false;
     }
 
     /**
@@ -363,10 +410,7 @@ class LegalManager
     public static function deleteLegal($userId)
     {
         $extraFieldValue = new ExtraFieldValue('user');
-        $value = $extraFieldValue->get_values_by_handler_and_field_variable(
-            $userId,
-            'legal_accept'
-        );
+        $value = $extraFieldValue->get_values_by_handler_and_field_variable($userId, 'legal_accept');
         $result = $extraFieldValue->delete($value['id']);
         if ($result) {
             Display::addFlash(Display::return_message(get_lang('Deleted')));
@@ -387,21 +431,21 @@ class LegalManager
     public static function getTreatmentTypeList()
     {
         return  [
-            101 => 'collection',
-            102 => 'recording',
-            103 => 'organization',
-            104 => 'structure',
-            105 => 'conservation',
-            106 => 'adaptation',
-            107 => 'extraction',
-            108 => 'consultation',
-            109 => 'usage',
-            110 => 'communication',
-            111 => 'interconnection',
-            112 => 'limitation',
-            113 => 'deletion',
-            114 => 'destruction',
-            115 => 'profiling',
+            'privacy_terms_collection' => 'collection',
+            'privacy_terms_recording' => 'recording',
+            'privacy_terms_organization' => 'organization',
+            'privacy_terms_structure' => 'structure',
+            'privacy_terms_conservation' => 'conservation',
+            'privacy_terms_adaptation' => 'adaptation',
+            'privacy_terms_extraction' => 'extraction',
+            'privacy_terms_consultation' => 'consultation',
+            'privacy_terms_usage' => 'usage',
+            'privacy_terms_communication' => 'communication',
+            'privacy_terms_interconnection' => 'interconnection',
+            'privacy_terms_limitation' => 'limitation',
+            'privacy_terms_deletion' => 'deletion',
+            'privacy_terms_destruction' => 'destruction',
+            'privacy_terms_profiling' => 'profiling',
         ];
     }
 }
diff --git a/main/inc/lib/social.lib.php b/main/inc/lib/social.lib.php
index 9c37398794..2ffe594b28 100755
--- a/main/inc/lib/social.lib.php
+++ b/main/inc/lib/social.lib.php
@@ -121,8 +121,8 @@ class SocialManager extends UserManager
                 FROM '.$table.'
                 WHERE
                     relation_type NOT IN ('.USER_RELATION_TYPE_DELETED.', '.USER_RELATION_TYPE_RRHH.') AND
-                    friend_user_id<>'.($userId).' AND
-                    user_id='.($userId);
+                    friend_user_id<>'.$userId.' AND
+                    user_id='.$userId;
         $res = Database::query($sql);
         if (Database::num_rows($res)) {
             $row = Database::fetch_array($res, 'ASSOC');
@@ -239,8 +239,8 @@ class SocialManager extends UserManager
         $message_content
     ) {
         $tbl_message = Database::get_main_table(TABLE_MESSAGE);
-        $user_id = intval($user_id);
-        $friend_id = intval($friend_id);
+        $user_id = (int) $user_id;
+        $friend_id = (int) $friend_id;
 
         //Just in case we replace the and \n and \n\r while saving in the DB
         $message_content = str_replace(["\n", "\n\r"], '<br />', $message_content);
@@ -313,9 +313,10 @@ class SocialManager extends UserManager
     public static function get_message_number_invitation_by_user_id($user_receiver_id)
     {
         $table = Database::get_main_table(TABLE_MESSAGE);
+        $user_receiver_id = (int) $user_receiver_id;
         $sql = 'SELECT COUNT(*) as count_message_in_box FROM '.$table.'
                 WHERE
-                    user_receiver_id='.intval($user_receiver_id).' AND
+                    user_receiver_id='.$user_receiver_id.' AND
                     msg_status='.MESSAGE_STATUS_INVITATION_PENDING;
         $res = Database::query($sql);
         $row = Database::fetch_array($res, 'ASSOC');
@@ -372,6 +373,8 @@ class SocialManager extends UserManager
      */
     public static function getCountWallPostedMessages($userId)
     {
+        $userId = (int) $userId;
+
         if (empty($userId)) {
             return 0;
         }
@@ -380,7 +383,7 @@ class SocialManager extends UserManager
         $sql = 'SELECT COUNT(*) 
                 FROM '.$table.'
                 WHERE
-                    user_sender_id='.intval($userId).' AND
+                    user_sender_id='.$userId.' AND
                     (msg_status = '.MESSAGE_STATUS_WALL.' OR 
                     msg_status = '.MESSAGE_STATUS_WALL_POST.') AND 
                     parent_id = 0';
@@ -401,6 +404,8 @@ class SocialManager extends UserManager
      */
     public static function get_list_invitation_of_friends_by_user_id($userId)
     {
+        $userId = (int) $userId;
+
         if (empty($userId)) {
             return [];
         }
@@ -409,7 +414,7 @@ class SocialManager extends UserManager
         $sql = 'SELECT user_sender_id, send_date, title, content
                 FROM '.$table.'
                 WHERE
-                    user_receiver_id = '.intval($userId).' AND
+                    user_receiver_id = '.$userId.' AND
                     msg_status = '.MESSAGE_STATUS_INVITATION_PENDING;
         $res = Database::query($sql);
         $list = [];
@@ -431,6 +436,8 @@ class SocialManager extends UserManager
      */
     public static function get_list_invitation_sent_by_user_id($userId)
     {
+        $userId = (int) $userId;
+
         if (empty($userId)) {
             return [];
         }
@@ -439,7 +446,7 @@ class SocialManager extends UserManager
         $sql = 'SELECT user_receiver_id, send_date,title,content
                 FROM '.$table.'
                 WHERE
-                    user_sender_id = '.intval($userId).' AND
+                    user_sender_id = '.$userId.' AND
                     msg_status = '.MESSAGE_STATUS_INVITATION_PENDING;
         $res = Database::query($sql);
         $list = [];
@@ -552,7 +559,7 @@ class SocialManager extends UserManager
         $table = Database::get_main_table(TABLE_MAIN_USER_REL_USER);
         $user_id = api_get_user_id();
         $sql = 'UPDATE '.$table.' SET relation_type='.((int) $type_qualify).'
-                WHERE user_id = '.((int) $user_id).' AND friend_user_id='.(int) $id_friend_qualify;
+                WHERE user_id = '.$user_id.' AND friend_user_id='.(int) $id_friend_qualify;
         Database::query($sql);
     }
 
@@ -730,7 +737,7 @@ class SocialManager extends UserManager
         ) {
             $result .= '<span class="title">'.$course_title.'<span>';
         } else {
-            $result .= $course_title." ".get_lang('CourseClosed');
+            $result .= $course_title.' '.get_lang('CourseClosed');
         }
 
         $result .= '</li>';
@@ -1435,7 +1442,7 @@ class SocialManager extends UserManager
      */
     public static function social_wrapper_div($content, $span_count)
     {
-        $span_count = intval($span_count);
+        $span_count = (int) $span_count;
         $html = '<div class="span'.$span_count.'">';
         $html .= '<div class="well_border">';
         $html .= $content;
@@ -1869,9 +1876,9 @@ class SocialManager extends UserManager
         curl_close($curl);
         if (!empty($response)) {
             return true;
-        } else {
-            return false;
         }
+
+        return false;
     }
 
     /**
@@ -1883,7 +1890,7 @@ class SocialManager extends UserManager
      */
     public static function deleteMessage($id)
     {
-        $id = intval($id);
+        $id = (int) $id;
         $tblMessage = Database::get_main_table(TABLE_MESSAGE);
         $statusMessage = MESSAGE_STATUS_WALL_DELETE;
         $sql = "UPDATE $tblMessage SET msg_status = '$statusMessage' WHERE id = '{$id}' ";
@@ -1929,10 +1936,7 @@ class SocialManager extends UserManager
         if ($currentUserId === $userId) {
             $profileEditionLink = Display::getProfileEditionLink($userId);
         } else {
-            $userRelationType = self::get_relation_between_contacts(
-                $currentUserId,
-                $userId
-            );
+            $userRelationType = self::get_relation_between_contacts($currentUserId, $userId);
         }
 
         $vCardUserLink = Display::getVCardUserLink($userId);
diff --git a/main/inc/lib/usermanager.lib.php b/main/inc/lib/usermanager.lib.php
index 3a51e0eaaa..ac924e12a4 100755
--- a/main/inc/lib/usermanager.lib.php
+++ b/main/inc/lib/usermanager.lib.php
@@ -6300,6 +6300,19 @@ SQL;
         }
     }
 
+    /**
+     * @return int
+     */
+    public static function getCountActiveUsers()
+    {
+        $table = Database::get_main_table(TABLE_MAIN_USER);
+        $sql = "SELECT count(id) count FROM $table WHERE active = 1 AND status <> ".ANONYMOUS;
+        $result = Database::query($sql);
+        $row = Database::fetch_array($result);
+
+        return (int) $row['count'];
+    }
+
     /**
      * @return EncoderFactory
      */
diff --git a/main/lp/learnpath.class.php b/main/lp/learnpath.class.php
index ebe073c488..d4abbee908 100755
--- a/main/lp/learnpath.class.php
+++ b/main/lp/learnpath.class.php
@@ -3017,8 +3017,8 @@ class learnpath
     public static function get_objectives_count_from_db($lp_iv_id, $course_id)
     {
         $table = Database::get_course_table(TABLE_LP_IV_OBJECTIVE);
-        $course_id = intval($course_id);
-        $lp_iv_id = intval($lp_iv_id);
+        $course_id = (int) $course_id;
+        $lp_iv_id = (int) $lp_iv_id;
         $sql = "SELECT count(*) FROM $table
                 WHERE c_id = $course_id AND lp_iv_id = $lp_iv_id";
         //@todo seems that this always returns 0
@@ -3170,7 +3170,7 @@ class learnpath
     public static function get_type_static($lp_id = 0)
     {
         $tbl_lp = Database::get_course_table(TABLE_LP_MAIN);
-        $lp_id = intval($lp_id);
+        $lp_id = (int) $lp_id;
         $sql = "SELECT lp_type FROM $tbl_lp
                 WHERE iid = $lp_id";
         $res = Database::query($sql);
@@ -4912,8 +4912,9 @@ class learnpath
         // TODO: Do a better check on the index pointing to the right item (it is supposed to be working
         // on $ordered_items[] but not sure it's always safe to use with $items[]).
         if (empty($item_id)) {
-            $item_id = intval($_REQUEST['id']);
+            $item_id = (int) $_REQUEST['id'];
         }
+
         if (empty($item_id)) {
             $item_id = $this->get_current_item_id();
         }
@@ -5027,7 +5028,7 @@ class learnpath
                 error_log('New current item given is '.$item_id.'...', 0);
             }
             if (is_numeric($item_id)) {
-                $item_id = intval($item_id);
+                $item_id = (int) $item_id;
                 // TODO: Check in database here.
                 $this->last = $this->current;
                 $this->current = $item_id;
@@ -5217,7 +5218,7 @@ class learnpath
 
         $items_table = Database::get_course_table(TABLE_LP_ITEM);
         // TODO: Make query secure agains XSS : use member attr instead of post var.
-        $lp_id = intval($_POST['lp_id']);
+        $lp_id = (int) $_POST['lp_id'];
         $sql = "SELECT * FROM $items_table WHERE c_id = $course_id AND lp_id = $lp_id";
         $result = Database::query($sql);
         $di = new ChamiloIndexer();
@@ -5449,7 +5450,7 @@ class learnpath
         if ($this->debug > 0) {
             error_log('In learnpath::set_use_max_score()', 0);
         }
-        $use_max_score = intval($use_max_score);
+        $use_max_score = (int) $use_max_score;
         $this->use_max_score = $use_max_score;
         $table = Database::get_course_table(TABLE_LP_MAIN);
         $lp_id = $this->get_id();
diff --git a/main/social/personal_data.php b/main/social/personal_data.php
index fcf5fb91fb..34f3098233 100644
--- a/main/social/personal_data.php
+++ b/main/social/personal_data.php
@@ -30,14 +30,14 @@ $formToString = '';
 
 if (api_get_setting('allow_terms_conditions') === 'true') {
     $form = new FormValidator('delete_term', 'post', api_get_self().'?action=delete_legal&user_id='.$userId);
-    $form->addHtml(Display::return_message(get_lang('WhyYouWantToDeleteYourLegalAgreement')));
-    $form->addTextarea('explanation', get_lang('ExplanationDeleteLegal'), [], true);
+    $form->addHtml(Display::return_message(get_lang('WhyYouWantToDeleteYourLegalAgreement'), 'normal', false));
+    $form->addTextarea('explanation', [get_lang('DeleteLegal'), get_lang('ExplanationDeleteLegal')], [], true);
     $form->addHidden('action', 'delete_legal');
     $form->addButtonSave(get_lang('DeleteLegal'));
     $formToString = $form->returnForm();
 
     $formDelete = new FormValidator('delete_account', 'post', api_get_self().'?action=delete_account&user_id='.$userId);
-    $formDelete->addTextarea('explanation', get_lang('ExplanationDeleteAccount'), [], true);
+    $formDelete->addTextarea('explanation', [get_lang('DeleteAccount'), get_lang('ExplanationDeleteAccount')], [], true);
     $formDelete->addHidden('action', 'delete_account');
     $formDelete->addButtonDelete(get_lang('DeleteAccount'));
     $formToString .= $formDelete->returnForm();
@@ -132,9 +132,9 @@ switch ($action) {
 
             $url = api_get_path(WEB_CODE_PATH).'admin/';
             $link = Display::url($url, $url);
-            $subject = get_lang('RequestForDeleteAccount');
+            $subject = get_lang('RequestForAccountDeletion');
             $content = sprintf(
-                get_lang('TheUserXAskDeleteAccountWithJustifactionXGoHereX'),
+                get_lang('TheUserXAskedForAccountDeletionWithJustificationXGoHereX'),
                 $userInfo['complete_name'],
                 $explanation,
                 $link
@@ -183,9 +183,9 @@ switch ($action) {
 
             $url = api_get_path(WEB_CODE_PATH).'admin/user_list_consent.php';
             $link = Display::url($url, $url);
-            $subject = get_lang('RequestForLegalConsentRemoval');
+            $subject = get_lang('RequestForLegalConsentWithdrawal');
             $content = sprintf(
-                get_lang('TheUserXAskRemovalWithJustifactionXGoHereX'),
+                get_lang('TheUserXAskedLegalConsentWithdrawalWithJustificationXGoHereX'),
                 $userInfo['complete_name'],
                 $explanation,
                 $link
@@ -244,28 +244,79 @@ if ($allowSocial) {
 // MAIN CONTENT
 $personalDataContent = '<ul>';
 $properties = json_decode($propertiesToJson);
+$webCoursePath = api_get_path(WEB_COURSE_PATH);
 
 foreach ($properties as $key => $value) {
     if (is_array($value) || is_object($value)) {
         switch ($key) {
+            case 'classes':
+                foreach ($value as $category => $subValue) {
+                    $categoryName = 'Social group';
+                    if ($category == 0) {
+                        $categoryName = 'Class';
+                    }
+                    $personalDataContent .= '<li class="advanced_options" id="personal-data-list-'.$category.'">';
+                    $personalDataContent .= '<u>'.$categoryName.'</u> &gt;</li>';
+                    $personalDataContent .= '<ul id="personal-data-list-'.$category.'_options" style="display:none;">';
+                    if (empty($subValue)) {
+                        $personalDataContent .= '<li>'.get_lang('NoData').'</li>';
+                    } else {
+                        foreach ($subValue as $subSubValue) {
+                            $personalDataContent .= '<li>'.$subSubValue.'</li>';
+                        }
+                    }
+                    $personalDataContent .= '</ul>';
+                }
+                break;
             case 'extraFields':
                 $personalDataContent .= '<li>'.$key.': </li><ul>';
-                foreach ($value as $subValue) {
-                    $personalDataContent .= '<li>'.$subValue->variable.': '.$subValue->value.'</li>';
+                if (empty($value)) {
+                    $personalDataContent .= '<li>'.get_lang('NoData').'</li>';
+                } else {
+                    foreach ($value as $subValue) {
+                        $personalDataContent .= '<li>'.$subValue->variable.': '.$subValue->value.'</li>';
+                    }
                 }
                 $personalDataContent .= '</ul>';
+                break;
+            case 'dropBoxSentFiles':
+                foreach ($value as $category => $subValue) {
+                    $personalDataContent .= '<li class="advanced_options" id="personal-data-list-'.$category.'">';
+                    $personalDataContent .= '<u>'.get_lang($category).'</u> &gt;</li>';
+                    $personalDataContent .= '<ul id="personal-data-list-'.$category.'_options" style="display:none;">';
+                    if (empty($subValue)) {
+                        $personalDataContent .= '<li>'.get_lang('NoData').'</li>';
+                    } else {
+                        foreach ($subValue as $subSubValue) {
+                            if ($category === 'DocumentsAdded') {
+                                $documentLink = Display::url(
+                                    $subSubValue->code_path,
+                                    $webCoursePath.$subSubValue->directory.'/document'.$subSubValue->path
+                                );
+                                $personalDataContent .= '<li>'.$documentLink.'</li>';
+                            } else {
+                                $personalDataContent .= '<li>'.$subSubValue.'</li>';
+                            }
+                        }
+                    }
+                    $personalDataContent .= '</ul>';
+                }
+
                 break;
             case 'portals':
             case 'roles':
             case 'achievedSkills':
             case 'sessionAsGeneralCoach':
-            case 'classes':
             case 'courses':
             case 'groupNames':
             case 'groups':
                 $personalDataContent .= '<li>'.$key.': </li><ul>';
-                foreach ($value as $subValue) {
-                    $personalDataContent .= '<li>'.$subValue.'</li>';
+                if (empty($subValue)) {
+                    $personalDataContent .= '<li>'.get_lang('NoData').'</li>';
+                } else {
+                    foreach ($value as $subValue) {
+                        $personalDataContent .= '<li>'.$subValue.'</li>';
+                    }
                 }
                 $personalDataContent .= '</ul>';
                 break;
@@ -273,8 +324,12 @@ foreach ($properties as $key => $value) {
                 $personalDataContent .= '<li>'.$key.': </li><ul>';
                 foreach ($value as $session => $courseList) {
                     $personalDataContent .= '<li>'.$session.'<ul>';
-                    foreach ($courseList as $course) {
-                        $personalDataContent .= '<li>'.$course.'</li>';
+                    if (empty($courseList)) {
+                        $personalDataContent .= '<li>'.get_lang('NoData').'</li>';
+                    } else {
+                        foreach ($courseList as $course) {
+                            $personalDataContent .= '<li>'.$course.'</li>';
+                        }
                     }
                     $personalDataContent .= '</ul>';
                 }
@@ -304,37 +359,37 @@ foreach ($properties as $key => $value) {
 $personalDataContent .= '</ul>';
 
 // Check terms acceptation
-$permitionBlock = '';
+$permissionBlock = '';
 if (api_get_setting('allow_terms_conditions') === 'true') {
     $extraFieldValue = new ExtraFieldValue('user');
     $value = $extraFieldValue->get_values_by_handler_and_field_variable(
         $userId,
         'legal_accept'
     );
-    $permitionBlock .= Display::return_icon('accept_na.png', get_lang('NotAccepted'));
+    $permissionBlock .= Display::return_icon('accept_na.png', get_lang('NotAccepted'));
     if (isset($value['value']) && !empty($value['value'])) {
         list($legalId, $legalLanguageId, $legalTime) = explode(':', $value['value']);
-        $permitionBlock = get_lang('CurrentStatus').': '.
-            Display::return_icon('accept.png', get_lang('LegalAgreementAccepted')).get_lang('LegalAgreementAccepted').
+        $permissionBlock = '<h4>'.get_lang('CurrentStatus').'</h4>'.
+            get_lang('LegalAgreementAccepted').' '.Display::return_icon('accept.png', get_lang('LegalAgreementAccepted'), [], ICON_SIZE_TINY).
             '<br />';
-        $permitionBlock .= get_lang('Date').': '.api_get_local_time($legalTime).'<br />';
-        $permitionBlock .= $formToString;
+        $permissionBlock .= get_lang('Date').': '.api_get_local_time($legalTime).'<br /><br />';
+        $permissionBlock .= $formToString;
 
-    /*$permitionBlock .= Display::url(
+    /*$permissionBlock .= Display::url(
         get_lang('DeleteLegal'),
         api_get_self().'?action=delete_legal&user_id='.$userId,
         ['class' => 'btn btn-danger btn-xs']
     );*/
     } else {
         // @TODO add action handling for button
-        $permitionBlock .= Display::url(
+        $permissionBlock .= Display::url(
             get_lang('SendLegal'),
             api_get_self().'?action=send_legal&user_id='.$userId,
             ['class' => 'btn btn-primary btn-xs']
         );
     }
 } else {
-    $permitionBlock .= get_lang('NoTermsAndConditionsAvailable');
+    $permissionBlock .= get_lang('NoTermsAndConditionsAvailable');
 }
 
 //Build the final array to pass to template
@@ -348,7 +403,7 @@ $legalTermsRepo = $em->getRepository('ChamiloCoreBundle:Legal');
 // Get data about the treatment of data
 $treatmentTypes = LegalManager::getTreatmentTypeList();
 
-foreach ($treatmentTypes as $id => $item) {
+/*foreach ($treatmentTypes as $id => $item) {
     $personalData['treatment'][$item]['title'] = get_lang('PersonalData'.ucfirst($item).'Title');
     $legalTerm = $legalTermsRepo->findOneByTypeAndLanguage($id, api_get_language_id($user_language));
     $legalTermContent = '';
@@ -356,7 +411,8 @@ foreach ($treatmentTypes as $id => $item) {
         $legalTermContent = $legalTerm[0]['content'];
     }
     $personalData['treatment'][$item]['content'] = $legalTermContent;
-}
+}*/
+
 $officerName = api_get_configuration_value('data_protection_officer_name');
 $officerRole = api_get_configuration_value('data_protection_officer_role');
 $officerEmail = api_get_configuration_value('data_protection_officer_email');
@@ -378,7 +434,7 @@ $tpl->assign('actions', Display::toolbarAction('toolbar', [$actions]));
 $termLink = '';
 if (api_get_setting('allow_terms_conditions') === 'true') {
     $url = api_get_path(WEB_CODE_PATH).'social/terms.php';
-    $termLink = Display::url($url, $url);
+    $termLink = Display::url(get_lang('ReadTermsAndConditions'), $url);
 }
 
 // Block Social Avatar
@@ -391,7 +447,7 @@ if (api_get_setting('allow_social_tool') === 'true') {
     $tpl->assign('personal_data_block', $personalDataContent);
 }
 
-$tpl->assign('permission', $permitionBlock);
+$tpl->assign('permission', $permissionBlock);
 $tpl->assign('term_link', $termLink);
 $socialLayout = $tpl->get_template('social/personal_data.tpl');
 $tpl->display($socialLayout);
diff --git a/main/social/terms.php b/main/social/terms.php
index ce24ed4485..a08075b188 100644
--- a/main/social/terms.php
+++ b/main/social/terms.php
@@ -22,6 +22,24 @@ if (!$term) {
     $term = LegalManager::get_last_condition($language);
 }
 
+$termExtraFields = new ExtraFieldValue('terms_and_condition');
+$values = $termExtraFields->getAllValuesByItem($term['id']);
+foreach ($values as $value) {
+    if (!empty($value['value'])) {
+        $term['content'] .= '<h3>'.get_lang($value['display_text']).'</h3><br />'.$value['value'].'<br />';
+    }
+}
+
+$term['date_text'] = get_lang('PublicationDate').': '.
+    api_get_local_time(
+        $term['date'],
+        null,
+        null,
+        false,
+        true,
+        true
+    );
+
 $socialMenuBlock = '';
 $allowSocial = api_get_setting('allow_social_tool') === 'true';