added the translation to the component view, also adding lang tags of ready translated languages

2017-04-05 17:26:17 +01:00 · 2017-04-05 17:26:17 +01:00 · 2caaa1a1e3
commit 2caaa1a1e3
parent 1b3cb2bfdd
69 changed files with 857 additions and 560 deletions
--- a/README.md
+++ b/README.md
@ -109,8 +109,8 @@ Component Builder is mapped as a component in itself on my local development env
 + *Version*: 2.4.2
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-+ *Line count*: **105327**
-+ *File count*: **638**
+ *Line count*: **105624**
+ *File count*: **639**
 + *Folder count*: **115**

 > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder).
--- a/admin/README.txt
+++ b/admin/README.txt
@ -109,8 +109,8 @@ Component Builder is mapped as a component in itself on my local development env
 + *Version*: 2.4.2
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-+ *Line count*: **105327**
-+ *File count*: **638**
+ *Line count*: **105624**
+ *File count*: **639**
 + *Folder count*: **115**

 > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder).
--- a/admin/assets/css/joomla_component.css
+++ b/admin/assets/css/joomla_component.css
@ -9,7 +9,7 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 314 of this MVC
+	@version		@update number 318 of this MVC
 	@build			5th April, 2017
 	@created		6th May, 2015
 	@package		Component Builder
--- a/admin/assets/css/joomla_components.css
+++ b/admin/assets/css/joomla_components.css
@ -9,7 +9,7 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 314 of this MVC
+	@version		@update number 318 of this MVC
 	@build			5th April, 2017
 	@created		6th May, 2015
 	@package		Component Builder
--- a/admin/assets/css/language_translation.css
+++ b/admin/assets/css/language_translation.css
@ -9,7 +9,7 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 30 of this MVC
+	@version		@update number 35 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
--- a/admin/assets/css/language_translations.css
+++ b/admin/assets/css/language_translations.css
@ -9,7 +9,7 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 30 of this MVC
+	@version		@update number 35 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
--- a/admin/controllers/joomla_component.php
+++ b/admin/controllers/joomla_component.php
@ -10,7 +10,7 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 314 of this MVC
+	@version		@update number 318 of this MVC
 	@build			5th April, 2017
 	@created		6th May, 2015
 	@package		Component Builder
--- a/admin/controllers/joomla_components.php
+++ b/admin/controllers/joomla_components.php
@ -10,7 +10,7 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 314 of this MVC
+	@version		@update number 318 of this MVC
 	@build			5th April, 2017
 	@created		6th May, 2015
 	@package		Component Builder
--- a/admin/controllers/language_translation.php
+++ b/admin/controllers/language_translation.php
@ -10,7 +10,7 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 30 of this MVC
+	@version		@update number 35 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
--- a/admin/controllers/language_translations.php
+++ b/admin/controllers/language_translations.php
@ -10,7 +10,7 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 30 of this MVC
+	@version		@update number 35 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
--- a/admin/helpers/compiler/a_Get.php
+++ b/admin/helpers/compiler/a_Get.php
@ -3055,7 +3055,7 @@ class Get
 				// to keep or remove
 				$remove = false;
 				// build the tranlations
-				if (isset($this->multiLangString[$string]))
+				if (ComponentbuilderHelper::checkString($string) && isset($this->multiLangString[$string]))
 				{
 					// make sure we have converted the string to array
 					if (isset($this->multiLangString[$string]['translation']) && ComponentbuilderHelper::checkJson($this->multiLangString[$string]['translation']))
@ -3093,7 +3093,7 @@ class Get
 					}
 				}
 				// do the database managment
-				if(($key = array_search($string, $strings)) !== false)
+				if(ComponentbuilderHelper::checkString($string) && ($key = array_search($string, $strings)) !== false)
 				{
 					if (isset($this->multiLangString[$string]))
 					{
--- a/admin/language/en-GB/en-GB.com_componentbuilder.ini
+++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini
@ -2938,6 +2938,7 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_THUMBS_UP="Thumbs Up"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TITLE_DESCRIPTION="Enter contributor's title in relation to this component"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TITLE_HINT="Contributor's Role"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TITLE_LABEL="Job Title"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TRANSLATION="Translation"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TREE="Tree"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TREE_TWO="Tree 2"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_UNARCHIVE="Unarchive"
@ -3260,6 +3261,7 @@ COM_COMPONENTBUILDER_NEW="New"
 COM_COMPONENTBUILDER_NEW_ISSUE="New Issue"
 COM_COMPONENTBUILDER_NEW_NOTICE="New Notice"
 COM_COMPONENTBUILDER_NO="No"
+COM_COMPONENTBUILDER_NOTRANSLATION="no-translation"
 COM_COMPONENTBUILDER_NO_ACCESS_GRANTED="No Access Granted!"
 COM_COMPONENTBUILDER_NO_COMPONENTS_WERE_SELECTED_PLEASE_MAKE_A_SELECTION_AND_TRY_AGAIN="No components were selected, please make a selection and try again!"
 COM_COMPONENTBUILDER_OPENED_BY="opened by"
--- a/admin/layouts/admin_view/fields_fullwidth.php
+++ b/admin/layouts/admin_view/fields_fullwidth.php
@ -28,7 +28,7 @@
 defined('_JEXEC') or die('Restricted access');

 // set the defaults
-$items	= $displayData->vxwfields;
+$items	= $displayData->vxxfields;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit	= "index.php?option=com_componentbuilder&view=fields&task=field.edit";
--- a/admin/layouts/admin_view/linked_components_fullwidth.php
+++ b/admin/layouts/admin_view/linked_components_fullwidth.php
@ -28,7 +28,7 @@
 defined('_JEXEC') or die('Restricted access');

 // set the defaults
-$items	= $displayData->vxxlinked_components;
+$items	= $displayData->vxylinked_components;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit	= "index.php?option=com_componentbuilder&view=joomla_components&task=joomla_component.edit";
--- a/admin/layouts/custom_admin_view/linked_components_fullwidth.php
+++ b/admin/layouts/custom_admin_view/linked_components_fullwidth.php
@ -28,7 +28,7 @@
 defined('_JEXEC') or die('Restricted access');

 // set the defaults
-$items	= $displayData->vyhlinked_components;
+$items	= $displayData->vyilinked_components;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit	= "index.php?option=com_componentbuilder&view=joomla_components&task=joomla_component.edit";
--- a/admin/layouts/field/linked_admin_views_fullwidth.php
+++ b/admin/layouts/field/linked_admin_views_fullwidth.php
@ -28,7 +28,7 @@
 defined('_JEXEC') or die('Restricted access');

 // set the defaults
-$items	= $displayData->vzzlinked_admin_views;
+$items	= $displayData->waalinked_admin_views;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit	= "index.php?option=com_componentbuilder&view=admin_views&task=admin_view.edit";
--- a/admin/layouts/fieldtype/fields_fullwidth.php
+++ b/admin/layouts/fieldtype/fields_fullwidth.php
@ -28,7 +28,7 @@
 defined('_JEXEC') or die('Restricted access');

 // set the defaults
-$items	= $displayData->waafields;
+$items	= $displayData->wabfields;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit	= "index.php?option=com_componentbuilder&view=fields&task=field.edit";
--- a/admin/layouts/joomla_component/translation_fullwidth.php
+++ b/admin/layouts/joomla_component/translation_fullwidth.php
@ -0,0 +1,108 @@
+<?php
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@version		2.4.2
+	@build			5th April, 2017
+	@created		30th April, 2015
+	@package		Component Builder
+	@subpackage		translation_fullwidth.php
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
+	@copyright		Copyright (C) 2015. All Rights Reserved
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	
+	Builds Complex Joomla Components 
+                                                             
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+// No direct access to this file
+
+defined('_JEXEC') or die('Restricted access');
+
+// set the defaults
+$items	= $displayData->vwptranslation;
+$user	= JFactory::getUser();
+$id	= $displayData->item->id;
+$edit	= "index.php?option=com_componentbuilder&view=language_translations&task=language_translation.edit";
+
+?>
+<div class="form-vertical">
+<?php if (ComponentbuilderHelper::checkArray($items)): ?>
+<table class="footable table data language_translations" data-show-toggle="true" data-toggle-column="first" data-sorting="true" data-paging="true" data-paging-size="20" data-filtering="true">
+<thead>
+	<tr>
+		<th data-type="html" data-sort-use="text">
+			<?php echo JText::_('COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_ENTRANSLATION_LABEL'); ?>
+		</th>
+		<th width="10" data-breakpoints="xs sm md">
+			<?php echo JText::_('COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_STATUS'); ?>
+		</th>
+		<th width="5" data-type="number" data-breakpoints="xs sm md">
+			<?php echo JText::_('COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_ID'); ?>
+		</th>
+	</tr>
+</thead>
+<tbody>
+<?php foreach ($items as $i => $item): ?>
+	<?php
+		$canCheckin = $user->authorise('core.manage', 'com_checkin') || $item->checked_out == $user->id || $item->checked_out == 0;
+		$userChkOut = JFactory::getUser($item->checked_out);
+		$canDo = ComponentbuilderHelper::getActions('language_translation',$item,'language_translations');
+	?>
+	<tr>
+		<td class="nowrap">
+			<?php if ($canDo->get('language_translation.edit')): ?>
+				<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>&ref=joomla_component&refid=<?php echo $id; ?>"><?php echo $item->entranslation; ?></a>
+					<?php if ($item->checked_out): ?>
+						<?php echo JHtml::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'language_translations.', $canCheckin); ?>
+					<?php endif; ?>
+			<?php else: ?>
+				<div class="name"><?php echo $item->entranslation; ?></div>
+			<?php endif; ?>
+		</td>
+		<?php if ($item->published == 1):?>
+			<td class="center"  data-sort-value="1">
+				<span class="status-metro status-published" title="<?php echo JText::_('PUBLISHED');  ?>">
+					<?php echo JText::_('PUBLISHED'); ?>
+				</span>
+			</td>
+		<?php elseif ($item->published == 0):?>
+			<td class="center"  data-sort-value="2">
+				<span class="status-metro status-inactive" title="<?php echo JText::_('INACTIVE');  ?>">
+					<?php echo JText::_('INACTIVE'); ?>
+				</span>
+			</td>
+		<?php elseif ($item->published == 2):?>
+			<td class="center"  data-sort-value="3">
+				<span class="status-metro status-archived" title="<?php echo JText::_('ARCHIVED');  ?>">
+					<?php echo JText::_('ARCHIVED'); ?>
+				</span>
+			</td>
+		<?php elseif ($item->published == -2):?>
+			<td class="center"  data-sort-value="4">
+				<span class="status-metro status-trashed" title="<?php echo JText::_('ARCHIVED');  ?>">
+					<?php echo JText::_('ARCHIVED'); ?>
+				</span>
+			</td>
+		<?php endif; ?>
+		<td class="nowrap center hidden-phone">
+			<?php echo $item->id; ?>
+		</td>
+	</tr>
+<?php endforeach; ?>
+</tbody>
+</table>
+<?php else: ?>
+	<div class="alert alert-no-items">
+		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php endif; ?>
+</div>
--- a/admin/layouts/site_view/linked_components_fullwidth.php
+++ b/admin/layouts/site_view/linked_components_fullwidth.php
@ -28,7 +28,7 @@
 defined('_JEXEC') or die('Restricted access');

 // set the defaults
-$items	= $displayData->vyslinked_components;
+$items	= $displayData->vytlinked_components;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit	= "index.php?option=com_componentbuilder&view=joomla_components&task=joomla_component.edit";
--- a/admin/models/admin_view.php
+++ b/admin/models/admin_view.php
@ -293,8 +293,8 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->tags->getTagIds($item->id, 'com_componentbuilder.admin_view');
 			}
 		}
-		$this->idvvvy = $item->addfields;
-		$this->addadmin_viewsvvvz = $item->id;
+		$this->idvvvz = $item->addfields;
+		$this->addadmin_viewsvvwa = $item->id;

 		return $item;
 	}
@ -304,7 +304,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 	*
 	* @return mixed  An array of data items on success, false on failure.
 	*/
-	public function getVxwfields()
+	public function getVxxfields()
 	{
 		// Get the user object.
 		$user = JFactory::getUser();
@ -373,26 +373,26 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				foreach ($items as $nr => &$item)
 				{
 					// convert datatype
-					$item->datatype = $this->selectionTranslationVxwfields($item->datatype, 'datatype');
+					$item->datatype = $this->selectionTranslationVxxfields($item->datatype, 'datatype');
 					// convert indexes
-					$item->indexes = $this->selectionTranslationVxwfields($item->indexes, 'indexes');
+					$item->indexes = $this->selectionTranslationVxxfields($item->indexes, 'indexes');
 					// convert null_switch
-					$item->null_switch = $this->selectionTranslationVxwfields($item->null_switch, 'null_switch');
+					$item->null_switch = $this->selectionTranslationVxxfields($item->null_switch, 'null_switch');
 					// convert store
-					$item->store = $this->selectionTranslationVxwfields($item->store, 'store');
+					$item->store = $this->selectionTranslationVxxfields($item->store, 'store');
 				}
 			}


 			// Filter by id Repetable Field
-			$idvvvy = json_decode($this->idvvvy,true);
-			if (ComponentbuilderHelper::checkArray($items) && isset($idvvvy) && ComponentbuilderHelper::checkArray($idvvvy))
+			$idvvvz = json_decode($this->idvvvz,true);
+			if (ComponentbuilderHelper::checkArray($items) && isset($idvvvz) && ComponentbuilderHelper::checkArray($idvvvz))
 			{
 				foreach ($items as $nr => &$item)
 				{
-					if ($item->id && isset($idvvvy['field']) && ComponentbuilderHelper::checkArray($idvvvy['field']))
+					if ($item->id && isset($idvvvz['field']) && ComponentbuilderHelper::checkArray($idvvvz['field']))
 					{
-						if (!in_array($item->id,$idvvvy['field']))
+						if (!in_array($item->id,$idvvvz['field']))
 						{
 							unset($items[$nr]);
 							continue;
@ -419,7 +419,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 	*
 	* @return translatable string
 	*/
-	public function selectionTranslationVxwfields($value,$name)
+	public function selectionTranslationVxxfields($value,$name)
 	{
 		// Array of datatype language strings
 		if ($name === 'datatype')
@ -497,7 +497,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 	*
 	* @return mixed  An array of data items on success, false on failure.
 	*/
-	public function getVxxlinked_components()
+	public function getVxylinked_components()
 	{
 		// Get the user object.
 		$user = JFactory::getUser();
@ -537,15 +537,15 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 		{
 			$items = $db->loadObjectList();

-			// Filter by addadmin_viewsvvvz in this Repetable Field
-			if (ComponentbuilderHelper::checkArray($items) && isset($this->addadmin_viewsvvvz))
+			// Filter by addadmin_viewsvvwa in this Repetable Field
+			if (ComponentbuilderHelper::checkArray($items) && isset($this->addadmin_viewsvvwa))
 			{
 				foreach ($items as $nr => &$item)
 				{
 					if (isset($item->addadmin_views) && ComponentbuilderHelper::checkJson($item->addadmin_views))
 					{
 						$tmpArray = json_decode($item->addadmin_views,true);
-						if (!in_array($this->addadmin_viewsvvvz, $tmpArray['adminview']))
+						if (!in_array($this->addadmin_viewsvvwa, $tmpArray['adminview']))
 						{
 							unset($items[$nr]);
 							continue;
--- a/admin/models/custom_admin_view.php
+++ b/admin/models/custom_admin_view.php
@ -169,7 +169,7 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 				$item->tags->getTagIds($item->id, 'com_componentbuilder.custom_admin_view');
 			}
 		}
-		$this->addcustom_admin_viewsvvwa = $item->id;
+		$this->addcustom_admin_viewsvvwb = $item->id;

 		return $item;
 	}
@ -179,7 +179,7 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 	*
 	* @return mixed  An array of data items on success, false on failure.
 	*/
-	public function getVyhlinked_components()
+	public function getVyilinked_components()
 	{
 		// Get the user object.
 		$user = JFactory::getUser();
@ -219,15 +219,15 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 		{
 			$items = $db->loadObjectList();

-			// Filter by addcustom_admin_viewsvvwa in this Repetable Field
-			if (ComponentbuilderHelper::checkArray($items) && isset($this->addcustom_admin_viewsvvwa))
+			// Filter by addcustom_admin_viewsvvwb in this Repetable Field
+			if (ComponentbuilderHelper::checkArray($items) && isset($this->addcustom_admin_viewsvvwb))
 			{
 				foreach ($items as $nr => &$item)
 				{
 					if (isset($item->addcustom_admin_views) && ComponentbuilderHelper::checkJson($item->addcustom_admin_views))
 					{
 						$tmpArray = json_decode($item->addcustom_admin_views,true);
-						if (!in_array($this->addcustom_admin_viewsvvwa, $tmpArray['customadminview']))
+						if (!in_array($this->addcustom_admin_viewsvvwb, $tmpArray['customadminview']))
 						{
 							unset($items[$nr]);
 							continue;
--- a/admin/models/field.php
+++ b/admin/models/field.php
@ -131,7 +131,7 @@ class ComponentbuilderModelField extends JModelAdmin
 				$item->tags->getTagIds($item->id, 'com_componentbuilder.field');
 			}
 		}
-		$this->addfieldsvvwc = $item->id;
+		$this->addfieldsvvwd = $item->id;

 		return $item;
 	}
@ -141,7 +141,7 @@ class ComponentbuilderModelField extends JModelAdmin
 	*
 	* @return mixed  An array of data items on success, false on failure.
 	*/
-	public function getVzzlinked_admin_views()
+	public function getWaalinked_admin_views()
 	{
 		// Get the user object.
 		$user = JFactory::getUser();
@ -198,15 +198,15 @@ class ComponentbuilderModelField extends JModelAdmin
 				}
 			}

-			// Filter by addfieldsvvwc in this Repetable Field
-			if (ComponentbuilderHelper::checkArray($items) && isset($this->addfieldsvvwc))
+			// Filter by addfieldsvvwd in this Repetable Field
+			if (ComponentbuilderHelper::checkArray($items) && isset($this->addfieldsvvwd))
 			{
 				foreach ($items as $nr => &$item)
 				{
 					if (isset($item->addfields) && ComponentbuilderHelper::checkJson($item->addfields))
 					{
 						$tmpArray = json_decode($item->addfields,true);
-						if (!in_array($this->addfieldsvvwc, $tmpArray['field']))
+						if (!in_array($this->addfieldsvvwd, $tmpArray['field']))
 						{
 							unset($items[$nr]);
 							continue;
--- a/admin/models/fieldtype.php
+++ b/admin/models/fieldtype.php
@ -101,7 +101,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 				$item->tags->getTagIds($item->id, 'com_componentbuilder.fieldtype');
 			}
 		}
-		$this->fieldtypevvwd = $item->id;
+		$this->fieldtypevvwe = $item->id;

 		return $item;
 	}
@ -111,7 +111,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 	*
 	* @return mixed  An array of data items on success, false on failure.
 	*/
-	public function getWaafields()
+	public function getWabfields()
 	{
 		// Get the user object.
 		$user = JFactory::getUser();
@ -131,15 +131,15 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 		$query->select($db->quoteName('g.name','fieldtype_name'));
 		$query->join('LEFT', $db->quoteName('#__componentbuilder_fieldtype', 'g') . ' ON (' . $db->quoteName('a.fieldtype') . ' = ' . $db->quoteName('g.id') . ')');

-		// Filter by fieldtypevvwd global.
-		$fieldtypevvwd = $this->fieldtypevvwd;
-		if (is_numeric($fieldtypevvwd ))
+		// Filter by fieldtypevvwe global.
+		$fieldtypevvwe = $this->fieldtypevvwe;
+		if (is_numeric($fieldtypevvwe ))
 		{
-			$query->where('a.fieldtype = ' . (int) $fieldtypevvwd );
+			$query->where('a.fieldtype = ' . (int) $fieldtypevvwe );
 		}
-		elseif (is_string($fieldtypevvwd))
+		elseif (is_string($fieldtypevvwe))
 		{
-			$query->where('a.fieldtype = ' . $db->quote($fieldtypevvwd));
+			$query->where('a.fieldtype = ' . $db->quote($fieldtypevvwe));
 		}
 		else
 		{
@ -195,13 +195,13 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 				foreach ($items as $nr => &$item)
 				{
 					// convert datatype
-					$item->datatype = $this->selectionTranslationWaafields($item->datatype, 'datatype');
+					$item->datatype = $this->selectionTranslationWabfields($item->datatype, 'datatype');
 					// convert indexes
-					$item->indexes = $this->selectionTranslationWaafields($item->indexes, 'indexes');
+					$item->indexes = $this->selectionTranslationWabfields($item->indexes, 'indexes');
 					// convert null_switch
-					$item->null_switch = $this->selectionTranslationWaafields($item->null_switch, 'null_switch');
+					$item->null_switch = $this->selectionTranslationWabfields($item->null_switch, 'null_switch');
 					// convert store
-					$item->store = $this->selectionTranslationWaafields($item->store, 'store');
+					$item->store = $this->selectionTranslationWabfields($item->store, 'store');
 				}
 			}

@ -215,7 +215,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 	*
 	* @return translatable string
 	*/
-	public function selectionTranslationWaafields($value,$name)
+	public function selectionTranslationWabfields($value,$name)
 	{
 		// Array of datatype language strings
 		if ($name === 'datatype')
--- a/admin/models/forms/admin_view.js
+++ b/admin/models/forms/admin_view.js
--- a/admin/models/forms/custom_admin_view.js
+++ b/admin/models/forms/custom_admin_view.js
@ -23,15 +23,15 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/

 // Some Global Values
-jform_vvvvvxzvxy_required = false;
-jform_vvvvvyavxz_required = false;
-jform_vvvvvybvya_required = false;
-jform_vvvvvycvyb_required = false;
-jform_vvvvvydvyc_required = false;
-jform_vvvvvyevyd_required = false;
-jform_vvvvvyfvye_required = false;
+jform_vvvvvxzvxz_required = false;
+jform_vvvvvyavya_required = false;
+jform_vvvvvybvyb_required = false;
+jform_vvvvvycvyc_required = false;
+jform_vvvvvydvyd_required = false;
+jform_vvvvvyevye_required = false;
 jform_vvvvvyfvyf_required = false;
-jform_vvvvvygvyg_required = false;
+jform_vvvvvyfvyg_required = false;
+jform_vvvvvygvyh_required = false;

 // Initial Script
 jQuery(document).ready(function()
@ -68,26 +68,26 @@ function vvvvvxz(add_php_view_vvvvvxz)
 	if (add_php_view_vvvvvxz == 1)
 	{
 		jQuery('#jform_php_view').closest('.control-group').show();
-		if (jform_vvvvvxzvxy_required)
+		if (jform_vvvvvxzvxz_required)
 		{
 			updateFieldRequired('php_view',0);
 			jQuery('#jform_php_view').prop('required','required');
 			jQuery('#jform_php_view').attr('aria-required',true);
 			jQuery('#jform_php_view').addClass('required');
-			jform_vvvvvxzvxy_required = false;
+			jform_vvvvvxzvxz_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_php_view').closest('.control-group').hide();
-		if (!jform_vvvvvxzvxy_required)
+		if (!jform_vvvvvxzvxz_required)
 		{
 			updateFieldRequired('php_view',1);
 			jQuery('#jform_php_view').removeAttr('required');
 			jQuery('#jform_php_view').removeAttr('aria-required');
 			jQuery('#jform_php_view').removeClass('required');
-			jform_vvvvvxzvxy_required = true;
+			jform_vvvvvxzvxz_required = true;
 		}
 	}
 }
@ -99,26 +99,26 @@ function vvvvvya(add_php_jview_display_vvvvvya)
 	if (add_php_jview_display_vvvvvya == 1)
 	{
 		jQuery('#jform_php_jview_display').closest('.control-group').show();
-		if (jform_vvvvvyavxz_required)
+		if (jform_vvvvvyavya_required)
 		{
 			updateFieldRequired('php_jview_display',0);
 			jQuery('#jform_php_jview_display').prop('required','required');
 			jQuery('#jform_php_jview_display').attr('aria-required',true);
 			jQuery('#jform_php_jview_display').addClass('required');
-			jform_vvvvvyavxz_required = false;
+			jform_vvvvvyavya_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_php_jview_display').closest('.control-group').hide();
-		if (!jform_vvvvvyavxz_required)
+		if (!jform_vvvvvyavya_required)
 		{
 			updateFieldRequired('php_jview_display',1);
 			jQuery('#jform_php_jview_display').removeAttr('required');
 			jQuery('#jform_php_jview_display').removeAttr('aria-required');
 			jQuery('#jform_php_jview_display').removeClass('required');
-			jform_vvvvvyavxz_required = true;
+			jform_vvvvvyavya_required = true;
 		}
 	}
 }
@ -130,26 +130,26 @@ function vvvvvyb(add_php_jview_vvvvvyb)
 	if (add_php_jview_vvvvvyb == 1)
 	{
 		jQuery('#jform_php_jview').closest('.control-group').show();
-		if (jform_vvvvvybvya_required)
+		if (jform_vvvvvybvyb_required)
 		{
 			updateFieldRequired('php_jview',0);
 			jQuery('#jform_php_jview').prop('required','required');
 			jQuery('#jform_php_jview').attr('aria-required',true);
 			jQuery('#jform_php_jview').addClass('required');
-			jform_vvvvvybvya_required = false;
+			jform_vvvvvybvyb_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_php_jview').closest('.control-group').hide();
-		if (!jform_vvvvvybvya_required)
+		if (!jform_vvvvvybvyb_required)
 		{
 			updateFieldRequired('php_jview',1);
 			jQuery('#jform_php_jview').removeAttr('required');
 			jQuery('#jform_php_jview').removeAttr('aria-required');
 			jQuery('#jform_php_jview').removeClass('required');
-			jform_vvvvvybvya_required = true;
+			jform_vvvvvybvyb_required = true;
 		}
 	}
 }
@ -161,26 +161,26 @@ function vvvvvyc(add_php_document_vvvvvyc)
 	if (add_php_document_vvvvvyc == 1)
 	{
 		jQuery('#jform_php_document').closest('.control-group').show();
-		if (jform_vvvvvycvyb_required)
+		if (jform_vvvvvycvyc_required)
 		{
 			updateFieldRequired('php_document',0);
 			jQuery('#jform_php_document').prop('required','required');
 			jQuery('#jform_php_document').attr('aria-required',true);
 			jQuery('#jform_php_document').addClass('required');
-			jform_vvvvvycvyb_required = false;
+			jform_vvvvvycvyc_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_php_document').closest('.control-group').hide();
-		if (!jform_vvvvvycvyb_required)
+		if (!jform_vvvvvycvyc_required)
 		{
 			updateFieldRequired('php_document',1);
 			jQuery('#jform_php_document').removeAttr('required');
 			jQuery('#jform_php_document').removeAttr('aria-required');
 			jQuery('#jform_php_document').removeClass('required');
-			jform_vvvvvycvyb_required = true;
+			jform_vvvvvycvyc_required = true;
 		}
 	}
 }
@ -192,26 +192,26 @@ function vvvvvyd(add_css_document_vvvvvyd)
 	if (add_css_document_vvvvvyd == 1)
 	{
 		jQuery('#jform_css_document').closest('.control-group').show();
-		if (jform_vvvvvydvyc_required)
+		if (jform_vvvvvydvyd_required)
 		{
 			updateFieldRequired('css_document',0);
 			jQuery('#jform_css_document').prop('required','required');
 			jQuery('#jform_css_document').attr('aria-required',true);
 			jQuery('#jform_css_document').addClass('required');
-			jform_vvvvvydvyc_required = false;
+			jform_vvvvvydvyd_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_css_document').closest('.control-group').hide();
-		if (!jform_vvvvvydvyc_required)
+		if (!jform_vvvvvydvyd_required)
 		{
 			updateFieldRequired('css_document',1);
 			jQuery('#jform_css_document').removeAttr('required');
 			jQuery('#jform_css_document').removeAttr('aria-required');
 			jQuery('#jform_css_document').removeClass('required');
-			jform_vvvvvydvyc_required = true;
+			jform_vvvvvydvyd_required = true;
 		}
 	}
 }
@ -223,26 +223,26 @@ function vvvvvye(add_js_document_vvvvvye)
 	if (add_js_document_vvvvvye == 1)
 	{
 		jQuery('#jform_js_document').closest('.control-group').show();
-		if (jform_vvvvvyevyd_required)
+		if (jform_vvvvvyevye_required)
 		{
 			updateFieldRequired('js_document',0);
 			jQuery('#jform_js_document').prop('required','required');
 			jQuery('#jform_js_document').attr('aria-required',true);
 			jQuery('#jform_js_document').addClass('required');
-			jform_vvvvvyevyd_required = false;
+			jform_vvvvvyevye_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_js_document').closest('.control-group').hide();
-		if (!jform_vvvvvyevyd_required)
+		if (!jform_vvvvvyevye_required)
 		{
 			updateFieldRequired('js_document',1);
 			jQuery('#jform_js_document').removeAttr('required');
 			jQuery('#jform_js_document').removeAttr('aria-required');
 			jQuery('#jform_js_document').removeClass('required');
-			jform_vvvvvyevyd_required = true;
+			jform_vvvvvyevye_required = true;
 		}
 	}
 }
@ -255,23 +255,23 @@ function vvvvvyf(add_custom_button_vvvvvyf)
 	{
 		jQuery('#jform_custom_button').closest('.control-group').show();
 		jQuery('#jform_php_controller').closest('.control-group').show();
-		if (jform_vvvvvyfvye_required)
+		if (jform_vvvvvyfvyf_required)
 		{
 			updateFieldRequired('php_controller',0);
 			jQuery('#jform_php_controller').prop('required','required');
 			jQuery('#jform_php_controller').attr('aria-required',true);
 			jQuery('#jform_php_controller').addClass('required');
-			jform_vvvvvyfvye_required = false;
+			jform_vvvvvyfvyf_required = false;
 		}

 		jQuery('#jform_php_model').closest('.control-group').show();
-		if (jform_vvvvvyfvyf_required)
+		if (jform_vvvvvyfvyg_required)
 		{
 			updateFieldRequired('php_model',0);
 			jQuery('#jform_php_model').prop('required','required');
 			jQuery('#jform_php_model').attr('aria-required',true);
 			jQuery('#jform_php_model').addClass('required');
-			jform_vvvvvyfvyf_required = false;
+			jform_vvvvvyfvyg_required = false;
 		}

 	}
@ -279,22 +279,22 @@ function vvvvvyf(add_custom_button_vvvvvyf)
 	{
 		jQuery('#jform_custom_button').closest('.control-group').hide();
 		jQuery('#jform_php_controller').closest('.control-group').hide();
-		if (!jform_vvvvvyfvye_required)
+		if (!jform_vvvvvyfvyf_required)
 		{
 			updateFieldRequired('php_controller',1);
 			jQuery('#jform_php_controller').removeAttr('required');
 			jQuery('#jform_php_controller').removeAttr('aria-required');
 			jQuery('#jform_php_controller').removeClass('required');
-			jform_vvvvvyfvye_required = true;
+			jform_vvvvvyfvyf_required = true;
 		}
 		jQuery('#jform_php_model').closest('.control-group').hide();
-		if (!jform_vvvvvyfvyf_required)
+		if (!jform_vvvvvyfvyg_required)
 		{
 			updateFieldRequired('php_model',1);
 			jQuery('#jform_php_model').removeAttr('required');
 			jQuery('#jform_php_model').removeAttr('aria-required');
 			jQuery('#jform_php_model').removeClass('required');
-			jform_vvvvvyfvyf_required = true;
+			jform_vvvvvyfvyg_required = true;
 		}
 	}
 }
@ -306,26 +306,26 @@ function vvvvvyg(add_css_vvvvvyg)
 	if (add_css_vvvvvyg == 1)
 	{
 		jQuery('#jform_css').closest('.control-group').show();
-		if (jform_vvvvvygvyg_required)
+		if (jform_vvvvvygvyh_required)
 		{
 			updateFieldRequired('css',0);
 			jQuery('#jform_css').prop('required','required');
 			jQuery('#jform_css').attr('aria-required',true);
 			jQuery('#jform_css').addClass('required');
-			jform_vvvvvygvyg_required = false;
+			jform_vvvvvygvyh_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_css').closest('.control-group').hide();
-		if (!jform_vvvvvygvyg_required)
+		if (!jform_vvvvvygvyh_required)
 		{
 			updateFieldRequired('css',1);
 			jQuery('#jform_css').removeAttr('required');
 			jQuery('#jform_css').removeAttr('aria-required');
 			jQuery('#jform_css').removeClass('required');
-			jform_vvvvvygvyg_required = true;
+			jform_vvvvvygvyh_required = true;
 		}
 	}
 }
--- a/admin/models/forms/custom_code.js
+++ b/admin/models/forms/custom_code.js
@ -23,10 +23,10 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/

 // Some Global Values
-jform_vvvvvzovzn_required = false;
-jform_vvvvvzpvzo_required = false;
+jform_vvvvvzovzo_required = false;
 jform_vvvvvzpvzp_required = false;
 jform_vvvvvzpvzq_required = false;
+jform_vvvvvzpvzr_required = false;

 // Initial Script
 jQuery(document).ready(function()
@ -53,13 +53,13 @@ function vvvvvzo(target_vvvvvzo)
 	if (target_vvvvvzo == 2)
 	{
 		jQuery('#jform_function_name').closest('.control-group').show();
-		if (jform_vvvvvzovzn_required)
+		if (jform_vvvvvzovzo_required)
 		{
 			updateFieldRequired('function_name',0);
 			jQuery('#jform_function_name').prop('required','required');
 			jQuery('#jform_function_name').attr('aria-required',true);
 			jQuery('#jform_function_name').addClass('required');
-			jform_vvvvvzovzn_required = false;
+			jform_vvvvvzovzo_required = false;
 		}

 		jQuery('.note_jcb_placeholder').closest('.control-group').show();
@ -68,13 +68,13 @@ function vvvvvzo(target_vvvvvzo)
 	else
 	{
 		jQuery('#jform_function_name').closest('.control-group').hide();
-		if (!jform_vvvvvzovzn_required)
+		if (!jform_vvvvvzovzo_required)
 		{
 			updateFieldRequired('function_name',1);
 			jQuery('#jform_function_name').removeAttr('required');
 			jQuery('#jform_function_name').removeAttr('aria-required');
 			jQuery('#jform_function_name').removeClass('required');
-			jform_vvvvvzovzn_required = true;
+			jform_vvvvvzovzo_required = true;
 		}
 		jQuery('.note_jcb_placeholder').closest('.control-group').hide();
 		jQuery('#jform_system_name').closest('.control-group').hide();
@ -88,70 +88,70 @@ function vvvvvzp(target_vvvvvzp)
 	if (target_vvvvvzp == 1)
 	{
 		jQuery('#jform_component').closest('.control-group').show();
-		if (jform_vvvvvzpvzo_required)
+		if (jform_vvvvvzpvzp_required)
 		{
 			updateFieldRequired('component',0);
 			jQuery('#jform_component').prop('required','required');
 			jQuery('#jform_component').attr('aria-required',true);
 			jQuery('#jform_component').addClass('required');
-			jform_vvvvvzpvzo_required = false;
+			jform_vvvvvzpvzp_required = false;
 		}

 		jQuery('#jform_path').closest('.control-group').show();
-		if (jform_vvvvvzpvzp_required)
+		if (jform_vvvvvzpvzq_required)
 		{
 			updateFieldRequired('path',0);
 			jQuery('#jform_path').prop('required','required');
 			jQuery('#jform_path').attr('aria-required',true);
 			jQuery('#jform_path').addClass('required');
-			jform_vvvvvzpvzp_required = false;
+			jform_vvvvvzpvzq_required = false;
 		}

 		jQuery('#jform_from_line').closest('.control-group').show();
 		jQuery('#jform_hashtarget').closest('.control-group').show();
 		jQuery('#jform_to_line').closest('.control-group').show();
 		jQuery('#jform_type').closest('.control-group').show();
-		if (jform_vvvvvzpvzq_required)
+		if (jform_vvvvvzpvzr_required)
 		{
 			updateFieldRequired('type',0);
 			jQuery('#jform_type').prop('required','required');
 			jQuery('#jform_type').attr('aria-required',true);
 			jQuery('#jform_type').addClass('required');
-			jform_vvvvvzpvzq_required = false;
+			jform_vvvvvzpvzr_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_component').closest('.control-group').hide();
-		if (!jform_vvvvvzpvzo_required)
+		if (!jform_vvvvvzpvzp_required)
 		{
 			updateFieldRequired('component',1);
 			jQuery('#jform_component').removeAttr('required');
 			jQuery('#jform_component').removeAttr('aria-required');
 			jQuery('#jform_component').removeClass('required');
-			jform_vvvvvzpvzo_required = true;
+			jform_vvvvvzpvzp_required = true;
 		}
 		jQuery('#jform_path').closest('.control-group').hide();
-		if (!jform_vvvvvzpvzp_required)
+		if (!jform_vvvvvzpvzq_required)
 		{
 			updateFieldRequired('path',1);
 			jQuery('#jform_path').removeAttr('required');
 			jQuery('#jform_path').removeAttr('aria-required');
 			jQuery('#jform_path').removeClass('required');
-			jform_vvvvvzpvzp_required = true;
+			jform_vvvvvzpvzq_required = true;
 		}
 		jQuery('#jform_from_line').closest('.control-group').hide();
 		jQuery('#jform_hashtarget').closest('.control-group').hide();
 		jQuery('#jform_to_line').closest('.control-group').hide();
 		jQuery('#jform_type').closest('.control-group').hide();
-		if (!jform_vvvvvzpvzq_required)
+		if (!jform_vvvvvzpvzr_required)
 		{
 			updateFieldRequired('type',1);
 			jQuery('#jform_type').removeAttr('required');
 			jQuery('#jform_type').removeAttr('aria-required');
 			jQuery('#jform_type').removeClass('required');
-			jform_vvvvvzpvzq_required = true;
+			jform_vvvvvzpvzr_required = true;
 		}
 	}
 }
--- a/admin/models/forms/dynamic_get.js
+++ b/admin/models/forms/dynamic_get.js
@ -23,24 +23,24 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/

 // Some Global Values
-jform_vvvvvysvyv_required = false;
-jform_vvvvvytvyw_required = false;
-jform_vvvvvyuvyx_required = false;
-jform_vvvvvyvvyy_required = false;
-jform_vvvvvywvyz_required = false;
-jform_vvvvvyxvza_required = false;
-jform_vvvvvzcvzb_required = false;
-jform_vvvvvzevzc_required = false;
-jform_vvvvvzfvzd_required = false;
-jform_vvvvvzhvze_required = false;
+jform_vvvvvysvyw_required = false;
+jform_vvvvvytvyx_required = false;
+jform_vvvvvyuvyy_required = false;
+jform_vvvvvyvvyz_required = false;
+jform_vvvvvywvza_required = false;
+jform_vvvvvyxvzb_required = false;
+jform_vvvvvzcvzc_required = false;
+jform_vvvvvzevzd_required = false;
+jform_vvvvvzfvze_required = false;
 jform_vvvvvzhvzf_required = false;
-jform_vvvvvzivzg_required = false;
-jform_vvvvvzjvzh_required = false;
-jform_vvvvvzkvzi_required = false;
-jform_vvvvvzmvzj_required = false;
+jform_vvvvvzhvzg_required = false;
+jform_vvvvvzivzh_required = false;
+jform_vvvvvzjvzi_required = false;
+jform_vvvvvzkvzj_required = false;
 jform_vvvvvzmvzk_required = false;
 jform_vvvvvzmvzl_required = false;
-jform_vvvvvznvzm_required = false;
+jform_vvvvvzmvzm_required = false;
+jform_vvvvvznvzn_required = false;

 // Initial Script
 jQuery(document).ready(function()
@ -127,26 +127,26 @@ function vvvvvys(gettype_vvvvvys)
 	if (gettype)
 	{
 		jQuery('#jform_getcustom').closest('.control-group').show();
-		if (jform_vvvvvysvyv_required)
+		if (jform_vvvvvysvyw_required)
 		{
 			updateFieldRequired('getcustom',0);
 			jQuery('#jform_getcustom').prop('required','required');
 			jQuery('#jform_getcustom').attr('aria-required',true);
 			jQuery('#jform_getcustom').addClass('required');
-			jform_vvvvvysvyv_required = false;
+			jform_vvvvvysvyw_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_getcustom').closest('.control-group').hide();
-		if (!jform_vvvvvysvyv_required)
+		if (!jform_vvvvvysvyw_required)
 		{
 			updateFieldRequired('getcustom',1);
 			jQuery('#jform_getcustom').removeAttr('required');
 			jQuery('#jform_getcustom').removeAttr('aria-required');
 			jQuery('#jform_getcustom').removeClass('required');
-			jform_vvvvvysvyv_required = true;
+			jform_vvvvvysvyw_required = true;
 		}
 	}
 }
@ -182,26 +182,26 @@ function vvvvvyt(main_source_vvvvvyt)
 	if (main_source)
 	{
 		jQuery('#jform_view_table_main').closest('.control-group').show();
-		if (jform_vvvvvytvyw_required)
+		if (jform_vvvvvytvyx_required)
 		{
 			updateFieldRequired('view_table_main',0);
 			jQuery('#jform_view_table_main').prop('required','required');
 			jQuery('#jform_view_table_main').attr('aria-required',true);
 			jQuery('#jform_view_table_main').addClass('required');
-			jform_vvvvvytvyw_required = false;
+			jform_vvvvvytvyx_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_view_table_main').closest('.control-group').hide();
-		if (!jform_vvvvvytvyw_required)
+		if (!jform_vvvvvytvyx_required)
 		{
 			updateFieldRequired('view_table_main',1);
 			jQuery('#jform_view_table_main').removeAttr('required');
 			jQuery('#jform_view_table_main').removeAttr('aria-required');
 			jQuery('#jform_view_table_main').removeClass('required');
-			jform_vvvvvytvyw_required = true;
+			jform_vvvvvytvyx_required = true;
 		}
 	}
 }
@ -237,26 +237,26 @@ function vvvvvyu(main_source_vvvvvyu)
 	if (main_source)
 	{
 		jQuery('#jform_view_selection').closest('.control-group').show();
-		if (jform_vvvvvyuvyx_required)
+		if (jform_vvvvvyuvyy_required)
 		{
 			updateFieldRequired('view_selection',0);
 			jQuery('#jform_view_selection').prop('required','required');
 			jQuery('#jform_view_selection').attr('aria-required',true);
 			jQuery('#jform_view_selection').addClass('required');
-			jform_vvvvvyuvyx_required = false;
+			jform_vvvvvyuvyy_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_view_selection').closest('.control-group').hide();
-		if (!jform_vvvvvyuvyx_required)
+		if (!jform_vvvvvyuvyy_required)
 		{
 			updateFieldRequired('view_selection',1);
 			jQuery('#jform_view_selection').removeAttr('required');
 			jQuery('#jform_view_selection').removeAttr('aria-required');
 			jQuery('#jform_view_selection').removeClass('required');
-			jform_vvvvvyuvyx_required = true;
+			jform_vvvvvyuvyy_required = true;
 		}
 	}
 }
@ -292,26 +292,26 @@ function vvvvvyv(main_source_vvvvvyv)
 	if (main_source)
 	{
 		jQuery('#jform_db_table_main').closest('.control-group').show();
-		if (jform_vvvvvyvvyy_required)
+		if (jform_vvvvvyvvyz_required)
 		{
 			updateFieldRequired('db_table_main',0);
 			jQuery('#jform_db_table_main').prop('required','required');
 			jQuery('#jform_db_table_main').attr('aria-required',true);
 			jQuery('#jform_db_table_main').addClass('required');
-			jform_vvvvvyvvyy_required = false;
+			jform_vvvvvyvvyz_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_db_table_main').closest('.control-group').hide();
-		if (!jform_vvvvvyvvyy_required)
+		if (!jform_vvvvvyvvyz_required)
 		{
 			updateFieldRequired('db_table_main',1);
 			jQuery('#jform_db_table_main').removeAttr('required');
 			jQuery('#jform_db_table_main').removeAttr('aria-required');
 			jQuery('#jform_db_table_main').removeClass('required');
-			jform_vvvvvyvvyy_required = true;
+			jform_vvvvvyvvyz_required = true;
 		}
 	}
 }
@ -347,26 +347,26 @@ function vvvvvyw(main_source_vvvvvyw)
 	if (main_source)
 	{
 		jQuery('#jform_db_selection').closest('.control-group').show();
-		if (jform_vvvvvywvyz_required)
+		if (jform_vvvvvywvza_required)
 		{
 			updateFieldRequired('db_selection',0);
 			jQuery('#jform_db_selection').prop('required','required');
 			jQuery('#jform_db_selection').attr('aria-required',true);
 			jQuery('#jform_db_selection').addClass('required');
-			jform_vvvvvywvyz_required = false;
+			jform_vvvvvywvza_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_db_selection').closest('.control-group').hide();
-		if (!jform_vvvvvywvyz_required)
+		if (!jform_vvvvvywvza_required)
 		{
 			updateFieldRequired('db_selection',1);
 			jQuery('#jform_db_selection').removeAttr('required');
 			jQuery('#jform_db_selection').removeAttr('aria-required');
 			jQuery('#jform_db_selection').removeClass('required');
-			jform_vvvvvywvyz_required = true;
+			jform_vvvvvywvza_required = true;
 		}
 	}
 }
@ -389,26 +389,26 @@ function vvvvvyx(addcalculation_vvvvvyx)
 	if (addcalculation_vvvvvyx == 1)
 	{
 		jQuery('#jform_php_calculation').closest('.control-group').show();
-		if (jform_vvvvvyxvza_required)
+		if (jform_vvvvvyxvzb_required)
 		{
 			updateFieldRequired('php_calculation',0);
 			jQuery('#jform_php_calculation').prop('required','required');
 			jQuery('#jform_php_calculation').attr('aria-required',true);
 			jQuery('#jform_php_calculation').addClass('required');
-			jform_vvvvvyxvza_required = false;
+			jform_vvvvvyxvzb_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_php_calculation').closest('.control-group').hide();
-		if (!jform_vvvvvyxvza_required)
+		if (!jform_vvvvvyxvzb_required)
 		{
 			updateFieldRequired('php_calculation',1);
 			jQuery('#jform_php_calculation').removeAttr('required');
 			jQuery('#jform_php_calculation').removeAttr('aria-required');
 			jQuery('#jform_php_calculation').removeClass('required');
-			jform_vvvvvyxvza_required = true;
+			jform_vvvvvyxvzb_required = true;
 		}
 	}
 }
@ -555,26 +555,26 @@ function vvvvvzc(main_source_vvvvvzc)
 	if (main_source)
 	{
 		jQuery('#jform_php_custom_get').closest('.control-group').show();
-		if (jform_vvvvvzcvzb_required)
+		if (jform_vvvvvzcvzc_required)
 		{
 			updateFieldRequired('php_custom_get',0);
 			jQuery('#jform_php_custom_get').prop('required','required');
 			jQuery('#jform_php_custom_get').attr('aria-required',true);
 			jQuery('#jform_php_custom_get').addClass('required');
-			jform_vvvvvzcvzb_required = false;
+			jform_vvvvvzcvzc_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_php_custom_get').closest('.control-group').hide();
-		if (!jform_vvvvvzcvzb_required)
+		if (!jform_vvvvvzcvzc_required)
 		{
 			updateFieldRequired('php_custom_get',1);
 			jQuery('#jform_php_custom_get').removeAttr('required');
 			jQuery('#jform_php_custom_get').removeAttr('aria-required');
 			jQuery('#jform_php_custom_get').removeClass('required');
-			jform_vvvvvzcvzb_required = true;
+			jform_vvvvvzcvzc_required = true;
 		}
 	}
 }
@ -668,26 +668,26 @@ function vvvvvze(add_php_before_getitem_vvvvvze,gettype_vvvvvze)
 	if (add_php_before_getitem && gettype)
 	{
 		jQuery('#jform_php_before_getitem').closest('.control-group').show();
-		if (jform_vvvvvzevzc_required)
+		if (jform_vvvvvzevzd_required)
 		{
 			updateFieldRequired('php_before_getitem',0);
 			jQuery('#jform_php_before_getitem').prop('required','required');
 			jQuery('#jform_php_before_getitem').attr('aria-required',true);
 			jQuery('#jform_php_before_getitem').addClass('required');
-			jform_vvvvvzevzc_required = false;
+			jform_vvvvvzevzd_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_php_before_getitem').closest('.control-group').hide();
-		if (!jform_vvvvvzevzc_required)
+		if (!jform_vvvvvzevzd_required)
 		{
 			updateFieldRequired('php_before_getitem',1);
 			jQuery('#jform_php_before_getitem').removeAttr('required');
 			jQuery('#jform_php_before_getitem').removeAttr('aria-required');
 			jQuery('#jform_php_before_getitem').removeClass('required');
-			jform_vvvvvzevzc_required = true;
+			jform_vvvvvzevzd_required = true;
 		}
 	}
 }
@ -746,26 +746,26 @@ function vvvvvzf(add_php_after_getitem_vvvvvzf,gettype_vvvvvzf)
 	if (add_php_after_getitem && gettype)
 	{
 		jQuery('#jform_php_after_getitem').closest('.control-group').show();
-		if (jform_vvvvvzfvzd_required)
+		if (jform_vvvvvzfvze_required)
 		{
 			updateFieldRequired('php_after_getitem',0);
 			jQuery('#jform_php_after_getitem').prop('required','required');
 			jQuery('#jform_php_after_getitem').attr('aria-required',true);
 			jQuery('#jform_php_after_getitem').addClass('required');
-			jform_vvvvvzfvzd_required = false;
+			jform_vvvvvzfvze_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_php_after_getitem').closest('.control-group').hide();
-		if (!jform_vvvvvzfvzd_required)
+		if (!jform_vvvvvzfvze_required)
 		{
 			updateFieldRequired('php_after_getitem',1);
 			jQuery('#jform_php_after_getitem').removeAttr('required');
 			jQuery('#jform_php_after_getitem').removeAttr('aria-required');
 			jQuery('#jform_php_after_getitem').removeClass('required');
-			jform_vvvvvzfvzd_required = true;
+			jform_vvvvvzfvze_required = true;
 		}
 	}
 }
@ -812,45 +812,45 @@ function vvvvvzh(gettype_vvvvvzh)
 	if (gettype)
 	{
 		jQuery('#jform_add_php_after_getitem').closest('.control-group').show();
-		if (jform_vvvvvzhvze_required)
+		if (jform_vvvvvzhvzf_required)
 		{
 			updateFieldRequired('add_php_after_getitem',0);
 			jQuery('#jform_add_php_after_getitem').prop('required','required');
 			jQuery('#jform_add_php_after_getitem').attr('aria-required',true);
 			jQuery('#jform_add_php_after_getitem').addClass('required');
-			jform_vvvvvzhvze_required = false;
+			jform_vvvvvzhvzf_required = false;
 		}

 		jQuery('#jform_add_php_before_getitem').closest('.control-group').show();
-		if (jform_vvvvvzhvzf_required)
+		if (jform_vvvvvzhvzg_required)
 		{
 			updateFieldRequired('add_php_before_getitem',0);
 			jQuery('#jform_add_php_before_getitem').prop('required','required');
 			jQuery('#jform_add_php_before_getitem').attr('aria-required',true);
 			jQuery('#jform_add_php_before_getitem').addClass('required');
-			jform_vvvvvzhvzf_required = false;
+			jform_vvvvvzhvzg_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_add_php_after_getitem').closest('.control-group').hide();
-		if (!jform_vvvvvzhvze_required)
+		if (!jform_vvvvvzhvzf_required)
 		{
 			updateFieldRequired('add_php_after_getitem',1);
 			jQuery('#jform_add_php_after_getitem').removeAttr('required');
 			jQuery('#jform_add_php_after_getitem').removeAttr('aria-required');
 			jQuery('#jform_add_php_after_getitem').removeClass('required');
-			jform_vvvvvzhvze_required = true;
+			jform_vvvvvzhvzf_required = true;
 		}
 		jQuery('#jform_add_php_before_getitem').closest('.control-group').hide();
-		if (!jform_vvvvvzhvzf_required)
+		if (!jform_vvvvvzhvzg_required)
 		{
 			updateFieldRequired('add_php_before_getitem',1);
 			jQuery('#jform_add_php_before_getitem').removeAttr('required');
 			jQuery('#jform_add_php_before_getitem').removeAttr('aria-required');
 			jQuery('#jform_add_php_before_getitem').removeClass('required');
-			jform_vvvvvzhvzf_required = true;
+			jform_vvvvvzhvzg_required = true;
 		}
 	}
 }
@ -898,26 +898,26 @@ function vvvvvzi(add_php_getlistquery_vvvvvzi,gettype_vvvvvzi)
 	if (add_php_getlistquery && gettype)
 	{
 		jQuery('#jform_php_getlistquery').closest('.control-group').show();
-		if (jform_vvvvvzivzg_required)
+		if (jform_vvvvvzivzh_required)
 		{
 			updateFieldRequired('php_getlistquery',0);
 			jQuery('#jform_php_getlistquery').prop('required','required');
 			jQuery('#jform_php_getlistquery').attr('aria-required',true);
 			jQuery('#jform_php_getlistquery').addClass('required');
-			jform_vvvvvzivzg_required = false;
+			jform_vvvvvzivzh_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_php_getlistquery').closest('.control-group').hide();
-		if (!jform_vvvvvzivzg_required)
+		if (!jform_vvvvvzivzh_required)
 		{
 			updateFieldRequired('php_getlistquery',1);
 			jQuery('#jform_php_getlistquery').removeAttr('required');
 			jQuery('#jform_php_getlistquery').removeAttr('aria-required');
 			jQuery('#jform_php_getlistquery').removeClass('required');
-			jform_vvvvvzivzg_required = true;
+			jform_vvvvvzivzh_required = true;
 		}
 	}
 }
@ -976,26 +976,26 @@ function vvvvvzj(add_php_before_getitems_vvvvvzj,gettype_vvvvvzj)
 	if (add_php_before_getitems && gettype)
 	{
 		jQuery('#jform_php_before_getitems').closest('.control-group').show();
-		if (jform_vvvvvzjvzh_required)
+		if (jform_vvvvvzjvzi_required)
 		{
 			updateFieldRequired('php_before_getitems',0);
 			jQuery('#jform_php_before_getitems').prop('required','required');
 			jQuery('#jform_php_before_getitems').attr('aria-required',true);
 			jQuery('#jform_php_before_getitems').addClass('required');
-			jform_vvvvvzjvzh_required = false;
+			jform_vvvvvzjvzi_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_php_before_getitems').closest('.control-group').hide();
-		if (!jform_vvvvvzjvzh_required)
+		if (!jform_vvvvvzjvzi_required)
 		{
 			updateFieldRequired('php_before_getitems',1);
 			jQuery('#jform_php_before_getitems').removeAttr('required');
 			jQuery('#jform_php_before_getitems').removeAttr('aria-required');
 			jQuery('#jform_php_before_getitems').removeClass('required');
-			jform_vvvvvzjvzh_required = true;
+			jform_vvvvvzjvzi_required = true;
 		}
 	}
 }
@ -1054,26 +1054,26 @@ function vvvvvzk(add_php_after_getitems_vvvvvzk,gettype_vvvvvzk)
 	if (add_php_after_getitems && gettype)
 	{
 		jQuery('#jform_php_after_getitems').closest('.control-group').show();
-		if (jform_vvvvvzkvzi_required)
+		if (jform_vvvvvzkvzj_required)
 		{
 			updateFieldRequired('php_after_getitems',0);
 			jQuery('#jform_php_after_getitems').prop('required','required');
 			jQuery('#jform_php_after_getitems').attr('aria-required',true);
 			jQuery('#jform_php_after_getitems').addClass('required');
-			jform_vvvvvzkvzi_required = false;
+			jform_vvvvvzkvzj_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_php_after_getitems').closest('.control-group').hide();
-		if (!jform_vvvvvzkvzi_required)
+		if (!jform_vvvvvzkvzj_required)
 		{
 			updateFieldRequired('php_after_getitems',1);
 			jQuery('#jform_php_after_getitems').removeAttr('required');
 			jQuery('#jform_php_after_getitems').removeAttr('aria-required');
 			jQuery('#jform_php_after_getitems').removeClass('required');
-			jform_vvvvvzkvzi_required = true;
+			jform_vvvvvzkvzj_required = true;
 		}
 	}
 }
@ -1120,64 +1120,64 @@ function vvvvvzm(gettype_vvvvvzm)
 	if (gettype)
 	{
 		jQuery('#jform_add_php_after_getitems').closest('.control-group').show();
-		if (jform_vvvvvzmvzj_required)
+		if (jform_vvvvvzmvzk_required)
 		{
 			updateFieldRequired('add_php_after_getitems',0);
 			jQuery('#jform_add_php_after_getitems').prop('required','required');
 			jQuery('#jform_add_php_after_getitems').attr('aria-required',true);
 			jQuery('#jform_add_php_after_getitems').addClass('required');
-			jform_vvvvvzmvzj_required = false;
+			jform_vvvvvzmvzk_required = false;
 		}

 		jQuery('#jform_add_php_before_getitems').closest('.control-group').show();
-		if (jform_vvvvvzmvzk_required)
+		if (jform_vvvvvzmvzl_required)
 		{
 			updateFieldRequired('add_php_before_getitems',0);
 			jQuery('#jform_add_php_before_getitems').prop('required','required');
 			jQuery('#jform_add_php_before_getitems').attr('aria-required',true);
 			jQuery('#jform_add_php_before_getitems').addClass('required');
-			jform_vvvvvzmvzk_required = false;
+			jform_vvvvvzmvzl_required = false;
 		}

 		jQuery('#jform_add_php_getlistquery').closest('.control-group').show();
-		if (jform_vvvvvzmvzl_required)
+		if (jform_vvvvvzmvzm_required)
 		{
 			updateFieldRequired('add_php_getlistquery',0);
 			jQuery('#jform_add_php_getlistquery').prop('required','required');
 			jQuery('#jform_add_php_getlistquery').attr('aria-required',true);
 			jQuery('#jform_add_php_getlistquery').addClass('required');
-			jform_vvvvvzmvzl_required = false;
+			jform_vvvvvzmvzm_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_add_php_after_getitems').closest('.control-group').hide();
-		if (!jform_vvvvvzmvzj_required)
+		if (!jform_vvvvvzmvzk_required)
 		{
 			updateFieldRequired('add_php_after_getitems',1);
 			jQuery('#jform_add_php_after_getitems').removeAttr('required');
 			jQuery('#jform_add_php_after_getitems').removeAttr('aria-required');
 			jQuery('#jform_add_php_after_getitems').removeClass('required');
-			jform_vvvvvzmvzj_required = true;
+			jform_vvvvvzmvzk_required = true;
 		}
 		jQuery('#jform_add_php_before_getitems').closest('.control-group').hide();
-		if (!jform_vvvvvzmvzk_required)
+		if (!jform_vvvvvzmvzl_required)
 		{
 			updateFieldRequired('add_php_before_getitems',1);
 			jQuery('#jform_add_php_before_getitems').removeAttr('required');
 			jQuery('#jform_add_php_before_getitems').removeAttr('aria-required');
 			jQuery('#jform_add_php_before_getitems').removeClass('required');
-			jform_vvvvvzmvzk_required = true;
+			jform_vvvvvzmvzl_required = true;
 		}
 		jQuery('#jform_add_php_getlistquery').closest('.control-group').hide();
-		if (!jform_vvvvvzmvzl_required)
+		if (!jform_vvvvvzmvzm_required)
 		{
 			updateFieldRequired('add_php_getlistquery',1);
 			jQuery('#jform_add_php_getlistquery').removeAttr('required');
 			jQuery('#jform_add_php_getlistquery').removeAttr('aria-required');
 			jQuery('#jform_add_php_getlistquery').removeClass('required');
-			jform_vvvvvzmvzl_required = true;
+			jform_vvvvvzmvzm_required = true;
 		}
 	}
 }
@ -1213,26 +1213,26 @@ function vvvvvzn(gettype_vvvvvzn)
 	if (gettype)
 	{
 		jQuery('#jform_pagination').closest('.control-group').show();
-		if (jform_vvvvvznvzm_required)
+		if (jform_vvvvvznvzn_required)
 		{
 			updateFieldRequired('pagination',0);
 			jQuery('#jform_pagination').prop('required','required');
 			jQuery('#jform_pagination').attr('aria-required',true);
 			jQuery('#jform_pagination').addClass('required');
-			jform_vvvvvznvzm_required = false;
+			jform_vvvvvznvzn_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_pagination').closest('.control-group').hide();
-		if (!jform_vvvvvznvzm_required)
+		if (!jform_vvvvvznvzn_required)
 		{
 			updateFieldRequired('pagination',1);
 			jQuery('#jform_pagination').removeAttr('required');
 			jQuery('#jform_pagination').removeAttr('aria-required');
 			jQuery('#jform_pagination').removeClass('required');
-			jform_vvvvvznvzm_required = true;
+			jform_vvvvvznvzn_required = true;
 		}
 	}
 }
--- a/admin/models/forms/field.js
+++ b/admin/models/forms/field.js
@ -23,14 +23,14 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/

 // Some Global Values
-jform_vvvvvzsvzr_required = false;
-jform_vvvvvztvzs_required = false;
-jform_vvvvvzuvzt_required = false;
-jform_vvvvvzvvzu_required = false;
-jform_vvvvvzyvzv_required = false;
-jform_vvvvvzzvzw_required = false;
-jform_vvvvwaavzx_required = false;
-jform_vvvvwabvzy_required = false;
+jform_vvvvvzsvzs_required = false;
+jform_vvvvvztvzt_required = false;
+jform_vvvvvzuvzu_required = false;
+jform_vvvvvzvvzv_required = false;
+jform_vvvvvzyvzw_required = false;
+jform_vvvvvzzvzx_required = false;
+jform_vvvvwaavzy_required = false;
+jform_vvvvwabvzz_required = false;

 // Initial Script
 jQuery(document).ready(function()
@ -84,26 +84,26 @@ function vvvvvzs(datalenght_vvvvvzs)
 	if (datalenght)
 	{
 		jQuery('#jform_datalenght_other').closest('.control-group').show();
-		if (jform_vvvvvzsvzr_required)
+		if (jform_vvvvvzsvzs_required)
 		{
 			updateFieldRequired('datalenght_other',0);
 			jQuery('#jform_datalenght_other').prop('required','required');
 			jQuery('#jform_datalenght_other').attr('aria-required',true);
 			jQuery('#jform_datalenght_other').addClass('required');
-			jform_vvvvvzsvzr_required = false;
+			jform_vvvvvzsvzs_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_datalenght_other').closest('.control-group').hide();
-		if (!jform_vvvvvzsvzr_required)
+		if (!jform_vvvvvzsvzs_required)
 		{
 			updateFieldRequired('datalenght_other',1);
 			jQuery('#jform_datalenght_other').removeAttr('required');
 			jQuery('#jform_datalenght_other').removeAttr('aria-required');
 			jQuery('#jform_datalenght_other').removeClass('required');
-			jform_vvvvvzsvzr_required = true;
+			jform_vvvvvzsvzs_required = true;
 		}
 	}
 }
@ -139,26 +139,26 @@ function vvvvvzt(datadefault_vvvvvzt)
 	if (datadefault)
 	{
 		jQuery('#jform_datadefault_other').closest('.control-group').show();
-		if (jform_vvvvvztvzs_required)
+		if (jform_vvvvvztvzt_required)
 		{
 			updateFieldRequired('datadefault_other',0);
 			jQuery('#jform_datadefault_other').prop('required','required');
 			jQuery('#jform_datadefault_other').attr('aria-required',true);
 			jQuery('#jform_datadefault_other').addClass('required');
-			jform_vvvvvztvzs_required = false;
+			jform_vvvvvztvzt_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_datadefault_other').closest('.control-group').hide();
-		if (!jform_vvvvvztvzs_required)
+		if (!jform_vvvvvztvzt_required)
 		{
 			updateFieldRequired('datadefault_other',1);
 			jQuery('#jform_datadefault_other').removeAttr('required');
 			jQuery('#jform_datadefault_other').removeAttr('aria-required');
 			jQuery('#jform_datadefault_other').removeClass('required');
-			jform_vvvvvztvzs_required = true;
+			jform_vvvvvztvzt_required = true;
 		}
 	}
 }
@ -196,13 +196,13 @@ function vvvvvzu(datatype_vvvvvzu)
 		jQuery('#jform_datadefault').closest('.control-group').show();
 		jQuery('#jform_datalenght').closest('.control-group').show();
 		jQuery('#jform_indexes').closest('.control-group').show();
-		if (jform_vvvvvzuvzt_required)
+		if (jform_vvvvvzuvzu_required)
 		{
 			updateFieldRequired('indexes',0);
 			jQuery('#jform_indexes').prop('required','required');
 			jQuery('#jform_indexes').attr('aria-required',true);
 			jQuery('#jform_indexes').addClass('required');
-			jform_vvvvvzuvzt_required = false;
+			jform_vvvvvzuvzu_required = false;
 		}

 	}
@ -211,13 +211,13 @@ function vvvvvzu(datatype_vvvvvzu)
 		jQuery('#jform_datadefault').closest('.control-group').hide();
 		jQuery('#jform_datalenght').closest('.control-group').hide();
 		jQuery('#jform_indexes').closest('.control-group').hide();
-		if (!jform_vvvvvzuvzt_required)
+		if (!jform_vvvvvzuvzu_required)
 		{
 			updateFieldRequired('indexes',1);
 			jQuery('#jform_indexes').removeAttr('required');
 			jQuery('#jform_indexes').removeAttr('aria-required');
 			jQuery('#jform_indexes').removeClass('required');
-			jform_vvvvvzuvzt_required = true;
+			jform_vvvvvzuvzu_required = true;
 		}
 	}
 }
@ -253,26 +253,26 @@ function vvvvvzv(datatype_vvvvvzv)
 	if (datatype)
 	{
 		jQuery('#jform_store').closest('.control-group').show();
-		if (jform_vvvvvzvvzu_required)
+		if (jform_vvvvvzvvzv_required)
 		{
 			updateFieldRequired('store',0);
 			jQuery('#jform_store').prop('required','required');
 			jQuery('#jform_store').attr('aria-required',true);
 			jQuery('#jform_store').addClass('required');
-			jform_vvvvvzvvzu_required = false;
+			jform_vvvvvzvvzv_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_store').closest('.control-group').hide();
-		if (!jform_vvvvvzvvzu_required)
+		if (!jform_vvvvvzvvzv_required)
 		{
 			updateFieldRequired('store',1);
 			jQuery('#jform_store').removeAttr('required');
 			jQuery('#jform_store').removeAttr('aria-required');
 			jQuery('#jform_store').removeClass('required');
-			jform_vvvvvzvvzu_required = true;
+			jform_vvvvvzvvzv_required = true;
 		}
 	}
 }
@ -356,26 +356,26 @@ function vvvvvzy(add_css_view_vvvvvzy)
 	if (add_css_view_vvvvvzy == 1)
 	{
 		jQuery('#jform_css_view').closest('.control-group').show();
-		if (jform_vvvvvzyvzv_required)
+		if (jform_vvvvvzyvzw_required)
 		{
 			updateFieldRequired('css_view',0);
 			jQuery('#jform_css_view').prop('required','required');
 			jQuery('#jform_css_view').attr('aria-required',true);
 			jQuery('#jform_css_view').addClass('required');
-			jform_vvvvvzyvzv_required = false;
+			jform_vvvvvzyvzw_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_css_view').closest('.control-group').hide();
-		if (!jform_vvvvvzyvzv_required)
+		if (!jform_vvvvvzyvzw_required)
 		{
 			updateFieldRequired('css_view',1);
 			jQuery('#jform_css_view').removeAttr('required');
 			jQuery('#jform_css_view').removeAttr('aria-required');
 			jQuery('#jform_css_view').removeClass('required');
-			jform_vvvvvzyvzv_required = true;
+			jform_vvvvvzyvzw_required = true;
 		}
 	}
 }
@ -387,26 +387,26 @@ function vvvvvzz(add_css_views_vvvvvzz)
 	if (add_css_views_vvvvvzz == 1)
 	{
 		jQuery('#jform_css_views').closest('.control-group').show();
-		if (jform_vvvvvzzvzw_required)
+		if (jform_vvvvvzzvzx_required)
 		{
 			updateFieldRequired('css_views',0);
 			jQuery('#jform_css_views').prop('required','required');
 			jQuery('#jform_css_views').attr('aria-required',true);
 			jQuery('#jform_css_views').addClass('required');
-			jform_vvvvvzzvzw_required = false;
+			jform_vvvvvzzvzx_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_css_views').closest('.control-group').hide();
-		if (!jform_vvvvvzzvzw_required)
+		if (!jform_vvvvvzzvzx_required)
 		{
 			updateFieldRequired('css_views',1);
 			jQuery('#jform_css_views').removeAttr('required');
 			jQuery('#jform_css_views').removeAttr('aria-required');
 			jQuery('#jform_css_views').removeClass('required');
-			jform_vvvvvzzvzw_required = true;
+			jform_vvvvvzzvzx_required = true;
 		}
 	}
 }
@ -418,26 +418,26 @@ function vvvvwaa(add_javascript_view_footer_vvvvwaa)
 	if (add_javascript_view_footer_vvvvwaa == 1)
 	{
 		jQuery('#jform_javascript_view_footer').closest('.control-group').show();
-		if (jform_vvvvwaavzx_required)
+		if (jform_vvvvwaavzy_required)
 		{
 			updateFieldRequired('javascript_view_footer',0);
 			jQuery('#jform_javascript_view_footer').prop('required','required');
 			jQuery('#jform_javascript_view_footer').attr('aria-required',true);
 			jQuery('#jform_javascript_view_footer').addClass('required');
-			jform_vvvvwaavzx_required = false;
+			jform_vvvvwaavzy_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_javascript_view_footer').closest('.control-group').hide();
-		if (!jform_vvvvwaavzx_required)
+		if (!jform_vvvvwaavzy_required)
 		{
 			updateFieldRequired('javascript_view_footer',1);
 			jQuery('#jform_javascript_view_footer').removeAttr('required');
 			jQuery('#jform_javascript_view_footer').removeAttr('aria-required');
 			jQuery('#jform_javascript_view_footer').removeClass('required');
-			jform_vvvvwaavzx_required = true;
+			jform_vvvvwaavzy_required = true;
 		}
 	}
 }
@ -449,26 +449,26 @@ function vvvvwab(add_javascript_views_footer_vvvvwab)
 	if (add_javascript_views_footer_vvvvwab == 1)
 	{
 		jQuery('#jform_javascript_views_footer').closest('.control-group').show();
-		if (jform_vvvvwabvzy_required)
+		if (jform_vvvvwabvzz_required)
 		{
 			updateFieldRequired('javascript_views_footer',0);
 			jQuery('#jform_javascript_views_footer').prop('required','required');
 			jQuery('#jform_javascript_views_footer').attr('aria-required',true);
 			jQuery('#jform_javascript_views_footer').addClass('required');
-			jform_vvvvwabvzy_required = false;
+			jform_vvvvwabvzz_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_javascript_views_footer').closest('.control-group').hide();
-		if (!jform_vvvvwabvzy_required)
+		if (!jform_vvvvwabvzz_required)
 		{
 			updateFieldRequired('javascript_views_footer',1);
 			jQuery('#jform_javascript_views_footer').removeAttr('required');
 			jQuery('#jform_javascript_views_footer').removeAttr('aria-required');
 			jQuery('#jform_javascript_views_footer').removeClass('required');
-			jform_vvvvwabvzy_required = true;
+			jform_vvvvwabvzz_required = true;
 		}
 	}
 }
--- a/admin/models/forms/help_document.js
+++ b/admin/models/forms/help_document.js
@ -23,12 +23,12 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/

 // Some Global Values
-jform_vvvvwacwab_required = false;
-jform_vvvvwadwac_required = false;
-jform_vvvvwaewad_required = false;
-jform_vvvvwafwae_required = false;
-jform_vvvvwagwaf_required = false;
-jform_vvvvwahwag_required = false;
+jform_vvvvwacwac_required = false;
+jform_vvvvwadwad_required = false;
+jform_vvvvwaewae_required = false;
+jform_vvvvwafwaf_required = false;
+jform_vvvvwagwag_required = false;
+jform_vvvvwahwah_required = false;

 // Initial Script
 jQuery(document).ready(function()
@ -59,26 +59,26 @@ function vvvvwac(location_vvvvwac)
 	if (location_vvvvwac == 1)
 	{
 		jQuery('#jform_admin_view').closest('.control-group').show();
-		if (jform_vvvvwacwab_required)
+		if (jform_vvvvwacwac_required)
 		{
 			updateFieldRequired('admin_view',0);
 			jQuery('#jform_admin_view').prop('required','required');
 			jQuery('#jform_admin_view').attr('aria-required',true);
 			jQuery('#jform_admin_view').addClass('required');
-			jform_vvvvwacwab_required = false;
+			jform_vvvvwacwac_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_admin_view').closest('.control-group').hide();
-		if (!jform_vvvvwacwab_required)
+		if (!jform_vvvvwacwac_required)
 		{
 			updateFieldRequired('admin_view',1);
 			jQuery('#jform_admin_view').removeAttr('required');
 			jQuery('#jform_admin_view').removeAttr('aria-required');
 			jQuery('#jform_admin_view').removeClass('required');
-			jform_vvvvwacwab_required = true;
+			jform_vvvvwacwac_required = true;
 		}
 	}
 }
@ -90,26 +90,26 @@ function vvvvwad(location_vvvvwad)
 	if (location_vvvvwad == 2)
 	{
 		jQuery('#jform_site_view').closest('.control-group').show();
-		if (jform_vvvvwadwac_required)
+		if (jform_vvvvwadwad_required)
 		{
 			updateFieldRequired('site_view',0);
 			jQuery('#jform_site_view').prop('required','required');
 			jQuery('#jform_site_view').attr('aria-required',true);
 			jQuery('#jform_site_view').addClass('required');
-			jform_vvvvwadwac_required = false;
+			jform_vvvvwadwad_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_site_view').closest('.control-group').hide();
-		if (!jform_vvvvwadwac_required)
+		if (!jform_vvvvwadwad_required)
 		{
 			updateFieldRequired('site_view',1);
 			jQuery('#jform_site_view').removeAttr('required');
 			jQuery('#jform_site_view').removeAttr('aria-required');
 			jQuery('#jform_site_view').removeClass('required');
-			jform_vvvvwadwac_required = true;
+			jform_vvvvwadwad_required = true;
 		}
 	}
 }
@ -134,26 +134,26 @@ function vvvvwae(type_vvvvwae)
 	if (type)
 	{
 		jQuery('#jform_url').closest('.control-group').show();
-		if (jform_vvvvwaewad_required)
+		if (jform_vvvvwaewae_required)
 		{
 			updateFieldRequired('url',0);
 			jQuery('#jform_url').prop('required','required');
 			jQuery('#jform_url').attr('aria-required',true);
 			jQuery('#jform_url').addClass('required');
-			jform_vvvvwaewad_required = false;
+			jform_vvvvwaewae_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_url').closest('.control-group').hide();
-		if (!jform_vvvvwaewad_required)
+		if (!jform_vvvvwaewae_required)
 		{
 			updateFieldRequired('url',1);
 			jQuery('#jform_url').removeAttr('required');
 			jQuery('#jform_url').removeAttr('aria-required');
 			jQuery('#jform_url').removeClass('required');
-			jform_vvvvwaewad_required = true;
+			jform_vvvvwaewae_required = true;
 		}
 	}
 }
@ -189,26 +189,26 @@ function vvvvwaf(type_vvvvwaf)
 	if (type)
 	{
 		jQuery('#jform_article').closest('.control-group').show();
-		if (jform_vvvvwafwae_required)
+		if (jform_vvvvwafwaf_required)
 		{
 			updateFieldRequired('article',0);
 			jQuery('#jform_article').prop('required','required');
 			jQuery('#jform_article').attr('aria-required',true);
 			jQuery('#jform_article').addClass('required');
-			jform_vvvvwafwae_required = false;
+			jform_vvvvwafwaf_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_article').closest('.control-group').hide();
-		if (!jform_vvvvwafwae_required)
+		if (!jform_vvvvwafwaf_required)
 		{
 			updateFieldRequired('article',1);
 			jQuery('#jform_article').removeAttr('required');
 			jQuery('#jform_article').removeAttr('aria-required');
 			jQuery('#jform_article').removeClass('required');
-			jform_vvvvwafwae_required = true;
+			jform_vvvvwafwaf_required = true;
 		}
 	}
 }
@ -244,26 +244,26 @@ function vvvvwag(type_vvvvwag)
 	if (type)
 	{
 		jQuery('#jform_content-lbl').closest('.control-group').show();
-		if (jform_vvvvwagwaf_required)
+		if (jform_vvvvwagwag_required)
 		{
 			updateFieldRequired('content',0);
 			jQuery('#jform_content').prop('required','required');
 			jQuery('#jform_content').attr('aria-required',true);
 			jQuery('#jform_content').addClass('required');
-			jform_vvvvwagwaf_required = false;
+			jform_vvvvwagwag_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_content-lbl').closest('.control-group').hide();
-		if (!jform_vvvvwagwaf_required)
+		if (!jform_vvvvwagwag_required)
 		{
 			updateFieldRequired('content',1);
 			jQuery('#jform_content').removeAttr('required');
 			jQuery('#jform_content').removeAttr('aria-required');
 			jQuery('#jform_content').removeClass('required');
-			jform_vvvvwagwaf_required = true;
+			jform_vvvvwagwag_required = true;
 		}
 	}
 }
@ -286,26 +286,26 @@ function vvvvwah(target_vvvvwah)
 	if (target_vvvvwah == 1)
 	{
 		jQuery('#jform_groups').closest('.control-group').show();
-		if (jform_vvvvwahwag_required)
+		if (jform_vvvvwahwah_required)
 		{
 			updateFieldRequired('groups',0);
 			jQuery('#jform_groups').prop('required','required');
 			jQuery('#jform_groups').attr('aria-required',true);
 			jQuery('#jform_groups').addClass('required');
-			jform_vvvvwahwag_required = false;
+			jform_vvvvwahwah_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_groups').closest('.control-group').hide();
-		if (!jform_vvvvwahwag_required)
+		if (!jform_vvvvwahwah_required)
 		{
 			updateFieldRequired('groups',1);
 			jQuery('#jform_groups').removeAttr('required');
 			jQuery('#jform_groups').removeAttr('aria-required');
 			jQuery('#jform_groups').removeClass('required');
-			jform_vvvvwahwag_required = true;
+			jform_vvvvwahwah_required = true;
 		}
 	}
 }
--- a/admin/models/forms/joomla_component.js
+++ b/admin/models/forms/joomla_component.js
@ -9,7 +9,7 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 314 of this MVC
+	@version		@update number 318 of this MVC
 	@build			5th April, 2017
 	@created		6th May, 2015
 	@package		Component Builder
--- a/admin/models/forms/language_translation.js
+++ b/admin/models/forms/language_translation.js
@ -9,7 +9,7 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 30 of this MVC
+	@version		@update number 35 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
--- a/admin/models/forms/language_translation.xml
+++ b/admin/models/forms/language_translation.xml
@ -104,17 +104,6 @@
 			readonly="true"
 			disabled="true"
 		/>
-		<!-- Components Field. Type: Components. (custom) -->
-		<field
-			type="components"
-			name="components"
-			label="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_COMPONENTS_LABEL"
-			class="list_class"
-			multiple="true"
-			default="0"
-			required="true"
-			button="true"
-		/>
 		<!-- Translation Field. Type: Repeatable. (joomla) -->
 		<field
 			type="repeatable"
@ -154,6 +143,17 @@
 				</fieldset>
 			</fields>
 		</field>
+		<!-- Components Field. Type: Components. (custom) -->
+		<field
+			type="components"
+			name="components"
+			label="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_COMPONENTS_LABEL"
+			class="list_class"
+			multiple="true"
+			default="0"
+			required="true"
+			button="true"
+		/>
 	</fieldset>
 	
 	<!-- Access Control Fields. -->
--- a/admin/models/forms/layout.js
+++ b/admin/models/forms/layout.js
@ -23,7 +23,7 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/

 // Some Global Values
-jform_vvvvvyrvyu_required = false;
+jform_vvvvvyrvyv_required = false;

 // Initial Script
 jQuery(document).ready(function()
@ -39,26 +39,26 @@ function vvvvvyr(add_php_view_vvvvvyr)
 	if (add_php_view_vvvvvyr == 1)
 	{
 		jQuery('#jform_php_view').closest('.control-group').show();
-		if (jform_vvvvvyrvyu_required)
+		if (jform_vvvvvyrvyv_required)
 		{
 			updateFieldRequired('php_view',0);
 			jQuery('#jform_php_view').prop('required','required');
 			jQuery('#jform_php_view').attr('aria-required',true);
 			jQuery('#jform_php_view').addClass('required');
-			jform_vvvvvyrvyu_required = false;
+			jform_vvvvvyrvyv_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_php_view').closest('.control-group').hide();
-		if (!jform_vvvvvyrvyu_required)
+		if (!jform_vvvvvyrvyv_required)
 		{
 			updateFieldRequired('php_view',1);
 			jQuery('#jform_php_view').removeAttr('required');
 			jQuery('#jform_php_view').removeAttr('aria-required');
 			jQuery('#jform_php_view').removeClass('required');
-			jform_vvvvvyrvyu_required = true;
+			jform_vvvvvyrvyv_required = true;
 		}
 	}
 }
--- a/admin/models/forms/site_view.js
+++ b/admin/models/forms/site_view.js
@ -23,16 +23,16 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/

 // Some Global Values
-jform_vvvvvyhvyi_required = false;
-jform_vvvvvyivyj_required = false;
-jform_vvvvvyjvyk_required = false;
-jform_vvvvvykvyl_required = false;
-jform_vvvvvylvym_required = false;
-jform_vvvvvymvyn_required = false;
-jform_vvvvvynvyo_required = false;
-jform_vvvvvyovyp_required = false;
-jform_vvvvvypvyq_required = false;
+jform_vvvvvyhvyj_required = false;
+jform_vvvvvyivyk_required = false;
+jform_vvvvvyjvyl_required = false;
+jform_vvvvvykvym_required = false;
+jform_vvvvvylvyn_required = false;
+jform_vvvvvymvyo_required = false;
+jform_vvvvvynvyp_required = false;
+jform_vvvvvyovyq_required = false;
 jform_vvvvvypvyr_required = false;
+jform_vvvvvypvys_required = false;

 // Initial Script
 jQuery(document).ready(function()
@ -72,26 +72,26 @@ function vvvvvyh(add_php_view_vvvvvyh)
 	if (add_php_view_vvvvvyh == 1)
 	{
 		jQuery('#jform_php_view').closest('.control-group').show();
-		if (jform_vvvvvyhvyi_required)
+		if (jform_vvvvvyhvyj_required)
 		{
 			updateFieldRequired('php_view',0);
 			jQuery('#jform_php_view').prop('required','required');
 			jQuery('#jform_php_view').attr('aria-required',true);
 			jQuery('#jform_php_view').addClass('required');
-			jform_vvvvvyhvyi_required = false;
+			jform_vvvvvyhvyj_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_php_view').closest('.control-group').hide();
-		if (!jform_vvvvvyhvyi_required)
+		if (!jform_vvvvvyhvyj_required)
 		{
 			updateFieldRequired('php_view',1);
 			jQuery('#jform_php_view').removeAttr('required');
 			jQuery('#jform_php_view').removeAttr('aria-required');
 			jQuery('#jform_php_view').removeClass('required');
-			jform_vvvvvyhvyi_required = true;
+			jform_vvvvvyhvyj_required = true;
 		}
 	}
 }
@ -103,26 +103,26 @@ function vvvvvyi(add_php_jview_display_vvvvvyi)
 	if (add_php_jview_display_vvvvvyi == 1)
 	{
 		jQuery('#jform_php_jview_display').closest('.control-group').show();
-		if (jform_vvvvvyivyj_required)
+		if (jform_vvvvvyivyk_required)
 		{
 			updateFieldRequired('php_jview_display',0);
 			jQuery('#jform_php_jview_display').prop('required','required');
 			jQuery('#jform_php_jview_display').attr('aria-required',true);
 			jQuery('#jform_php_jview_display').addClass('required');
-			jform_vvvvvyivyj_required = false;
+			jform_vvvvvyivyk_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_php_jview_display').closest('.control-group').hide();
-		if (!jform_vvvvvyivyj_required)
+		if (!jform_vvvvvyivyk_required)
 		{
 			updateFieldRequired('php_jview_display',1);
 			jQuery('#jform_php_jview_display').removeAttr('required');
 			jQuery('#jform_php_jview_display').removeAttr('aria-required');
 			jQuery('#jform_php_jview_display').removeClass('required');
-			jform_vvvvvyivyj_required = true;
+			jform_vvvvvyivyk_required = true;
 		}
 	}
 }
@ -134,26 +134,26 @@ function vvvvvyj(add_php_jview_vvvvvyj)
 	if (add_php_jview_vvvvvyj == 1)
 	{
 		jQuery('#jform_php_jview').closest('.control-group').show();
-		if (jform_vvvvvyjvyk_required)
+		if (jform_vvvvvyjvyl_required)
 		{
 			updateFieldRequired('php_jview',0);
 			jQuery('#jform_php_jview').prop('required','required');
 			jQuery('#jform_php_jview').attr('aria-required',true);
 			jQuery('#jform_php_jview').addClass('required');
-			jform_vvvvvyjvyk_required = false;
+			jform_vvvvvyjvyl_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_php_jview').closest('.control-group').hide();
-		if (!jform_vvvvvyjvyk_required)
+		if (!jform_vvvvvyjvyl_required)
 		{
 			updateFieldRequired('php_jview',1);
 			jQuery('#jform_php_jview').removeAttr('required');
 			jQuery('#jform_php_jview').removeAttr('aria-required');
 			jQuery('#jform_php_jview').removeClass('required');
-			jform_vvvvvyjvyk_required = true;
+			jform_vvvvvyjvyl_required = true;
 		}
 	}
 }
@ -165,26 +165,26 @@ function vvvvvyk(add_php_document_vvvvvyk)
 	if (add_php_document_vvvvvyk == 1)
 	{
 		jQuery('#jform_php_document').closest('.control-group').show();
-		if (jform_vvvvvykvyl_required)
+		if (jform_vvvvvykvym_required)
 		{
 			updateFieldRequired('php_document',0);
 			jQuery('#jform_php_document').prop('required','required');
 			jQuery('#jform_php_document').attr('aria-required',true);
 			jQuery('#jform_php_document').addClass('required');
-			jform_vvvvvykvyl_required = false;
+			jform_vvvvvykvym_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_php_document').closest('.control-group').hide();
-		if (!jform_vvvvvykvyl_required)
+		if (!jform_vvvvvykvym_required)
 		{
 			updateFieldRequired('php_document',1);
 			jQuery('#jform_php_document').removeAttr('required');
 			jQuery('#jform_php_document').removeAttr('aria-required');
 			jQuery('#jform_php_document').removeClass('required');
-			jform_vvvvvykvyl_required = true;
+			jform_vvvvvykvym_required = true;
 		}
 	}
 }
@ -196,26 +196,26 @@ function vvvvvyl(add_css_document_vvvvvyl)
 	if (add_css_document_vvvvvyl == 1)
 	{
 		jQuery('#jform_css_document').closest('.control-group').show();
-		if (jform_vvvvvylvym_required)
+		if (jform_vvvvvylvyn_required)
 		{
 			updateFieldRequired('css_document',0);
 			jQuery('#jform_css_document').prop('required','required');
 			jQuery('#jform_css_document').attr('aria-required',true);
 			jQuery('#jform_css_document').addClass('required');
-			jform_vvvvvylvym_required = false;
+			jform_vvvvvylvyn_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_css_document').closest('.control-group').hide();
-		if (!jform_vvvvvylvym_required)
+		if (!jform_vvvvvylvyn_required)
 		{
 			updateFieldRequired('css_document',1);
 			jQuery('#jform_css_document').removeAttr('required');
 			jQuery('#jform_css_document').removeAttr('aria-required');
 			jQuery('#jform_css_document').removeClass('required');
-			jform_vvvvvylvym_required = true;
+			jform_vvvvvylvyn_required = true;
 		}
 	}
 }
@ -227,26 +227,26 @@ function vvvvvym(add_js_document_vvvvvym)
 	if (add_js_document_vvvvvym == 1)
 	{
 		jQuery('#jform_js_document').closest('.control-group').show();
-		if (jform_vvvvvymvyn_required)
+		if (jform_vvvvvymvyo_required)
 		{
 			updateFieldRequired('js_document',0);
 			jQuery('#jform_js_document').prop('required','required');
 			jQuery('#jform_js_document').attr('aria-required',true);
 			jQuery('#jform_js_document').addClass('required');
-			jform_vvvvvymvyn_required = false;
+			jform_vvvvvymvyo_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_js_document').closest('.control-group').hide();
-		if (!jform_vvvvvymvyn_required)
+		if (!jform_vvvvvymvyo_required)
 		{
 			updateFieldRequired('js_document',1);
 			jQuery('#jform_js_document').removeAttr('required');
 			jQuery('#jform_js_document').removeAttr('aria-required');
 			jQuery('#jform_js_document').removeClass('required');
-			jform_vvvvvymvyn_required = true;
+			jform_vvvvvymvyo_required = true;
 		}
 	}
 }
@ -258,26 +258,26 @@ function vvvvvyn(add_css_vvvvvyn)
 	if (add_css_vvvvvyn == 1)
 	{
 		jQuery('#jform_css').closest('.control-group').show();
-		if (jform_vvvvvynvyo_required)
+		if (jform_vvvvvynvyp_required)
 		{
 			updateFieldRequired('css',0);
 			jQuery('#jform_css').prop('required','required');
 			jQuery('#jform_css').attr('aria-required',true);
 			jQuery('#jform_css').addClass('required');
-			jform_vvvvvynvyo_required = false;
+			jform_vvvvvynvyp_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_css').closest('.control-group').hide();
-		if (!jform_vvvvvynvyo_required)
+		if (!jform_vvvvvynvyp_required)
 		{
 			updateFieldRequired('css',1);
 			jQuery('#jform_css').removeAttr('required');
 			jQuery('#jform_css').removeAttr('aria-required');
 			jQuery('#jform_css').removeClass('required');
-			jform_vvvvvynvyo_required = true;
+			jform_vvvvvynvyp_required = true;
 		}
 	}
 }
@ -290,13 +290,13 @@ function vvvvvyo(add_php_ajax_vvvvvyo)
 	{
 		jQuery('#jform_ajax_input').closest('.control-group').show();
 		jQuery('#jform_php_ajaxmethod').closest('.control-group').show();
-		if (jform_vvvvvyovyp_required)
+		if (jform_vvvvvyovyq_required)
 		{
 			updateFieldRequired('php_ajaxmethod',0);
 			jQuery('#jform_php_ajaxmethod').prop('required','required');
 			jQuery('#jform_php_ajaxmethod').attr('aria-required',true);
 			jQuery('#jform_php_ajaxmethod').addClass('required');
-			jform_vvvvvyovyp_required = false;
+			jform_vvvvvyovyq_required = false;
 		}

 	}
@ -304,13 +304,13 @@ function vvvvvyo(add_php_ajax_vvvvvyo)
 	{
 		jQuery('#jform_ajax_input').closest('.control-group').hide();
 		jQuery('#jform_php_ajaxmethod').closest('.control-group').hide();
-		if (!jform_vvvvvyovyp_required)
+		if (!jform_vvvvvyovyq_required)
 		{
 			updateFieldRequired('php_ajaxmethod',1);
 			jQuery('#jform_php_ajaxmethod').removeAttr('required');
 			jQuery('#jform_php_ajaxmethod').removeAttr('aria-required');
 			jQuery('#jform_php_ajaxmethod').removeClass('required');
-			jform_vvvvvyovyp_required = true;
+			jform_vvvvvyovyq_required = true;
 		}
 	}
 }
@ -323,23 +323,23 @@ function vvvvvyp(add_custom_button_vvvvvyp)
 	{
 		jQuery('#jform_custom_button').closest('.control-group').show();
 		jQuery('#jform_php_controller').closest('.control-group').show();
-		if (jform_vvvvvypvyq_required)
+		if (jform_vvvvvypvyr_required)
 		{
 			updateFieldRequired('php_controller',0);
 			jQuery('#jform_php_controller').prop('required','required');
 			jQuery('#jform_php_controller').attr('aria-required',true);
 			jQuery('#jform_php_controller').addClass('required');
-			jform_vvvvvypvyq_required = false;
+			jform_vvvvvypvyr_required = false;
 		}

 		jQuery('#jform_php_model').closest('.control-group').show();
-		if (jform_vvvvvypvyr_required)
+		if (jform_vvvvvypvys_required)
 		{
 			updateFieldRequired('php_model',0);
 			jQuery('#jform_php_model').prop('required','required');
 			jQuery('#jform_php_model').attr('aria-required',true);
 			jQuery('#jform_php_model').addClass('required');
-			jform_vvvvvypvyr_required = false;
+			jform_vvvvvypvys_required = false;
 		}

 	}
@ -347,22 +347,22 @@ function vvvvvyp(add_custom_button_vvvvvyp)
 	{
 		jQuery('#jform_custom_button').closest('.control-group').hide();
 		jQuery('#jform_php_controller').closest('.control-group').hide();
-		if (!jform_vvvvvypvyq_required)
+		if (!jform_vvvvvypvyr_required)
 		{
 			updateFieldRequired('php_controller',1);
 			jQuery('#jform_php_controller').removeAttr('required');
 			jQuery('#jform_php_controller').removeAttr('aria-required');
 			jQuery('#jform_php_controller').removeClass('required');
-			jform_vvvvvypvyq_required = true;
+			jform_vvvvvypvyr_required = true;
 		}
 		jQuery('#jform_php_model').closest('.control-group').hide();
-		if (!jform_vvvvvypvyr_required)
+		if (!jform_vvvvvypvys_required)
 		{
 			updateFieldRequired('php_model',1);
 			jQuery('#jform_php_model').removeAttr('required');
 			jQuery('#jform_php_model').removeAttr('aria-required');
 			jQuery('#jform_php_model').removeClass('required');
-			jform_vvvvvypvyr_required = true;
+			jform_vvvvvypvys_required = true;
 		}
 	}
 }
--- a/admin/models/forms/template.js
+++ b/admin/models/forms/template.js
@ -23,7 +23,7 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/

 // Some Global Values
-jform_vvvvvyqvyt_required = false;
+jform_vvvvvyqvyu_required = false;

 // Initial Script
 jQuery(document).ready(function()
@ -39,26 +39,26 @@ function vvvvvyq(add_php_view_vvvvvyq)
 	if (add_php_view_vvvvvyq == 1)
 	{
 		jQuery('#jform_php_view').closest('.control-group').show();
-		if (jform_vvvvvyqvyt_required)
+		if (jform_vvvvvyqvyu_required)
 		{
 			updateFieldRequired('php_view',0);
 			jQuery('#jform_php_view').prop('required','required');
 			jQuery('#jform_php_view').attr('aria-required',true);
 			jQuery('#jform_php_view').addClass('required');
-			jform_vvvvvyqvyt_required = false;
+			jform_vvvvvyqvyu_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_php_view').closest('.control-group').hide();
-		if (!jform_vvvvvyqvyt_required)
+		if (!jform_vvvvvyqvyu_required)
 		{
 			updateFieldRequired('php_view',1);
 			jQuery('#jform_php_view').removeAttr('required');
 			jQuery('#jform_php_view').removeAttr('aria-required');
 			jQuery('#jform_php_view').removeClass('required');
-			jform_vvvvvyqvyt_required = true;
+			jform_vvvvvyqvyu_required = true;
 		}
 	}
 }
--- a/admin/models/joomla_component.php
+++ b/admin/models/joomla_component.php
@ -10,7 +10,7 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 314 of this MVC
+	@version		@update number 318 of this MVC
 	@build			5th April, 2017
 	@created		6th May, 2015
 	@package		Component Builder
@ -223,6 +223,7 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 		$this->idvvvv = $item->addadmin_views;
 		$this->idvvvw = $item->addcustom_admin_views;
 		$this->idvvvx = $item->addsite_views;
+		$this->componentsvvvy = $item->id;

 		return $item;
 	}
@ -511,6 +512,128 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 		return false;
 	}

+	/**
+	* Method to get list data.
+	*
+	* @return mixed  An array of data items on success, false on failure.
+	*/
+	public function getVwptranslation()
+	{
+		// Get the user object.
+		$user = JFactory::getUser();
+		// Create a new query object.
+		$db = JFactory::getDBO();
+		$query = $db->getQuery(true);
+
+		// Select some fields
+		$query->select('a.*');
+
+		// From the componentbuilder_language_translation table
+		$query->from($db->quoteName('#__componentbuilder_language_translation', 'a'));
+
+		// Join over the asset groups.
+		$query->select('ag.title AS access_level');
+		$query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');
+		// Filter by access level.
+		if ($access = $this->getState('filter.access'))
+		{
+			$query->where('a.access = ' . (int) $access);
+		}
+		// Implement View Level Access
+		if (!$user->authorise('core.options', 'com_componentbuilder'))
+		{
+			$groups = implode(',', $user->getAuthorisedViewLevels());
+			$query->where('a.access IN (' . $groups . ')');
+		}
+
+		// Order the results by ordering
+		$query->order('a.published  ASC');
+		$query->order('a.ordering  ASC');
+
+		// Load the items
+		$db->setQuery($query);
+		$db->execute();
+		if ($db->getNumRows())
+		{
+			$items = $db->loadObjectList();
+
+			// set values to display correctly.
+			if (ComponentbuilderHelper::checkArray($items))
+			{
+				// get user object.
+				$user = JFactory::getUser();
+				foreach ($items as $nr => &$item)
+				{
+					$access = ($user->authorise('language_translation.access', 'com_componentbuilder.language_translation.' . (int) $item->id) && $user->authorise('language_translation.access', 'com_componentbuilder'));
+					if (!$access)
+					{
+						unset($items[$nr]);
+						continue;
+					}
+
+				}
+			}
+
+			// Filter by componentsvvvy Array Field
+			$componentsvvvy = $this->componentsvvvy;
+			if (ComponentbuilderHelper::checkArray($items) && $componentsvvvy)
+			{
+				foreach ($items as $nr => &$item)
+				{
+					if (ComponentbuilderHelper::checkJson($item->components))
+					{
+						$item->components = json_decode($item->components, true);
+					}
+					elseif (!isset($item->components) || !ComponentbuilderHelper::checkArray($item->components))
+					{
+						unset($items[$nr]);
+						continue;
+					}
+					if (!in_array($componentsvvvy,$item->components))
+					{
+						unset($items[$nr]);
+						continue;
+					}
+				}
+			}
+			else
+			{
+				return false;
+			}
+
+				// show all languages that are already set for this string
+			if (!isset($_export) && ComponentbuilderHelper::checkArray($items))
+			{
+				foreach ($items as $nr => &$item)
+				{
+					$langBucket = array();
+					if (ComponentbuilderHelper::checkJson($item->translation))
+					{
+						$translations = json_decode($item->translation, true);
+						if (ComponentbuilderHelper::checkArray($translations) && isset($translations['language']) && ComponentbuilderHelper::checkArray($translations['language']))
+						{
+							foreach ($translations['language'] as $language)
+							{
+								$langBucket[$language] = $language;
+							}
+						}
+					}
+					// load the languages to the string
+					if (ComponentbuilderHelper::checkArray($langBucket))
+					{
+						$item->entranslation = '<small><em>(' . implode(', ', $langBucket) . ')</em></small> ' . ComponentbuilderHelper::htmlEscape($item->entranslation, 'UTF-8', true, 150);
+					}
+					else
+					{
+						$item->entranslation = '<small><em>(' . JText::_('COM_COMPONENTBUILDER_NOTRANSLATION') . ')</em></small> ' . ComponentbuilderHelper::htmlEscape($item->entranslation, 'UTF-8', true, 150);
+					}
+				}
+			}
+			return $items;
+		}
+		return false;
+	} 
+
 	/**
 	 * Method to get the record form.
 	 *
--- a/admin/models/joomla_components.php
+++ b/admin/models/joomla_components.php
@ -10,7 +10,7 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 314 of this MVC
+	@version		@update number 318 of this MVC
 	@build			5th April, 2017
 	@created		6th May, 2015
 	@package		Component Builder
--- a/admin/models/language_translation.php
+++ b/admin/models/language_translation.php
@ -10,7 +10,7 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 30 of this MVC
+	@version		@update number 35 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
--- a/admin/models/language_translations.php
+++ b/admin/models/language_translations.php
@ -10,7 +10,7 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 30 of this MVC
+	@version		@update number 35 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
@ -117,10 +117,36 @@ class ComponentbuilderModelLanguage_translations extends JModelList
 					continue;
 				}

-				// convert components
-				$item->components = ComponentbuilderHelper::jsonToString($item->components, ', ', 'joomla_component');
 			}
 		}  
+			// show all languages that are already set for this string
+			if (!isset($_export) && ComponentbuilderHelper::checkArray($items))
+			{
+				foreach ($items as $nr => &$item)
+				{
+					$langBucket = array();
+					if (ComponentbuilderHelper::checkJson($item->translation))
+					{
+						$translations = json_decode($item->translation, true);
+						if (ComponentbuilderHelper::checkArray($translations) && isset($translations['language']) && ComponentbuilderHelper::checkArray($translations['language']))
+						{
+							foreach ($translations['language'] as $language)
+							{
+								$langBucket[$language] = $language;
+							}
+						}
+					}
+					// load the languages to the string
+					if (ComponentbuilderHelper::checkArray($langBucket))
+					{
+						$item->entranslation = '<small><em>(' . implode(', ', $langBucket) . ')</em></small> ' . ComponentbuilderHelper::htmlEscape($item->entranslation, 'UTF-8', true, 150);
+					}
+					else
+					{
+						$item->entranslation = '<small><em>(' . JText::_('COM_COMPONENTBUILDER_NOTRANSLATION') . ')</em></small> ' . ComponentbuilderHelper::htmlEscape($item->entranslation, 'UTF-8', true, 150);
+					}
+				}
+			}
        
 		// return items
 		return $items;
@ -264,6 +290,35 @@ class ComponentbuilderModelLanguage_translations extends JModelList
 				{
 					array_unshift($items,$headers);
 				}
+
+					// show all languages that are already set for this string
+			if (!isset($_export) && ComponentbuilderHelper::checkArray($items))
+			{
+				foreach ($items as $nr => &$item)
+				{
+					$langBucket = array();
+					if (ComponentbuilderHelper::checkJson($item->translation))
+					{
+						$translations = json_decode($item->translation, true);
+						if (ComponentbuilderHelper::checkArray($translations) && isset($translations['language']) && ComponentbuilderHelper::checkArray($translations['language']))
+						{
+							foreach ($translations['language'] as $language)
+							{
+								$langBucket[$language] = $language;
+							}
+						}
+					}
+					// load the languages to the string
+					if (ComponentbuilderHelper::checkArray($langBucket))
+					{
+						$item->entranslation = '<small><em>(' . implode(', ', $langBucket) . ')</em></small> ' . ComponentbuilderHelper::htmlEscape($item->entranslation, 'UTF-8', true, 150);
+					}
+					else
+					{
+						$item->entranslation = '<small><em>(' . JText::_('COM_COMPONENTBUILDER_NOTRANSLATION') . ')</em></small> ' . ComponentbuilderHelper::htmlEscape($item->entranslation, 'UTF-8', true, 150);
+					}
+				}
+			}
 				return $items;
 			}
 		}
--- a/admin/models/site_view.php
+++ b/admin/models/site_view.php
@ -175,7 +175,7 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 				$item->tags->getTagIds($item->id, 'com_componentbuilder.site_view');
 			}
 		}
-		$this->addsite_viewsvvwb = $item->id;
+		$this->addsite_viewsvvwc = $item->id;

 		return $item;
 	}
@ -185,7 +185,7 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 	*
 	* @return mixed  An array of data items on success, false on failure.
 	*/
-	public function getVyslinked_components()
+	public function getVytlinked_components()
 	{
 		// Get the user object.
 		$user = JFactory::getUser();
@ -225,15 +225,15 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 		{
 			$items = $db->loadObjectList();

-			// Filter by addsite_viewsvvwb in this Repetable Field
-			if (ComponentbuilderHelper::checkArray($items) && isset($this->addsite_viewsvvwb))
+			// Filter by addsite_viewsvvwc in this Repetable Field
+			if (ComponentbuilderHelper::checkArray($items) && isset($this->addsite_viewsvvwc))
 			{
 				foreach ($items as $nr => &$item)
 				{
 					if (isset($item->addsite_views) && ComponentbuilderHelper::checkJson($item->addsite_views))
 					{
 						$tmpArray = json_decode($item->addsite_views,true);
-						if (!in_array($this->addsite_viewsvvwb, $tmpArray['siteview']))
+						if (!in_array($this->addsite_viewsvvwc, $tmpArray['siteview']))
 						{
 							unset($items[$nr]);
 							continue;
--- a/admin/tables/joomla_component.php
+++ b/admin/tables/joomla_component.php
@ -10,7 +10,7 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 314 of this MVC
+	@version		@update number 318 of this MVC
 	@build			5th April, 2017
 	@created		6th May, 2015
 	@package		Component Builder
--- a/admin/tables/language_translation.php
+++ b/admin/tables/language_translation.php
@ -10,7 +10,7 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 30 of this MVC
+	@version		@update number 35 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
--- a/admin/views/admin_view/view.html.php
+++ b/admin/views/admin_view/view.html.php
@ -71,10 +71,10 @@ class ComponentbuilderViewAdmin_view extends JViewLegacy
                }

 		// Get Linked view data
-		$this->vxwfields		= $this->get('Vxwfields');
+		$this->vxxfields		= $this->get('Vxxfields');

 		// Get Linked view data
-		$this->vxxlinked_components		= $this->get('Vxxlinked_components');
+		$this->vxylinked_components		= $this->get('Vxylinked_components');

 		// Set the toolbar
 		$this->addToolBar();
--- a/admin/views/custom_admin_view/view.html.php
+++ b/admin/views/custom_admin_view/view.html.php
@ -71,7 +71,7 @@ class ComponentbuilderViewCustom_admin_view extends JViewLegacy
                }

 		// Get Linked view data
-		$this->vyhlinked_components		= $this->get('Vyhlinked_components');
+		$this->vyilinked_components		= $this->get('Vyilinked_components');

 		// Set the toolbar
 		$this->addToolBar();
--- a/admin/views/field/view.html.php
+++ b/admin/views/field/view.html.php
@ -71,7 +71,7 @@ class ComponentbuilderViewField extends JViewLegacy
                }

 		// Get Linked view data
-		$this->vzzlinked_admin_views		= $this->get('Vzzlinked_admin_views');
+		$this->waalinked_admin_views		= $this->get('Waalinked_admin_views');

 		// Set the toolbar
 		$this->addToolBar();
--- a/admin/views/fieldtype/view.html.php
+++ b/admin/views/fieldtype/view.html.php
@ -71,7 +71,7 @@ class ComponentbuilderViewFieldtype extends JViewLegacy
                }

 		// Get Linked view data
-		$this->waafields		= $this->get('Waafields');
+		$this->wabfields		= $this->get('Wabfields');

 		// Set the toolbar
 		$this->addToolBar();
--- a/admin/views/joomla_component/submitbutton.js
+++ b/admin/views/joomla_component/submitbutton.js
@ -9,7 +9,7 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 314 of this MVC
+	@version		@update number 318 of this MVC
 	@build			5th April, 2017
 	@created		6th May, 2015
 	@package		Component Builder
--- a/admin/views/joomla_component/tmpl/edit.php
+++ b/admin/views/joomla_component/tmpl/edit.php
@ -10,7 +10,7 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 314 of this MVC
+	@version		@update number 318 of this MVC
 	@build			5th April, 2017
 	@created		6th May, 2015
 	@package		Component Builder
@ -181,6 +181,18 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 		</div>
 	<?php echo JHtml::_('bootstrap.endTab'); ?>

+	<?php if ($this->canDo->get('language_translation.access')) : ?>
+	<?php echo JHtml::_('bootstrap.addTab', 'joomla_componentTab', 'translation', JText::_('COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TRANSLATION', true)); ?>
+		<div class="row-fluid form-horizontal-desktop">
+		</div>
+		<div class="row-fluid form-horizontal-desktop">
+			<div class="span12">
+				<?php echo JLayoutHelper::render('joomla_component.translation_fullwidth', $this); ?>
+			</div>
+		</div>
+	<?php echo JHtml::_('bootstrap.endTab'); ?>
+	<?php endif; ?>
+
 	<?php if ($this->canDo->get('core.delete') || $this->canDo->get('core.edit.created_by') || $this->canDo->get('core.edit.state') || $this->canDo->get('core.edit.created')) : ?>
 	<?php echo JHtml::_('bootstrap.addTab', 'joomla_componentTab', 'publishing', JText::_('COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PUBLISHING', true)); ?>
 		<div class="row-fluid form-horizontal-desktop">
--- a/admin/views/joomla_component/view.html.php
+++ b/admin/views/joomla_component/view.html.php
@ -10,7 +10,7 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 314 of this MVC
+	@version		@update number 318 of this MVC
 	@build			5th April, 2017
 	@created		6th May, 2015
 	@package		Component Builder
@ -79,6 +79,9 @@ class ComponentbuilderViewJoomla_component extends JViewLegacy
 		// Get Linked view data
 		$this->vwosite_views		= $this->get('Vwosite_views');

+		// Get Linked view data
+		$this->vwptranslation		= $this->get('Vwptranslation');
+
 		// Set the toolbar
 		$this->addToolBar();

--- a/admin/views/joomla_components/tmpl/default.php
+++ b/admin/views/joomla_components/tmpl/default.php
@ -10,7 +10,7 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 314 of this MVC
+	@version		@update number 318 of this MVC
 	@build			5th April, 2017
 	@created		6th May, 2015
 	@package		Component Builder
--- a/admin/views/joomla_components/tmpl/default_batch_body.php
+++ b/admin/views/joomla_components/tmpl/default_batch_body.php
@ -10,7 +10,7 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 314 of this MVC
+	@version		@update number 318 of this MVC
 	@build			5th April, 2017
 	@created		6th May, 2015
 	@package		Component Builder
--- a/admin/views/joomla_components/tmpl/default_batch_footer.php
+++ b/admin/views/joomla_components/tmpl/default_batch_footer.php
@ -10,7 +10,7 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 314 of this MVC
+	@version		@update number 318 of this MVC
 	@build			5th April, 2017
 	@created		6th May, 2015
 	@package		Component Builder
--- a/admin/views/joomla_components/tmpl/default_body.php
+++ b/admin/views/joomla_components/tmpl/default_body.php
@ -10,7 +10,7 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 314 of this MVC
+	@version		@update number 318 of this MVC
 	@build			5th April, 2017
 	@created		6th May, 2015
 	@package		Component Builder
--- a/admin/views/joomla_components/tmpl/default_foot.php
+++ b/admin/views/joomla_components/tmpl/default_foot.php
@ -10,7 +10,7 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 314 of this MVC
+	@version		@update number 318 of this MVC
 	@build			5th April, 2017
 	@created		6th May, 2015
 	@package		Component Builder
--- a/admin/views/joomla_components/tmpl/default_head.php
+++ b/admin/views/joomla_components/tmpl/default_head.php
@ -10,7 +10,7 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 314 of this MVC
+	@version		@update number 318 of this MVC
 	@build			5th April, 2017
 	@created		6th May, 2015
 	@package		Component Builder
--- a/admin/views/joomla_components/tmpl/default_toolbar.php
+++ b/admin/views/joomla_components/tmpl/default_toolbar.php
@ -10,7 +10,7 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 314 of this MVC
+	@version		@update number 318 of this MVC
 	@build			5th April, 2017
 	@created		6th May, 2015
 	@package		Component Builder
--- a/admin/views/joomla_components/view.html.php
+++ b/admin/views/joomla_components/view.html.php
@ -10,7 +10,7 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 314 of this MVC
+	@version		@update number 318 of this MVC
 	@build			5th April, 2017
 	@created		6th May, 2015
 	@package		Component Builder
--- a/admin/views/language_translation/submitbutton.js
+++ b/admin/views/language_translation/submitbutton.js
@ -9,7 +9,7 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 30 of this MVC
+	@version		@update number 35 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
--- a/admin/views/language_translation/tmpl/edit.php
+++ b/admin/views/language_translation/tmpl/edit.php
@ -10,7 +10,7 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 30 of this MVC
+	@version		@update number 35 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
--- a/admin/views/language_translation/view.html.php
+++ b/admin/views/language_translation/view.html.php
@ -10,7 +10,7 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 30 of this MVC
+	@version		@update number 35 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
--- a/admin/views/language_translations/tmpl/default.php
+++ b/admin/views/language_translations/tmpl/default.php
@ -10,7 +10,7 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 30 of this MVC
+	@version		@update number 35 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
--- a/admin/views/language_translations/tmpl/default_batch_body.php
+++ b/admin/views/language_translations/tmpl/default_batch_body.php
@ -10,7 +10,7 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 30 of this MVC
+	@version		@update number 35 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
--- a/admin/views/language_translations/tmpl/default_batch_footer.php
+++ b/admin/views/language_translations/tmpl/default_batch_footer.php
@ -10,7 +10,7 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 30 of this MVC
+	@version		@update number 35 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
--- a/admin/views/language_translations/tmpl/default_body.php
+++ b/admin/views/language_translations/tmpl/default_body.php
@ -10,7 +10,7 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 30 of this MVC
+	@version		@update number 35 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
@ -77,18 +77,15 @@ $edit = "index.php?option=com_componentbuilder&view=language_translations&task=l
 		<td class="nowrap">
 			<?php if ($canDo->get('language_translation.edit')): ?>
 				<div class="name">
-					<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->entranslation); ?></a>
+					<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $item->entranslation; ?></a>
 					<?php if ($item->checked_out): ?>
 						<?php echo JHtml::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'language_translations.', $canCheckin); ?>
 					<?php endif; ?>
 				</div>
 			<?php else: ?>
-				<div class="name"><?php echo $this->escape($item->entranslation); ?></div>
+				<div class="name"><?php echo $item->entranslation; ?></div>
 			<?php endif; ?>
 		</td>
-		<td class="hidden-phone">
-			<?php echo $this->escape($item->components); ?>
-		</td>
 		<td class="center">
 		<?php if ($canDo->get('language_translation.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>
--- a/admin/views/language_translations/tmpl/default_foot.php
+++ b/admin/views/language_translations/tmpl/default_foot.php
@ -10,7 +10,7 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 30 of this MVC
+	@version		@update number 35 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
@ -28,5 +28,5 @@ defined('_JEXEC') or die('Restricted access');

 ?>
 <tr>
-	<td colspan="6"><?php echo $this->pagination->getListFooter(); ?></td>
+	<td colspan="5"><?php echo $this->pagination->getListFooter(); ?></td>
 </tr>
--- a/admin/views/language_translations/tmpl/default_head.php
+++ b/admin/views/language_translations/tmpl/default_head.php
@ -10,7 +10,7 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 30 of this MVC
+	@version		@update number 35 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
@ -46,9 +46,6 @@ defined('_JEXEC') or die('Restricted access');
 	<th class="nowrap" >
 			<?php echo JHtml::_('grid.sort', 'COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_ENTRANSLATION_LABEL', 'entranslation', $this->listDirn, $this->listOrder); ?>
 	</th>
-	<th class="nowrap hidden-phone" >
-			<?php echo JText::_('COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_COMPONENTS_LABEL'); ?>
-	</th>
 	<?php if ($this->canState): ?>
 		<th width="10" class="nowrap center" >
 			<?php echo JHtml::_('grid.sort', 'COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_STATUS', 'published', $this->listDirn, $this->listOrder); ?>
--- a/admin/views/language_translations/tmpl/default_toolbar.php
+++ b/admin/views/language_translations/tmpl/default_toolbar.php
@ -10,7 +10,7 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 30 of this MVC
+	@version		@update number 35 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
--- a/admin/views/language_translations/view.html.php
+++ b/admin/views/language_translations/view.html.php
@ -10,7 +10,7 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 30 of this MVC
+	@version		@update number 35 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
--- a/admin/views/site_view/view.html.php
+++ b/admin/views/site_view/view.html.php
@ -71,7 +71,7 @@ class ComponentbuilderViewSite_view extends JViewLegacy
                }

 		// Get Linked view data
-		$this->vyslinked_components		= $this->get('Vyslinked_components');
+		$this->vytlinked_components		= $this->get('Vytlinked_components');

 		// Set the toolbar
 		$this->addToolBar();