From 7a7a753cc4eb9822a0871fa5ef28c48d7e7e6a07 Mon Sep 17 00:00:00 2001
From: Michael Oehlhof <typo3@oehlhof.de>
Date: Thu, 29 Oct 2015 21:11:06 +0100
Subject: [PATCH] [TASK] compatibility6: Decouple language labels, styles and
 images

Resolves: #68084
Releases: master
Change-Id: I30da7acfc00da747508d20e754634dde60be6a7b
Reviewed-on: https://review.typo3.org/44375
Reviewed-by: Benni Mack <benni@typo3.org>
Tested-by: Benni Mack <benni@typo3.org>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
---
 .../Language/locallang_db_new_content_el.xlf  |   6 -
 .../WebFunctionWizardsBaseController.php      |   2 +-
 .../Controller/Wizard/FormsController.php     |  54 +-
 .../Container/FlexFormElementContainer.php    |   2 +-
 .../Configuration/TCA/Overrides/pages.php     |   6 +-
 .../TCA/Overrides/tt_content.php              | 128 +--
 .../Configuration/TypoScript/Form/setup.txt   |   2 +-
 .../Configuration/TypoScript/Search/setup.txt |  20 +-
 .../Resources/Private/Language/locallang.xlf  |  80 ++
 .../Private/Language/locallang_ttc.xlf        | 911 ++++++++++++++++++
 .../Private/Language/locallang_wizards.xlf    | 335 +++++++
 .../Resources/Public/Images/wizard_link.gif   | Bin 0 -> 582 bytes
 typo3/sysext/compatibility6/ext_localconf.php |   8 +-
 typo3/sysext/lang/locallang_tca.xlf           |   3 -
 14 files changed, 1433 insertions(+), 124 deletions(-)
 create mode 100644 typo3/sysext/compatibility6/Resources/Private/Language/locallang.xlf
 create mode 100644 typo3/sysext/compatibility6/Resources/Private/Language/locallang_ttc.xlf
 create mode 100644 typo3/sysext/compatibility6/Resources/Private/Language/locallang_wizards.xlf
 create mode 100644 typo3/sysext/compatibility6/Resources/Public/Images/wizard_link.gif

diff --git a/typo3/sysext/backend/Resources/Private/Language/locallang_db_new_content_el.xlf b/typo3/sysext/backend/Resources/Private/Language/locallang_db_new_content_el.xlf
index 76b87ef3d1e6..f1e74898f60a 100644
--- a/typo3/sysext/backend/Resources/Private/Language/locallang_db_new_content_el.xlf
+++ b/typo3/sysext/backend/Resources/Private/Language/locallang_db_new_content_el.xlf
@@ -99,12 +99,6 @@
 			<trans-unit id="forms_mail_description">
 				<source>A mail form allowing website users to submit responses.</source>
 			</trans-unit>
-			<trans-unit id="forms_search_title">
-				<source>Search Form</source>
-			</trans-unit>
-			<trans-unit id="forms_search_description">
-				<source>Draws a search form and the search result if a search is performed.</source>
-			</trans-unit>
 			<trans-unit id="forms_login_title">
 				<source>Login Form</source>
 			</trans-unit>
diff --git a/typo3/sysext/compatibility6/Classes/Controller/WebFunctionWizardsBaseController.php b/typo3/sysext/compatibility6/Classes/Controller/WebFunctionWizardsBaseController.php
index deeb232dfa0c..2e438aae7da7 100644
--- a/typo3/sysext/compatibility6/Classes/Controller/WebFunctionWizardsBaseController.php
+++ b/typo3/sysext/compatibility6/Classes/Controller/WebFunctionWizardsBaseController.php
@@ -49,7 +49,7 @@ class WebFunctionWizardsBaseController extends \TYPO3\CMS\Backend\Module\Abstrac
      */
     public function modMenu()
     {
-        $GLOBALS['LANG']->includeLLFile('EXT:func_wizards/locallang.xlf');
+        $GLOBALS['LANG']->includeLLFile('EXT:compatibility6/Resources/Private/Language/wizards.xlf');
         $modMenuAdd = array(
             $this->function_key => array()
         );
diff --git a/typo3/sysext/compatibility6/Classes/Controller/Wizard/FormsController.php b/typo3/sysext/compatibility6/Classes/Controller/Wizard/FormsController.php
index ab2edf00c1b9..4dacd43c02eb 100644
--- a/typo3/sysext/compatibility6/Classes/Controller/Wizard/FormsController.php
+++ b/typo3/sysext/compatibility6/Classes/Controller/Wizard/FormsController.php
@@ -172,7 +172,7 @@ class FormsController extends \TYPO3\CMS\Backend\Controller\Wizard\AbstractWizar
     public function __construct()
     {
         $this->iconFactory = GeneralUtility::makeInstance(IconFactory::class);
-        $this->getLanguageService()->includeLLFile('EXT:lang/locallang_wizards.xlf');
+        $this->getLanguageService()->includeLLFile('EXT:compatibility6/Resources/Private/Language/locallang_wizards.xlf');
         $GLOBALS['SOBE'] = $this;
 
         $this->init();
@@ -271,11 +271,11 @@ class FormsController extends \TYPO3\CMS\Backend\Controller\Wizard\AbstractWizar
             // CSH Buttons
             $buttons['csh_buttons'] = BackendUtility::cshItem('xMOD_csh_corebe', 'wizard_forms_wiz_buttons');
             // Close
-            $buttons['close'] = '<button class="c-inputButton" name="closedok" value="1" title=' . $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:rm.closeDoc', true) . '>' . $this->iconFactory->getIcon('actions-document-close', Icon::SIZE_SMALL)->render() . '</button>';
+            $buttons['close'] = '<button class="c-inputButton" name="closedok" value="1" title=' . $this->getLanguageService()->sL('LLL:EXT:compatibility6/Resources/Private/Language/locallang.xlf:closeDoc', true) . '>' . $this->iconFactory->getIcon('actions-document-close', Icon::SIZE_SMALL)->render() . '</button>';
             // Save
-            $buttons['save'] = '<button class="c-inputButton" name="savedok" value="1" title=' . $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:rm.saveDoc', true) . '>' . $this->iconFactory->getIcon('actions-document-save', Icon::SIZE_SMALL)->render() . '</button>';
+            $buttons['save'] = '<button class="c-inputButton" name="savedok" value="1" title=' . $this->getLanguageService()->sL('LLL:EXT:compatibility6/Resources/Private/Language/locallang.xlf:saveDoc', true) . '>' . $this->iconFactory->getIcon('actions-document-save', Icon::SIZE_SMALL)->render() . '</button>';
             // Save & Close
-            $buttons['save_close'] = '<button class="c-inputButton" name="saveandclosedok" value="1" title=' . $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:rm.saveCloseDoc', true) . '>' . $this->iconFactory->getIcon('actions-document-save-close', Icon::SIZE_SMALL)->render() . '</button>';
+            $buttons['save_close'] = '<button class="c-inputButton" name="saveandclosedok" value="1" title=' . $this->getLanguageService()->sL('LLL:EXT:compatibility6/Resources/Private/Language/locallang.xlf:saveCloseDoc', true) . '>' . $this->iconFactory->getIcon('actions-document-save-close', Icon::SIZE_SMALL)->render() . '</button>';
             // Reload
             $buttons['reload'] = '<button class="c-inputButton" name="_refresh" value="1" title="' . $this->getLanguageService()->getLL('forms_refresh', true) . '">' . $this->iconFactory->getIcon('actions-refresh', Icon::SIZE_SMALL)->render() . '</button>';
         }
@@ -394,10 +394,10 @@ class FormsController extends \TYPO3\CMS\Backend\Controller\Wizard\AbstractWizar
             $this->getLanguageService()->getLL('forms_config', true) . ':'
         );
         $tRows[] = '
-			<tr class="bgColor2" id="typo3-formWizardHeader">
-				<td>&nbsp;</td>
-				<td><strong>' . implode('</strong></td>
-				<td><strong>', $cells) . '</strong></td>
+			<tr id="typo3-formWizardHeader">
+				<th>&nbsp;</th>
+				<th><strong>' . implode('</strong></th>
+				<th><strong>', $cells) . '</strong></th>
 			</tr>';
         // Traverse the number of form elements:
         $k = 0;
@@ -499,7 +499,7 @@ class FormsController extends \TYPO3\CMS\Backend\Controller\Wizard\AbstractWizar
                         $ctrl .= '<button name="FORMCFG[row_top][' . ($k + 1) * 2 . ']"' . $onClick . ' title="' . $this->getLanguageService()->getLL('table_top', true) . '">' . $this->iconFactory->getIcon('actions-move-to-top', Icon::SIZE_SMALL)->render() . '</button>' . $brTag;
                         $ctrl .= '<button name="FORMCFG[row_up][' . ($k + 1) * 2 . ']"' . $onClick . ' title="' . $this->getLanguageService()->getLL('table_up', true) . '">' . $this->iconFactory->getIcon('actions-move-up', Icon::SIZE_SMALL)->render() . '</button>' . $brTag;
                     }
-                    $ctrl .= '<button name="FORMCFG[row_remove][' . ($k + 1) * 2 . ']" ' . $onClick . ' title = "' . $this->getLanguageService()->getLL('table_removeRow', true) . '">' . $this->iconFactory->getIcon('actions-edit-delete', Icon::SIZE_LARGE)->render() . '</button>' . $brTag;
+                    $ctrl .= '<button name="FORMCFG[row_remove][' . ($k + 1) * 2 . ']" ' . $onClick . ' title = "' . $this->getLanguageService()->getLL('table_removeRow', true) . '">' . $this->iconFactory->getIcon('actions-edit-delete', Icon::SIZE_SMALL)->render() . '</button>' . $brTag;
 
                     if ($k != (count($formCfgArray)/2)) {
                         $ctrl .= '<button name="FORMCFG[row_down][' . ($k + 1) * 2 . ']"' . $onClick . ' title="' . $this->getLanguageService()->getLL('table_down', true) . '">' . $this->iconFactory->getIcon('actions-move-down', Icon::SIZE_SMALL)->render() . '</button>' . $brTag;
@@ -509,11 +509,10 @@ class FormsController extends \TYPO3\CMS\Backend\Controller\Wizard\AbstractWizar
                     $ctrl .= '<button name="FORMCFG[row_add][' . ($k + 1) * 2 . ']"' . $onClick . ' title="' . $this->getLanguageService()->getLL('table_addRow', true) . '">' . $this->iconFactory->getIcon('actions-template-new', Icon::SIZE_SMALL)->render() . '</button>' . $brTag;
                     $ctrl = '<span class="c-wizButtonsV">' . $ctrl . '</span>';
                     // Finally, put together the full row from the generated content above:
-                    $bgC = $confData['type'] ? ' class="bgColor5"' : '';
                     $tRows[] = '
-						<tr' . $bgC . '>
+						<tr>
 							<td><a name="ANC_' . ($k + 1) * 2 . '"></a>' . $ctrl . '</td>
-							<td class="bgColor4">' . implode('</td>
+							<td>' . implode('</td>
 							<td valign="top">', $cells) . '</td>
 						</tr>';
                 }
@@ -533,14 +532,12 @@ class FormsController extends \TYPO3\CMS\Backend\Controller\Wizard\AbstractWizar
             // Header:
             $tRows[] = '
 				<tr>
-					<td colspan="2" class="bgColor2">&nbsp;</td>
-					<td colspan="2" class="bgColor2"><strong>' . $this->getLanguageService()->getLL('forms_special_eform', true) . ':</strong>' . BackendUtility::cshItem('xMOD_csh_corebe', 'wizard_forms_wiz_formmail_info') . '</td>
+					<th colspan="4"><h4>' . $this->getLanguageService()->getLL('forms_special_eform', true) . ': ' . BackendUtility::cshItem('xMOD_csh_corebe', 'wizard_forms_wiz_formmail_info') . '</h4></th>
 				</tr>';
             // "FORM type":
             $tRows[] = '
-				<tr class="bgColor5">
-					<td>&nbsp;</td>
-					<td class="bgColor4">&nbsp;</td>
+				<tr>
+					<td colspan="2">&nbsp;</td>
 					<td>' . $this->getLanguageService()->getLL('forms_eform_formtype_mail', true) . ':</td>
 					<td>
 						<input type="hidden" name="FORMCFG[c][' . 1000 * 2 . '][fieldname]" value="formtype_mail" />
@@ -550,9 +547,8 @@ class FormsController extends \TYPO3\CMS\Backend\Controller\Wizard\AbstractWizar
 				</tr>';
             // "Send HTML mail":
             $tRows[] = '
-				<tr class="bgColor5">
-					<td>&nbsp;</td>
-					<td class="bgColor4">&nbsp;</td>
+				<tr>
+					<td colspan="2">&nbsp;</td>
 					<td>' . $this->getLanguageService()->getLL('forms_eform_html_enabled', true) . ':</td>
 					<td>
 						<input type="hidden" name="FORMCFG[c][' . 1001 * 2 . '][fieldname]" value="html_enabled" />
@@ -562,9 +558,8 @@ class FormsController extends \TYPO3\CMS\Backend\Controller\Wizard\AbstractWizar
 				</tr>';
             // "Subject":
             $tRows[] = '
-				<tr class="bgColor5">
-					<td>&nbsp;</td>
-					<td class="bgColor4">&nbsp;</td>
+				<tr>
+					<td colspan="2">&nbsp;</td>
 					<td>' . $this->getLanguageService()->getLL('forms_eform_subject', true) . ':</td>
 					<td>
 						<input type="hidden" name="FORMCFG[c][' . 1002 * 2 . '][fieldname]" value="subject" />
@@ -574,9 +569,8 @@ class FormsController extends \TYPO3\CMS\Backend\Controller\Wizard\AbstractWizar
 				</tr>';
             // Recipient:
             $tRows[] = '
-				<tr class="bgColor5">
-					<td>&nbsp;</td>
-					<td class="bgColor4">&nbsp;</td>
+				<tr>
+					<td colspan="2">&nbsp;</td>
 					<td>' . $this->getLanguageService()->getLL('forms_eform_recipient', true) . ':</td>
 					<td>
 						<input type="text"' . $this->doc->formWidth(15) . ' name="FORMCFG[recipient]" value="' . htmlspecialchars($row['subheader']) . '" />
@@ -590,7 +584,7 @@ class FormsController extends \TYPO3\CMS\Backend\Controller\Wizard\AbstractWizar
 			<!--
 				Form wizard
 			-->
-			<table border="0" cellpadding="1" cellspacing="1" id="typo3-formwizard">
+			<table class="table table-bordered table-condensed" id="typo3-formwizard">
 				' . implode('', $tRows) . '
 			</table>';
         // Add hidden fields:
@@ -891,15 +885,13 @@ class FormsController extends \TYPO3\CMS\Backend\Controller\Wizard\AbstractWizar
 					<td>' . $c . '</td>
 				</tr>';
         }
-        // Add a cell which will set a minimum width:
         $lines[] = '
 			<tr>
-				<td nowrap="nowrap"><span style="width: 70px; height: 1px;"></span></td>
-				<td></td>
+				<td colspan="2"></td>
 			</tr>';
         // Wrap in table and return:
         return '
-			<table border="0" cellpadding="0" cellspacing="0">
+			<table>
 				' . implode('', $lines) . '
 			</table>';
     }
diff --git a/typo3/sysext/compatibility6/Classes/Form/Container/FlexFormElementContainer.php b/typo3/sysext/compatibility6/Classes/Form/Container/FlexFormElementContainer.php
index 54053132a561..0f04b2f9fea9 100644
--- a/typo3/sysext/compatibility6/Classes/Form/Container/FlexFormElementContainer.php
+++ b/typo3/sysext/compatibility6/Classes/Form/Container/FlexFormElementContainer.php
@@ -204,7 +204,7 @@ class FlexFormElementContainer extends AbstractContainer
             $diffUtility = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Utility\DiffUtility::class);
             $diffres = $diffUtility->makeDiffDisplay($vArray[$vDEFkey . '.vDEFbase'], $vArray['vDEF']);
             $item = '<div class="typo3-TCEforms-diffBox">' . '<div class="typo3-TCEforms-diffBox-header">'
-                . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.changeInOrig')) . ':</div>' . $diffres . '</div>';
+                . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:compatibility6/Resources/Private/Language/locallang.xlf:labels.changeInOrig')) . ':</div>' . $diffres . '</div>';
         }
         return $item;
     }
diff --git a/typo3/sysext/compatibility6/Configuration/TCA/Overrides/pages.php b/typo3/sysext/compatibility6/Configuration/TCA/Overrides/pages.php
index 5f2aaca285e6..31b56bad05d3 100644
--- a/typo3/sysext/compatibility6/Configuration/TCA/Overrides/pages.php
+++ b/typo3/sysext/compatibility6/Configuration/TCA/Overrides/pages.php
@@ -5,7 +5,7 @@ defined('TYPO3_MODE') or die();
 $additionalColumns = array(
     'storage_pid' => array(
         'exclude' => 1,
-        'label' => 'LLL:EXT:lang/locallang_tca.xlf:storage_pid',
+        'label' => 'LLL:EXT:compatibility6/Resources/Private/Language/locallang.xlf:storage_pid',
         'config' => array(
             'type' => 'group',
             'internal_type' => 'db',
@@ -26,13 +26,13 @@ $additionalColumns = array(
 
 // Add palette
 $GLOBALS['TCA']['pages']['palettes']['storage'] = array(
-    'showitem' => 'storage_pid;LLL:EXT:cms/locallang_tca.xlf:pages.storage_pid_formlabel',
+    'showitem' => 'storage_pid;LLL:EXT:compatibility6/Resources/Private/Language/locallang.xlf:pages.storage_pid_formlabel',
     'canNotCollapse' => 1
 );
 
 // Add to "normal" pages, "external URL", "shortcut page" and "storage PID"
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addToAllTCAtypes('pages',
-    '--palette--;LLL:EXT:cms/locallang_tca.xlf:pages.palettes.storage;storage',
+    '--palette--;LLL:EXT:compatibility6/Resources/Private/Language/locallang.xlf:pages.palettes.storage;storage',
     \TYPO3\CMS\Frontend\Page\PageRepository::DOKTYPE_DEFAULT . ','
     . \TYPO3\CMS\Frontend\Page\PageRepository::DOKTYPE_LINK . ','
     . \TYPO3\CMS\Frontend\Page\PageRepository::DOKTYPE_SHORTCUT . ','
diff --git a/typo3/sysext/compatibility6/Configuration/TCA/Overrides/tt_content.php b/typo3/sysext/compatibility6/Configuration/TCA/Overrides/tt_content.php
index eda7dd9385ed..128e6f33e9e7 100644
--- a/typo3/sysext/compatibility6/Configuration/TCA/Overrides/tt_content.php
+++ b/typo3/sysext/compatibility6/Configuration/TCA/Overrides/tt_content.php
@@ -5,7 +5,7 @@ defined('TYPO3_MODE') or die();
 $extraContentColumns = array(
     'altText' => array(
         'exclude' => true,
-        'label' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:image_altText',
+        'label' => 'LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:image_altText',
         'config' => array(
             'type' => 'text',
             'cols' => '30',
@@ -13,7 +13,7 @@ $extraContentColumns = array(
         )
     ),
     'imagecaption' => array(
-        'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.caption',
+        'label' => 'LLL:EXT:compatibility6/Resources/Private/Language/locallang.xlf:LGL.caption',
         'config' => array(
             'type' => 'text',
             'cols' => '30',
@@ -23,25 +23,25 @@ $extraContentColumns = array(
     ),
     'imagecaption_position' => array(
         'exclude' => true,
-        'label' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:imagecaption_position',
+        'label' => 'LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:imagecaption_position',
         'config' => array(
             'type' => 'select',
             'renderType' => 'selectSingle',
             'items' => array(
                 array(
-                    'LLL:EXT:lang/locallang_general.xlf:LGL.default_value',
+                    'LLL:EXT:compatibility6/Resources/Private/Language/locallang.xlf:LGL.default_value',
                     ''
                 ),
                 array(
-                    'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:imagecaption_position.I.1',
+                    'LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:imagecaption_position.I.1',
                     'center'
                 ),
                 array(
-                    'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:imagecaption_position.I.2',
+                    'LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:imagecaption_position.I.2',
                     'right'
                 ),
                 array(
-                    'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:imagecaption_position.I.3',
+                    'LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:imagecaption_position.I.3',
                     'left'
                 )
             ),
@@ -50,7 +50,7 @@ $extraContentColumns = array(
     ),
     'image_link' => array(
         'exclude' => true,
-        'label' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:image_link',
+        'label' => 'LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:image_link',
         'config' => array(
             'type' => 'text',
             'cols' => '30',
@@ -58,8 +58,8 @@ $extraContentColumns = array(
             'wizards' => array(
                 'link' => array(
                     'type' => 'popup',
-                    'title' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:image_link_formlabel',
-                    'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_link.gif',
+                    'title' => 'LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:image_link_formlabel',
+                    'icon' => 'EXT:compatibility6/Resources/Public/Images/wizard_link.gif',
                     'module' => array(
                         'name' => 'wizard_link',
                     ),
@@ -71,45 +71,45 @@ $extraContentColumns = array(
     ),
     'image_frames' => array(
         'exclude' => true,
-        'label' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:image_frames',
+        'label' => 'LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:image_frames',
         'config' => array(
             'type' => 'select',
             'renderType' => 'selectSingle',
             'items' => array(
                 array(
-                    'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:image_frames.I.0',
+                    'LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:image_frames.I.0',
                     0
                 ),
                 array(
-                    'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:image_frames.I.1',
+                    'LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:image_frames.I.1',
                     1
                 ),
                 array(
-                    'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:image_frames.I.2',
+                    'LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:image_frames.I.2',
                     2
                 ),
                 array(
-                    'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:image_frames.I.3',
+                    'LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:image_frames.I.3',
                     3
                 ),
                 array(
-                    'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:image_frames.I.4',
+                    'LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:image_frames.I.4',
                     4
                 ),
                 array(
-                    'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:image_frames.I.5',
+                    'LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:image_frames.I.5',
                     5
                 ),
                 array(
-                    'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:image_frames.I.6',
+                    'LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:image_frames.I.6',
                     6
                 ),
                 array(
-                    'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:image_frames.I.7',
+                    'LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:image_frames.I.7',
                     7
                 ),
                 array(
-                    'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:image_frames.I.8',
+                    'LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:image_frames.I.8',
                     8
                 )
             )
@@ -117,7 +117,7 @@ $extraContentColumns = array(
     ),
     'longdescURL' => array(
         'exclude' => true,
-        'label' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:image_longdescURL',
+        'label' => 'LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:image_longdescURL',
         'config' => array(
             'type' => 'text',
             'cols' => '30',
@@ -125,8 +125,8 @@ $extraContentColumns = array(
             'wizards' => array(
                 'link' => array(
                     'type' => 'popup',
-                    'title' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:image_link_formlabel',
-                    'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_link.gif',
+                    'title' => 'LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:image_link_formlabel',
+                    'icon' => 'EXT:compatibility6/Resources/Public/Images/wizard_link.gif',
                     'module' => array(
                         'name' => 'wizard_link',
                     ),
@@ -142,7 +142,7 @@ $extraContentColumns = array(
     ),
     'titleText' => array(
         'exclude' => true,
-        'label' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:image_titleText',
+        'label' => 'LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:image_titleText',
         'config' => array(
             'type' => 'text',
             'cols' => '30',
@@ -247,10 +247,10 @@ $GLOBALS['TCA']['tt_content']['palettes'] = array_replace(
         ),
         'image_accessibility' => array(
             'showitem' => '
-				altText;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:altText_formlabel,
-				titleText;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:titleText_formlabel,
+				altText;LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:altText_formlabel,
+				titleText;LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:titleText_formlabel,
 				--linebreak--,
-				longdescURL;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:longdescURL_formlabel
+				longdescURL;LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:longdescURL_formlabel
 			',
         )
     )
@@ -263,50 +263,50 @@ if (!\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('css_styled_co
         array(
             'visibility' => array(
                 'showitem' => '
-					hidden;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:hidden_formlabel,
-					sectionIndex;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:sectionIndex_formlabel,
-					linkToTop;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:linkToTop_formlabel
+					hidden;LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:hidden_formlabel,
+					sectionIndex;LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:sectionIndex_formlabel,
+					linkToTop;LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:linkToTop_formlabel
 				',
             ),
             'frames' => array(
                 'showitem' => '
-					layout;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:layout_formlabel,
-					spaceBefore;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:spaceBefore_formlabel,
-					spaceAfter;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:spaceAfter_formlabel,
-					section_frame;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:section_frame_formlabel
+					layout;LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:layout_formlabel,
+					spaceBefore;LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:spaceBefore_formlabel,
+					spaceAfter;LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:spaceAfter_formlabel,
+					section_frame;LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:section_frame_formlabel
 				',
             )
         )
     );
 }
 
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addFieldsToPalette('tt_content', 'image_settings', 'image_frames;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:image_frames_formlabel');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addFieldsToPalette('tt_content', 'image_settings', 'image_frames;LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:image_frames_formlabel');
 
 /**
  * CType "search"
  */
 $GLOBALS['TCA']['tt_content']['ctrl']['typeicon_classes']['search'] = 'mimetypes-x-content-form-search';
 $GLOBALS['TCA']['tt_content']['types']['search'] = array(
-    'showitem' => '--palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:palette.general;general,
-			--palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:palette.header;header,
-		--div--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:tabs.appearance,
-			--palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:palette.frames;frames,
-		--div--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:tabs.access,
-			--palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:palette.visibility;visibility,
-			--palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:palette.access;access,
-		--div--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:tabs.behaviour,
-			--palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:palette.searchform;searchform,
-		--div--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:tabs.extended'
+    'showitem' => '--palette--;LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:palette.general;general,
+			--palette--;LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:palette.header;header,
+		--div--;LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:tabs.appearance,
+			--palette--;LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:palette.frames;frames,
+		--div--;LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:tabs.access,
+			--palette--;LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:palette.visibility;visibility,
+			--palette--;LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:palette.access;access,
+		--div--;LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:tabs.behaviour,
+			--palette--;LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:palette.searchform;searchform,
+		--div--;LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:tabs.extended'
 );
 
 $GLOBALS['TCA']['tt_content']['palettes']['searchform'] = array(
-    'showitem' => 'pages;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:pages.ALT.searchform',
+    'showitem' => 'pages;LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:pages.ALT.searchform',
 );
 
 // check if there is already a forms tab and add the item after that, otherwise
 // add the tab item as well
 $additionalCTypeItem = array(
-    'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:CType.I.9',
+    'LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:CType.I.9',
     'search',
     'content-special-indexed_search'
 );
@@ -315,7 +315,7 @@ $existingCTypeItems = $GLOBALS['TCA']['tt_content']['columns']['CType']['config'
 $groupFound = false;
 $groupPosition = false;
 foreach ($existingCTypeItems as $position => $item) {
-    if ($item[0] === 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:CType.div.forms') {
+    if ($item[0] === 'LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:CType.div.forms') {
         $groupFound = true;
         $groupPosition = $position;
         break;
@@ -328,7 +328,7 @@ if ($groupFound && $groupPosition) {
 } else {
     // nothing found, add two items (group + new CType) at the bottom of the list
     \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTcaSelectItem('tt_content', 'CType',
-        array('LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:CType.div.forms', '--div--')
+        array('LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:CType.div.forms', '--div--')
     );
     \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTcaSelectItem('tt_content', 'CType', $additionalCTypeItem);
 }
@@ -343,8 +343,8 @@ if (!\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('form')) {
         'notNewRecords' => 1,
         'enableByTypeConfig' => 1,
         'type' => 'script',
-        'title' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:bodytext.W.forms',
-        'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_forms.gif',
+        'title' => 'LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:bodytext.W.forms',
+        'icon' => 'EXT:compatibility6/Resources/Public/Images/wizard_forms.gif',
         'module' => array(
             'name' => 'wizard_forms',
             'urlParameters' => array(
@@ -360,7 +360,7 @@ if (!\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('form')) {
         'tt_content',
         'CType',
         array(
-            'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:CType.I.8',
+            'LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:CType.I.8',
             'mailform',
             'content-elements-mailform'
         ),
@@ -371,17 +371,17 @@ if (!\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('form')) {
     // set up the fields
     $GLOBALS['TCA']['tt_content']['types']['mailform'] = array(
         'showitem' => '
-				--palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:palette.general;general,
-				--palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:palette.header;header,
-				bodytext;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:bodytext.ALT.mailform_formlabel,
-			--div--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:tabs.appearance,
-				--palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:palette.frames;frames,
-			--div--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:tabs.access,
-				--palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:palette.visibility;visibility,
-				--palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:palette.access;access,
-			--div--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:tabs.behaviour,
-				--palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:palette.mailform;mailform,
-			--div--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:tabs.extended'
+				--palette--;LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:palette.general;general,
+				--palette--;LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:palette.header;header,
+				bodytext;LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:bodytext.ALT.mailform_formlabel,
+			--div--;LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:tabs.appearance,
+				--palette--;LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:palette.frames;frames,
+			--div--;LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:tabs.access,
+				--palette--;LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:palette.visibility;visibility,
+				--palette--;LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:palette.access;access,
+			--div--;LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:tabs.behaviour,
+				--palette--;LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:palette.mailform;mailform,
+			--div--;LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:tabs.extended'
     );
     $baseDefaultExtrasOfBodytext = '';
     if (!empty($GLOBALS['TCA']['tt_content']['columns']['bodytext']['defaultExtras'])) {
@@ -396,6 +396,6 @@ if (!\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('form')) {
     $GLOBALS['TCA']['tt_content']['types']['mailform']['columnsOverrides']['bodytext']['defaultExtras'] = $baseDefaultExtrasOfBodytext . 'nowrap:wizards[forms]';
 
     $GLOBALS['TCA']['tt_content']['palettes']['mailform'] = array(
-        'showitem' => 'pages;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:pages.ALT.mailform, --linebreak--, subheader;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:subheader.ALT.mailform_formlabel',
+        'showitem' => 'pages;LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:pages.ALT.mailform, --linebreak--, subheader;LLL:EXT:compatibility6/Resources/Private/Language/locallang_ttc.xlf:subheader.ALT.mailform_formlabel',
     );
 }
diff --git a/typo3/sysext/compatibility6/Configuration/TypoScript/Form/setup.txt b/typo3/sysext/compatibility6/Configuration/TypoScript/Form/setup.txt
index 83a4d9dd6d3e..ee94cc9f9e3a 100644
--- a/typo3/sysext/compatibility6/Configuration/TypoScript/Form/setup.txt
+++ b/typo3/sysext/compatibility6/Configuration/TypoScript/Form/setup.txt
@@ -49,7 +49,7 @@ tt_content.mailform.20 {
 	stdWrap.wrap = <fieldset class="csc-mailform"> | </fieldset>
 	stdWrap {
 		editIcons = tt_content: bodytext, pages, subheader
-		editIcons.iconTitle.data = LLL:EXT:css_styled_content/Resources/Private/Language/locallang.xlf:eIcon.form
+		editIcons.iconTitle.data = LLL:EXT:compatibility6/Resources/Private/Language/locallang.xlf:eIcon.form
 
 		prefixComment = 2 | Mail form inserted:
 	}
diff --git a/typo3/sysext/compatibility6/Configuration/TypoScript/Search/setup.txt b/typo3/sysext/compatibility6/Configuration/TypoScript/Search/setup.txt
index 41db754034d7..d83a3054c4bd 100644
--- a/typo3/sysext/compatibility6/Configuration/TypoScript/Search/setup.txt
+++ b/typo3/sysext/compatibility6/Configuration/TypoScript/Search/setup.txt
@@ -42,7 +42,7 @@ tt_content.search.20 {
 		wrap = <table border="0" cellspacing="0" cellpadding="2" class="csc-searchResultInfo"><tr> | </tr></table> ###RESULT###
 
 		10 = TEXT
-		10.data = LLL:EXT:css_styled_content/Resources/Private/Language/locallang.xlf:search.resultRange
+		10.data = LLL:EXT:compatibility6/Resources/Private/Language/locallang.xlf:search.resultRange
 		10.wrap = <td class="csc-searchResultRange"><p>|</p></td>
 
 		20 = TEXT
@@ -53,15 +53,15 @@ tt_content.search.20 {
 	noResultObj = COA
 	noResultObj {
 		10 = TEXT
-		10.data = LLL:EXT:css_styled_content/Resources/Private/Language/locallang.xlf:search.emptySearch
+		10.data = LLL:EXT:compatibility6/Resources/Private/Language/locallang.xlf:search.emptySearch
 		10.wrap = <h3 class="csc-noSearchResultMsg">|</h3>
 	}
 
 	next = TEXT
-	next.data = LLL:EXT:css_styled_content/Resources/Private/Language/locallang.xlf:search.searchResultNext
+	next.data = LLL:EXT:compatibility6/Resources/Private/Language/locallang.xlf:search.searchResultNext
 
 	prev = TEXT
-	prev.data = LLL:EXT:css_styled_content/Resources/Private/Language/locallang.xlf:search.searchResultPrev
+	prev.data = LLL:EXT:compatibility6/Resources/Private/Language/locallang.xlf:search.searchResultPrev
 
 	target < lib.parseTarget
 	target =
@@ -79,20 +79,20 @@ tt_content.search.30 {
 	recipient >
 	data >
 	dataArray {
-		10.label.data = LLL:EXT:css_styled_content/Resources/Private/Language/locallang.xlf:search.searchWord
+		10.label.data = LLL:EXT:compatibility6/Resources/Private/Language/locallang.xlf:search.searchWord
 		10.type = sword=input
-		20.label.data = LLL:EXT:css_styled_content/Resources/Private/Language/locallang.xlf:search.searchIn
+		20.label.data = LLL:EXT:compatibility6/Resources/Private/Language/locallang.xlf:search.searchIn
 		20.type = scols=select
 		20.valueArray {
-			10.label.data = LLL:EXT:css_styled_content/Resources/Private/Language/locallang.xlf:search.headersKeywords
+			10.label.data = LLL:EXT:compatibility6/Resources/Private/Language/locallang.xlf:search.headersKeywords
 			10.value = pages.title-subtitle-keywords-description:tt_content.header
-			20.label.data = LLL:EXT:css_styled_content/Resources/Private/Language/locallang.xlf:search.pageContent
+			20.label.data = LLL:EXT:compatibility6/Resources/Private/Language/locallang.xlf:search.pageContent
 			20.value = tt_content.header-bodytext-imagecaption
 		}
 		30.type = stype=hidden
 		30.value = L0
 		40.type = submit=submit
-		40.value.data = LLL:EXT:css_styled_content/Resources/Private/Language/locallang.xlf:search.searchButton
+		40.value.data = LLL:EXT:compatibility6/Resources/Private/Language/locallang.xlf:search.searchButton
 	}
 	type.field = pages
 	type.listNum = 0
@@ -101,7 +101,7 @@ tt_content.search.30 {
 
 	stdWrap.wrap = <table border="0" cellspacing="1" cellpadding="1" class="csc-searchform">  | </table>
 	stdWrap {
-		editIcons.iconTitle.data = LLL:EXT:css_styled_content/Resources/Private/Language/locallang.xlf:eIcon.search
+		editIcons.iconTitle.data = LLL:EXT:compatibility6/Resources/Private/Language/locallang.xlf:eIcon.search
 
 		prefixComment = 2 | Search form inserted:
 	}
diff --git a/typo3/sysext/compatibility6/Resources/Private/Language/locallang.xlf b/typo3/sysext/compatibility6/Resources/Private/Language/locallang.xlf
new file mode 100644
index 000000000000..4c2fa16540e3
--- /dev/null
+++ b/typo3/sysext/compatibility6/Resources/Private/Language/locallang.xlf
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xliff version="1.0" xmlns:t3="http://typo3.org/schemas/xliff">
+	<file t3:id="1446137224" source-language="en" datatype="plaintext" original="messages" date="2015-10-29T17:46:32Z" product-name="compatibility6">
+		<header/>
+		<body>
+			<trans-unit id="forms_mail_title">
+				<source>Mail Form</source>
+			</trans-unit>
+			<trans-unit id="forms_mail_description">
+				<source>A mail form allowing website users to submit responses.</source>
+			</trans-unit>
+			<trans-unit id="forms_search_title">
+				<source>Search Form</source>
+			</trans-unit>
+			<trans-unit id="forms_search_description">
+				<source>Draws a search form and the search result if a search is performed.</source>
+			</trans-unit>
+			<trans-unit id="closeDoc">
+				<source>Close</source>
+			</trans-unit>
+			<trans-unit id="saveDoc">
+				<source>Save</source>
+			</trans-unit>
+			<trans-unit id="saveCloseDoc">
+				<source>Save and close</source>
+			</trans-unit>
+			<trans-unit id="labels.changeInOrig">
+				<source>Changed in original translation</source>
+			</trans-unit>
+			<trans-unit id="storage_pid">
+				<source>General Record Storage page:</source>
+			</trans-unit>
+			<trans-unit id="pages.storage_pid_formlabel" xml:space="preserve">
+				<source>Page</source>
+			</trans-unit>
+			<trans-unit id="pages.palettes.storage" xml:space="preserve">
+				<source>General Record Storage Page</source>
+			</trans-unit>
+			<trans-unit id="LGL.default_value">
+				<source>Default</source>
+			</trans-unit>
+			<trans-unit id="LGL.caption">
+				<source>Caption:</source>
+			</trans-unit>
+			<trans-unit id="eIcon.form">
+				<source>Edit email form</source>
+			</trans-unit>
+			<trans-unit id="eIcon.search">
+				<source>Edit search element</source>
+			</trans-unit>
+			<trans-unit id="search.resultRange">
+				<source>Searchresult: ###RANGELOW###-###RANGEHIGH### of ###TOTAL###</source>
+			</trans-unit>
+			<trans-unit id="search.emptySearch">
+				<source>Sorry, your search was empty!</source>
+			</trans-unit>
+			<trans-unit id="search.searchResultNext">
+				<source>Next</source>
+			</trans-unit>
+			<trans-unit id="search.searchResultPrev">
+				<source>Prev</source>
+			</trans-unit>
+			<trans-unit id="search.searchWord">
+				<source>Searchword:</source>
+			</trans-unit>
+			<trans-unit id="search.searchIn">
+				<source>Search in:</source>
+			</trans-unit>
+			<trans-unit id="search.headersKeywords">
+				<source>Headers and keywords</source>
+			</trans-unit>
+			<trans-unit id="search.pageContent">
+				<source>Page content</source>
+			</trans-unit>
+			<trans-unit id="search.searchButton">
+				<source>Search now!</source>
+			</trans-unit>
+		</body>
+	</file>
+</xliff>
diff --git a/typo3/sysext/compatibility6/Resources/Private/Language/locallang_ttc.xlf b/typo3/sysext/compatibility6/Resources/Private/Language/locallang_ttc.xlf
new file mode 100644
index 000000000000..7cfa01d1befb
--- /dev/null
+++ b/typo3/sysext/compatibility6/Resources/Private/Language/locallang_ttc.xlf
@@ -0,0 +1,911 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xliff version="1.0" xmlns:t3="http://typo3.org/schemas/xliff">
+	<file t3:id="1415814791" source-language="en" datatype="plaintext" original="messages" date="2011-10-17T20:22:32Z" product-name="cms">
+		<header/>
+		<body>
+			<trans-unit id="CType_formlabel">
+				<source>Type</source>
+			</trans-unit>
+			<trans-unit id="CType.I.0">
+				<source>Header</source>
+			</trans-unit>
+			<trans-unit id="CType.I.1">
+				<source>Text</source>
+			</trans-unit>
+			<trans-unit id="CType.I.2">
+				<source>Text &amp; Images</source>
+			</trans-unit>
+			<trans-unit id="CType.I.3">
+				<source>Images</source>
+			</trans-unit>
+			<trans-unit id="CType.I.4">
+				<source>Bullet List</source>
+			</trans-unit>
+			<trans-unit id="CType.I.5">
+				<source>Table</source>
+			</trans-unit>
+			<trans-unit id="CType.I.6">
+				<source>File Links</source>
+			</trans-unit>
+			<trans-unit id="CType.I.8">
+				<source>Form</source>
+			</trans-unit>
+			<trans-unit id="CType.I.9">
+				<source>Search</source>
+			</trans-unit>
+			<trans-unit id="CType.I.10">
+				<source>Login</source>
+			</trans-unit>
+			<trans-unit id="CType.I.11">
+				<source>Textbox</source>
+			</trans-unit>
+			<trans-unit id="CType.I.12">
+				<source>Special Menus</source>
+			</trans-unit>
+			<trans-unit id="CType.I.13">
+				<source>Insert Records</source>
+			</trans-unit>
+			<trans-unit id="CType.I.14">
+				<source>Insert Plugin</source>
+			</trans-unit>
+			<trans-unit id="CType.I.15">
+				<source>Script</source>
+			</trans-unit>
+			<trans-unit id="CType.I.16">
+				<source>Divider</source>
+			</trans-unit>
+			<trans-unit id="CType.I.17">
+				<source>HTML</source>
+			</trans-unit>
+			<trans-unit id="CType.div.standard">
+				<source>Standard</source>
+			</trans-unit>
+			<trans-unit id="CType.div.lists">
+				<source>Lists</source>
+			</trans-unit>
+			<trans-unit id="CType.div.forms">
+				<source>Forms</source>
+			</trans-unit>
+			<trans-unit id="CType.div.special">
+				<source>Special</source>
+			</trans-unit>
+			<trans-unit id="layout.I.1">
+				<source>Layout 1</source>
+			</trans-unit>
+			<trans-unit id="layout.I.2">
+				<source>Layout 2</source>
+			</trans-unit>
+			<trans-unit id="layout.I.3">
+				<source>Layout 3</source>
+			</trans-unit>
+			<trans-unit id="colPos">
+				<source>Columns:</source>
+			</trans-unit>
+			<trans-unit id="colPos_formlabel">
+				<source>Column</source>
+			</trans-unit>
+			<trans-unit id="colPos.I.0">
+				<source>Left</source>
+			</trans-unit>
+			<trans-unit id="colPos.I.1">
+				<source>Normal</source>
+			</trans-unit>
+			<trans-unit id="colPos.I.2">
+				<source>Right</source>
+			</trans-unit>
+			<trans-unit id="colPos.I.3">
+				<source>Border</source>
+			</trans-unit>
+			<trans-unit id="date">
+				<source>Date</source>
+			</trans-unit>
+			<trans-unit id="date_formlabel">
+				<source>Date</source>
+			</trans-unit>
+			<trans-unit id="header">
+				<source>Header:</source>
+			</trans-unit>
+			<trans-unit id="header_formlabel">
+				<source>Header</source>
+			</trans-unit>
+			<trans-unit id="header.ALT.shortcut_formlabel">
+				<source>Name (not visible in frontend)</source>
+			</trans-unit>
+			<trans-unit id="header.ALT.script_formlabel">
+				<source>Name (not visible in frontend)</source>
+			</trans-unit>
+			<trans-unit id="header.ALT.div_formlabel">
+				<source>Name (not visible in frontend)</source>
+			</trans-unit>
+			<trans-unit id="header.ALT.html_formlabel">
+				<source>Name (not visible in frontend)</source>
+			</trans-unit>
+			<trans-unit id="header_position">
+				<source>Align:</source>
+			</trans-unit>
+			<trans-unit id="header_position_formlabel">
+				<source>Alignment</source>
+			</trans-unit>
+			<trans-unit id="header_position.I.1">
+				<source>Center</source>
+			</trans-unit>
+			<trans-unit id="header_position.I.2">
+				<source>Right</source>
+			</trans-unit>
+			<trans-unit id="header_position.I.3">
+				<source>Left</source>
+			</trans-unit>
+			<trans-unit id="header_link">
+				<source>Link:</source>
+			</trans-unit>
+			<trans-unit id="header_link_formlabel">
+				<source>Link</source>
+			</trans-unit>
+			<trans-unit id="header_layout_formlabel">
+				<source>Type</source>
+			</trans-unit>
+			<trans-unit id="header_layout.I.1">
+				<source>Layout 1</source>
+			</trans-unit>
+			<trans-unit id="header_layout.I.2">
+				<source>Layout 2</source>
+			</trans-unit>
+			<trans-unit id="header_layout.I.3">
+				<source>Layout 3</source>
+			</trans-unit>
+			<trans-unit id="header_layout.I.4">
+				<source>Layout 4</source>
+			</trans-unit>
+			<trans-unit id="header_layout.I.5">
+				<source>Layout 5</source>
+			</trans-unit>
+			<trans-unit id="header_layout.I.6">
+				<source>Hidden</source>
+			</trans-unit>
+			<trans-unit id="bodytext.W.RTE">
+				<source>Fullscreen Rich Text Editing</source>
+			</trans-unit>
+			<trans-unit id="bodytext.W.table">
+				<source>Table Wizard</source>
+			</trans-unit>
+			<trans-unit id="bodytext.W.forms">
+				<source>Forms wizard</source>
+			</trans-unit>
+			<trans-unit id="imagewidth">
+				<source>Width (pixels):</source>
+			</trans-unit>
+			<trans-unit id="imagewidth_formlabel">
+				<source>Width (px)</source>
+			</trans-unit>
+			<trans-unit id="imageheight">
+				<source>Height (pixels):</source>
+			</trans-unit>
+			<trans-unit id="imageheight_formlabel">
+				<source>Height (px)</source>
+			</trans-unit>
+			<trans-unit id="imageorient">
+				<source>Position:</source>
+			</trans-unit>
+			<trans-unit id="imageorient_formlabel">
+				<source>Position and Alignment</source>
+			</trans-unit>
+			<trans-unit id="imageorient.I.0">
+				<source>Above, center</source>
+			</trans-unit>
+			<trans-unit id="imageorient.I.1">
+				<source>Above, right</source>
+			</trans-unit>
+			<trans-unit id="imageorient.I.2">
+				<source>Above, left</source>
+			</trans-unit>
+			<trans-unit id="imageorient.I.3">
+				<source>Below, center</source>
+			</trans-unit>
+			<trans-unit id="imageorient.I.4">
+				<source>Below, right</source>
+			</trans-unit>
+			<trans-unit id="imageorient.I.5">
+				<source>Below, left</source>
+			</trans-unit>
+			<trans-unit id="imageorient.I.6">
+				<source>In text, right</source>
+			</trans-unit>
+			<trans-unit id="imageorient.I.7">
+				<source>In text, left</source>
+			</trans-unit>
+			<trans-unit id="imageorient.I.8">
+				<source>__No wrap:__</source>
+			</trans-unit>
+			<trans-unit id="imageorient.I.9">
+				<source>Beside Text, Right</source>
+			</trans-unit>
+			<trans-unit id="imageorient.I.10">
+				<source>Beside Text, Left</source>
+			</trans-unit>
+			<trans-unit id="imageborder">
+				<source>Border:</source>
+			</trans-unit>
+			<trans-unit id="imageborder_formlabel">
+				<source>Border</source>
+			</trans-unit>
+			<trans-unit id="image_noRows">
+				<source>No Rows:</source>
+			</trans-unit>
+			<trans-unit id="image_noRows.I.0">
+				<source>Deactivate</source>
+			</trans-unit>
+			<trans-unit id="image_noRows_formlabel">
+				<source>Display as Rows</source>
+			</trans-unit>
+			<trans-unit id="image_link">
+				<source>Link:</source>
+			</trans-unit>
+			<trans-unit id="image_link_formlabel">
+				<source>Links (one per line, one link per image)</source>
+			</trans-unit>
+			<trans-unit id="image_zoom">
+				<source>Click-enlarge:</source>
+			</trans-unit>
+			<trans-unit id="image_zoom_formlabel">
+				<source>Enlarge on Click</source>
+			</trans-unit>
+			<trans-unit id="image_effects">
+				<source>Effects:</source>
+			</trans-unit>
+			<trans-unit id="image_effects_formlabel">
+				<source>Effect</source>
+			</trans-unit>
+			<trans-unit id="image_effects.I.0">
+				<source>None</source>
+			</trans-unit>
+			<trans-unit id="image_effects.I.1">
+				<source>Rotate 90 CW</source>
+			</trans-unit>
+			<trans-unit id="image_effects.I.2">
+				<source>Rotate -90 CCW</source>
+			</trans-unit>
+			<trans-unit id="image_effects.I.3">
+				<source>Rotate 180</source>
+			</trans-unit>
+			<trans-unit id="image_effects.I.4">
+				<source>Grayscale</source>
+			</trans-unit>
+			<trans-unit id="image_effects.I.5">
+				<source>Sharpen</source>
+			</trans-unit>
+			<trans-unit id="image_effects.I.6">
+				<source>Normalize</source>
+			</trans-unit>
+			<trans-unit id="image_effects.I.7">
+				<source>Contrast</source>
+			</trans-unit>
+			<trans-unit id="image_effects.I.8">
+				<source>Brighter</source>
+			</trans-unit>
+			<trans-unit id="image_effects.I.9">
+				<source>Darker</source>
+			</trans-unit>
+			<trans-unit id="image_frames">
+				<source>Frames:</source>
+			</trans-unit>
+			<trans-unit id="image_frames_formlabel">
+				<source>Graphical Frames</source>
+			</trans-unit>
+			<trans-unit id="image_frames.I.0">
+				<source>(None)</source>
+			</trans-unit>
+			<trans-unit id="image_frames.I.1">
+				<source>Frame 1</source>
+			</trans-unit>
+			<trans-unit id="image_frames.I.2">
+				<source>Frame 2</source>
+			</trans-unit>
+			<trans-unit id="image_frames.I.3">
+				<source>Frame 3</source>
+			</trans-unit>
+			<trans-unit id="image_frames.I.4">
+				<source>Frame 4</source>
+			</trans-unit>
+			<trans-unit id="image_frames.I.5">
+				<source>Frame 5</source>
+			</trans-unit>
+			<trans-unit id="image_frames.I.6">
+				<source>Frame 6</source>
+			</trans-unit>
+			<trans-unit id="image_frames.I.7">
+				<source>Frame 7</source>
+			</trans-unit>
+			<trans-unit id="image_frames.I.8">
+				<source>Frame 8</source>
+			</trans-unit>
+			<trans-unit id="image_compression">
+				<source>Image Quality/Processing:</source>
+			</trans-unit>
+			<trans-unit id="image_compression_formlabel">
+				<source>Quality and Type</source>
+			</trans-unit>
+			<trans-unit id="image_compression.I.1">
+				<source>None (ignores all other options)</source>
+			</trans-unit>
+			<trans-unit id="image_compression.I.15">
+				<source>JPG/Very High</source>
+			</trans-unit>
+			<trans-unit id="image_compression.I.16">
+				<source>JPG/High</source>
+			</trans-unit>
+			<trans-unit id="image_compression.I.17">
+				<source>JPG/Medium</source>
+			</trans-unit>
+			<trans-unit id="image_compression.I.18">
+				<source>JPG/Low</source>
+			</trans-unit>
+			<trans-unit id="image_compression.I.19">
+				<source>JPG/Very Low</source>
+			</trans-unit>
+			<trans-unit id="imagecols">
+				<source>Columns:</source>
+			</trans-unit>
+			<trans-unit id="imagecols_formlabel">
+				<source>Number of Columns</source>
+			</trans-unit>
+			<trans-unit id="imagecaption_position">
+				<source>Align:</source>
+			</trans-unit>
+			<trans-unit id="imagecaption_position_formlabel">
+				<source>Caption Alignment</source>
+			</trans-unit>
+			<trans-unit id="imagecaption_position.I.1">
+				<source>Center</source>
+			</trans-unit>
+			<trans-unit id="imagecaption_position.I.2">
+				<source>Right</source>
+			</trans-unit>
+			<trans-unit id="imagecaption_position.I.3">
+				<source>Left</source>
+			</trans-unit>
+			<trans-unit id="image_altText">
+				<source>Alternative Text:</source>
+			</trans-unit>
+			<trans-unit id="altText_formlabel">
+				<source>Alternative Labels (one per line)</source>
+			</trans-unit>
+			<trans-unit id="image_titleText">
+				<source>Title Text:</source>
+			</trans-unit>
+			<trans-unit id="titleText_formlabel">
+				<source>Titles (one per line)</source>
+			</trans-unit>
+			<trans-unit id="image_longdescURL">
+				<source>Long Description URL:</source>
+			</trans-unit>
+			<trans-unit id="images.addFileReference">
+				<source>Add image</source>
+			</trans-unit>
+			<trans-unit id="longdescURL_formlabel">
+				<source>Long Description URLs (one per line)</source>
+			</trans-unit>
+			<trans-unit id="cols">
+				<source>Columns</source>
+			</trans-unit>
+			<trans-unit id="cols.I.0">
+				<source>Auto</source>
+			</trans-unit>
+			<trans-unit id="recursive.I.0">
+				<source>0 levels (only selected page)</source>
+			</trans-unit>
+			<trans-unit id="recursive.I.1">
+				<source>1 level</source>
+			</trans-unit>
+			<trans-unit id="recursive.I.2">
+				<source>2 levels</source>
+			</trans-unit>
+			<trans-unit id="recursive.I.3">
+				<source>3 levels</source>
+			</trans-unit>
+			<trans-unit id="recursive.I.4">
+				<source>4 levels</source>
+			</trans-unit>
+			<trans-unit id="recursive.I.5">
+				<source>Infinite</source>
+			</trans-unit>
+			<trans-unit id="menu_type">
+				<source>Menu Type</source>
+			</trans-unit>
+			<trans-unit id="menu_type_formlabel">
+				<source>Menu Type</source>
+			</trans-unit>
+			<trans-unit id="menu_type.I.0">
+				<source>Menu of selected pages</source>
+			</trans-unit>
+			<trans-unit id="menu_type.I.1">
+				<source>Menu of subpages of selected pages</source>
+			</trans-unit>
+			<trans-unit id="menu_type.I.2">
+				<source>Menu of subpages of selected pages including abstracts</source>
+			</trans-unit>
+			<trans-unit id="menu_type.I.3">
+				<source>Menu of subpages of selected pages including sections</source>
+			</trans-unit>
+			<trans-unit id="menu_type.I.4">
+				<source>Sitemap</source>
+			</trans-unit>
+			<trans-unit id="menu_type.I.5">
+				<source>Section index (page content marked for section menus)</source>
+			</trans-unit>
+			<trans-unit id="menu_type.I.6">
+				<source>Recently updated pages</source>
+			</trans-unit>
+			<trans-unit id="menu_type.I.7">
+				<source>Related pages (based on keywords)</source>
+			</trans-unit>
+			<trans-unit id="menu_type.I.8">
+				<source>Sitemaps of selected pages</source>
+			</trans-unit>
+			<trans-unit id="menu_type.I.categorized_pages">
+				<source>Pages for selected categories</source>
+			</trans-unit>
+			<trans-unit id="menu_type.I.categorized_content">
+				<source>Content elements for selected categories</source>
+			</trans-unit>
+			<trans-unit id="list_type">
+				<source>Plugin:</source>
+			</trans-unit>
+			<trans-unit id="list_type_formlabel">
+				<source>Selected Plugin</source>
+			</trans-unit>
+			<trans-unit id="table_bgColor">
+				<source>Backgr. Color:</source>
+			</trans-unit>
+			<trans-unit id="table_bgColor_formlabel">
+				<source>Background color</source>
+			</trans-unit>
+			<trans-unit id="table_bgColor.I.1">
+				<source>Color 1</source>
+			</trans-unit>
+			<trans-unit id="table_bgColor.I.2">
+				<source>Color 2</source>
+			</trans-unit>
+			<trans-unit id="table_bgColor.I.3">
+				<source>None</source>
+			</trans-unit>
+			<trans-unit id="table_bgColor.I.5">
+				<source>Black</source>
+			</trans-unit>
+			<trans-unit id="table_bgColor.I.6">
+				<source>White</source>
+			</trans-unit>
+			<trans-unit id="table_bgColor.I.7">
+				<source>Dark Gray</source>
+			</trans-unit>
+			<trans-unit id="table_bgColor.I.8">
+				<source>Gray</source>
+			</trans-unit>
+			<trans-unit id="table_bgColor.I.9">
+				<source>Silver</source>
+			</trans-unit>
+			<trans-unit id="table_border">
+				<source>Border:</source>
+			</trans-unit>
+			<trans-unit id="table_border_formlabel">
+				<source>Border Size (px)</source>
+			</trans-unit>
+			<trans-unit id="table_cellspacing">
+				<source>Cellspacing:</source>
+			</trans-unit>
+			<trans-unit id="table_cellspacing_formlabel">
+				<source>Cellspacing (px)</source>
+			</trans-unit>
+			<trans-unit id="table_cellpadding">
+				<source>Cellpadding:</source>
+			</trans-unit>
+			<trans-unit id="table_cellpadding_formlabel">
+				<source>Cellpadding (px)</source>
+			</trans-unit>
+			<trans-unit id="media">
+				<source>Files</source>
+			</trans-unit>
+			<trans-unit id="media.dataAttributes">
+				<source>Additional data-* Attributes for HTML5 video tag</source>
+			</trans-unit>
+			<trans-unit id="media.dataAttributes.attributeName">
+				<source>Name of attribute (without data-)</source>
+			</trans-unit>
+			<trans-unit id="media.dataAttributes.content">
+				<source>Content</source>
+			</trans-unit>
+			<trans-unit id="media.ALT.uploads_formlabel">
+				<source>Select single files</source>
+			</trans-unit>
+			<trans-unit id="media.addFileReference">
+				<source>Add file</source>
+			</trans-unit>
+			<trans-unit id="multimedia">
+				<source>File:</source>
+			</trans-unit>
+			<trans-unit id="multimedia_formlabel">
+				<source>Selected Media File</source>
+			</trans-unit>
+			<trans-unit id="file_collections">
+				<source>File collections</source>
+			</trans-unit>
+			<trans-unit id="file_collections.ALT.uploads_formlabel">
+				<source>Select file collections</source>
+			</trans-unit>
+			<trans-unit id="filelink_size">
+				<source>Show File Size:</source>
+			</trans-unit>
+			<trans-unit id="filelink_sorting">
+				<source>Sort Filelist:</source>
+			</trans-unit>
+			<trans-unit id="filelink_sorting.none">
+					<source>none</source>
+			</trans-unit>
+			<trans-unit id="filelink_sorting.extension">
+					<source>by Fileextension</source>
+			</trans-unit>
+			<trans-unit id="filelink_sorting.name">
+					<source>by Filename</source>
+			</trans-unit>
+			<trans-unit id="filelink_sorting.type">
+					<source>by Filetype</source>
+			</trans-unit>
+			<trans-unit id="filelink_sorting.size">
+					<source>by Filesize</source>
+			</trans-unit>
+			<trans-unit id="filelink_size_formlabel">
+				<source>Display File Size Information</source>
+			</trans-unit>
+			<trans-unit id="target">
+				<source>Target:</source>
+			</trans-unit>
+			<trans-unit id="target.I.1">
+				<source>New window</source>
+			</trans-unit>
+			<trans-unit id="records">
+				<source>Items:</source>
+			</trans-unit>
+			<trans-unit id="records_formlabel">
+				<source>Records</source>
+			</trans-unit>
+			<trans-unit id="spaceBefore">
+				<source>Before:</source>
+			</trans-unit>
+			<trans-unit id="spaceBefore_formlabel">
+				<source>Top Margin</source>
+			</trans-unit>
+			<trans-unit id="spaceAfter">
+				<source>After:</source>
+			</trans-unit>
+			<trans-unit id="spaceAfter_formlabel">
+				<source>Bottom Margin</source>
+			</trans-unit>
+			<trans-unit id="section_frame">
+				<source>Frame:</source>
+			</trans-unit>
+			<trans-unit id="section_frame_formlabel">
+				<source>Indentation and Frames</source>
+			</trans-unit>
+			<trans-unit id="section_frame.I.1">
+				<source>Invisible</source>
+			</trans-unit>
+			<trans-unit id="section_frame.I.2">
+				<source>Ruler Before</source>
+			</trans-unit>
+			<trans-unit id="section_frame.I.3">
+				<source>Ruler After</source>
+			</trans-unit>
+			<trans-unit id="section_frame.I.4">
+				<source>Indent</source>
+			</trans-unit>
+			<trans-unit id="section_frame.I.5">
+				<source>Indent, 33/66%</source>
+			</trans-unit>
+			<trans-unit id="section_frame.I.6">
+				<source>Indent, 66/33%</source>
+			</trans-unit>
+			<trans-unit id="section_frame.I.7">
+				<source>Frame 1</source>
+			</trans-unit>
+			<trans-unit id="section_frame.I.8">
+				<source>Frame 2</source>
+			</trans-unit>
+			<trans-unit id="splash_layout">
+				<source>Textbox Type:</source>
+			</trans-unit>
+			<trans-unit id="splash_layout_formlabel">
+				<source>Type</source>
+			</trans-unit>
+			<trans-unit id="splash_layout.I.1">
+				<source>Image Shadow</source>
+			</trans-unit>
+			<trans-unit id="splash_layout.I.2">
+				<source>Image Frame 1</source>
+			</trans-unit>
+			<trans-unit id="splash_layout.I.3">
+				<source>Image Frame 2</source>
+			</trans-unit>
+			<trans-unit id="splash_layout.I.4">
+				<source>__Graphical:__</source>
+			</trans-unit>
+			<trans-unit id="splash_layout.I.5">
+				<source>Postit 1</source>
+			</trans-unit>
+			<trans-unit id="sectionIndex">
+				<source>Index:</source>
+			</trans-unit>
+			<trans-unit id="sectionIndex_formlabel">
+				<source>Show in Section Menus</source>
+			</trans-unit>
+			<trans-unit id="linkToTop">
+				<source>To top:</source>
+			</trans-unit>
+			<trans-unit id="linkToTop_formlabel">
+				<source>Append with Link to Top of Page</source>
+			</trans-unit>
+			<trans-unit id="rte_enabled">
+				<source>Disable Rich Text Editor:</source>
+			</trans-unit>
+			<trans-unit id="rte_enabled_formlabel">
+				<source>Rich Text Editor</source>
+			</trans-unit>
+			<trans-unit id="rte_enabled.I.0">
+				<source>Disable</source>
+			</trans-unit>
+			<trans-unit id="pi_flexform">
+				<source>Plugin Options</source>
+			</trans-unit>
+			<trans-unit id="accessibility_title">
+				<source>Block title</source>
+			</trans-unit>
+			<trans-unit id="accessibility_bypass">
+				<source>Add link to bypass block</source>
+			</trans-unit>
+			<trans-unit id="accessibility_bypass_text">
+				<source>Link text to bypass block</source>
+			</trans-unit>
+			<trans-unit id="selected_categories">
+				<source>Selected categories</source>
+			</trans-unit>
+			<trans-unit id="category_field">
+				<source>Category field</source>
+			</trans-unit>
+			<trans-unit id="ALT.imgOptions">
+				<source>Image Options</source>
+			</trans-unit>
+			<trans-unit id="ALT.imgLinks">
+				<source>Image Links</source>
+			</trans-unit>
+			<trans-unit id="ALT.imgDimensions">
+				<source>Image Dimensions</source>
+			</trans-unit>
+			<trans-unit id="select_key_formlabel">
+				<source>Plugin Mode</source>
+			</trans-unit>
+			<trans-unit id="select_key.ALT.uploads">
+				<source>Read from Path:</source>
+			</trans-unit>
+			<trans-unit id="select_key.ALT.uploads_formlabel">
+				<source>Path</source>
+			</trans-unit>
+			<trans-unit id="select_key.ALT.script_formlabel">
+				<source>PHP Code</source>
+			</trans-unit>
+			<trans-unit id="imagecaption.ALT.uploads">
+				<source>Descriptions:</source>
+			</trans-unit>
+			<trans-unit id="imagecaption.ALT.uploads_formlabel">
+				<source>File Descriptions (one per line)</source>
+			</trans-unit>
+			<trans-unit id="imagecaption.ALT.script">
+				<source>Comments:</source>
+			</trans-unit>
+			<trans-unit id="bodytext.ALT.mailform">
+				<source>Configuration:</source>
+			</trans-unit>
+			<trans-unit id="bodytext.ALT.mailform_formlabel">
+				<source>Form Structure</source>
+			</trans-unit>
+			<trans-unit id="pages.ALT.mailform">
+				<source>Target Page</source>
+			</trans-unit>
+			<trans-unit id="pages.ALT.searchform">
+				<source>Target page</source>
+			</trans-unit>
+			<trans-unit id="pages.ALT.loginform">
+				<source>Selected pages: Target (1st), Frontend user container (2nd)</source>
+			</trans-unit>
+			<trans-unit id="pages.ALT.search">
+				<source>Send to Page:</source>
+			</trans-unit>
+			<trans-unit id="pages.ALT.login">
+				<source>Send to Page:</source>
+			</trans-unit>
+			<trans-unit id="pages.ALT.menu_formlabel">
+				<source>Selected Pages</source>
+			</trans-unit>
+			<trans-unit id="pages.ALT.list_formlabel">
+				<source>Record Storage Page</source>
+			</trans-unit>
+			<trans-unit id="pages.ALT.script_formlabel">
+				<source>Starting Point for This Script</source>
+			</trans-unit>
+			<trans-unit id="subheader.ALT.mailform">
+				<source>Recipient Email:</source>
+			</trans-unit>
+			<trans-unit id="subheader.ALT.mailform_formlabel">
+				<source>Recipient Email</source>
+			</trans-unit>
+			<trans-unit id="bodytext.ALT.html">
+				<source>HTML:</source>
+			</trans-unit>
+			<trans-unit id="menu.ALT.accessibility_title_formlabel">
+				<source>Menu block title</source>
+			</trans-unit>
+			<trans-unit id="menu.ALT.accessibility_bypass_formlabel">
+				<source>Add link to bypass navigation block</source>
+			</trans-unit>
+			<trans-unit id="menu.ALT.accessibility_bypass_text_formlabel">
+				<source>Link text to bypass navigation block</source>
+			</trans-unit>
+			<trans-unit id="tabs.text">
+				<source>Text</source>
+			</trans-unit>
+			<trans-unit id="tabs.media">
+				<source>Media</source>
+			</trans-unit>
+			<trans-unit id="tabs.plugin">
+				<source>Plugin</source>
+			</trans-unit>
+			<trans-unit id="sys_language_uid_formlabel">
+				<source>Language</source>
+			</trans-unit>
+			<trans-unit id="subheader_formlabel">
+				<source>Subheader</source>
+			</trans-unit>
+			<trans-unit id="hidden_formlabel">
+				<source>Content Element</source>
+			</trans-unit>
+			<trans-unit id="hidden.I.0">
+				<source>Disable</source>
+			</trans-unit>
+			<trans-unit id="starttime_formlabel">
+				<source>Publish Date</source>
+			</trans-unit>
+			<trans-unit id="endtime_formlabel">
+				<source>Expiration Date</source>
+			</trans-unit>
+			<trans-unit id="fe_group_formlabel">
+				<source>Usergroup Access Rights</source>
+			</trans-unit>
+			<trans-unit id="layout_formlabel">
+				<source>Layout</source>
+			</trans-unit>
+			<trans-unit id="bodytext_formlabel">
+				<source>Text</source>
+			</trans-unit>
+			<trans-unit id="bodytext.ALT.bulletlist_formlabel">
+				<source>Bullet List</source>
+			</trans-unit>
+			<trans-unit id="bodytext.ALT.table_formlabel">
+				<source>Table Structure</source>
+			</trans-unit>
+			<trans-unit id="bodytext.ALT.media_formlabel">
+				<source>Alternative Content</source>
+			</trans-unit>
+			<trans-unit id="bodytext.ALT.textbox_formlabel">
+				<source>Text</source>
+			</trans-unit>
+			<trans-unit id="bodytext.ALT.script_formlabel">
+				<source>Parameters to pass to the script</source>
+			</trans-unit>
+			<trans-unit id="bodytext.ALT.html_formlabel">
+				<source>HTML Code</source>
+			</trans-unit>
+			<trans-unit id="image_formlabel">
+				<source>Images</source>
+			</trans-unit>
+			<trans-unit id="image.ALT.textbox_formlabel">
+				<source>Image Files</source>
+			</trans-unit>
+			<trans-unit id="imagecaption_formlabel">
+				<source>Captions (one per line)</source>
+			</trans-unit>
+			<trans-unit id="imagecaption.ALT.script_formlabel">
+				<source>Comments</source>
+			</trans-unit>
+			<trans-unit id="field.default.hidden">
+				<source>Visibility of content element</source>
+			</trans-unit>
+			<trans-unit id="field.table.bodytext">
+				<source>Table content</source>
+			</trans-unit>
+			<trans-unit id="palette.general">
+				<source>Content Element</source>
+			</trans-unit>
+			<trans-unit id="palette.headers">
+				<source>Headlines</source>
+			</trans-unit>
+			<trans-unit id="palette.header">
+				<source>Header</source>
+			</trans-unit>
+			<trans-unit id="palette.visibility">
+				<source>Visibility</source>
+			</trans-unit>
+			<trans-unit id="palette.access">
+				<source>Publish Dates and Access Rights</source>
+			</trans-unit>
+			<trans-unit id="palette.frames">
+				<source>Content Element Layout</source>
+			</trans-unit>
+			<trans-unit id="palette.textlayout">
+				<source>Text Layout</source>
+			</trans-unit>
+			<trans-unit id="palette.imagefiles">
+				<source>Images and Captions</source>
+			</trans-unit>
+			<trans-unit id="palette.imagelinks">
+				<source>Behavior</source>
+			</trans-unit>
+			<trans-unit id="palette.image_accessibility">
+				<source>Accessibility</source>
+			</trans-unit>
+			<trans-unit id="palette.image_settings">
+				<source>Image Adjustments</source>
+			</trans-unit>
+			<trans-unit id="palette.imageblock">
+				<source>Image Alignment</source>
+			</trans-unit>
+			<trans-unit id="palette.mailform">
+				<source>Target and Recipient</source>
+			</trans-unit>
+			<trans-unit id="palette.searchform">
+				<source>Search Results</source>
+			</trans-unit>
+			<trans-unit id="palette.loginform">
+				<source>Redirect Target and Frontend User Container</source>
+			</trans-unit>
+			<trans-unit id="palette.multimediafiles">
+				<source>Media Files and Parameters</source>
+			</trans-unit>
+			<trans-unit id="palette.textbox">
+				<source>Render Text into Images</source>
+			</trans-unit>
+			<trans-unit id="palette.menu">
+				<source>Menu and Sitemap</source>
+			</trans-unit>
+			<trans-unit id="palette.menu_accessibility">
+				<source>Accessibility</source>
+			</trans-unit>
+			<trans-unit id="palette.uploads_layout">
+				<source>Filelinks Layout</source>
+			</trans-unit>
+			<trans-unit id="palette.table_layout">
+				<source>Table Layout</source>
+			</trans-unit>
+			<trans-unit id="palette.appearanceLinks">
+				<source>Links</source>
+			</trans-unit>
+			<trans-unit id="tabs.access">
+				<source>Access</source>
+			</trans-unit>
+			<trans-unit id="tabs.appearance">
+				<source>Appearance</source>
+			</trans-unit>
+			<trans-unit id="tabs.behaviour">
+				<source>Behaviour</source>
+			</trans-unit>
+			<trans-unit id="tabs.script">
+				<source>Script</source>
+			</trans-unit>
+			<trans-unit id="tabs.images">
+				<source>Images</source>
+			</trans-unit>
+			<trans-unit id="tabs.extended">
+				<source>Extended</source>
+			</trans-unit>
+			<trans-unit id="tabs.accessibility">
+				<source>Accessibility</source>
+			</trans-unit>
+		</body>
+	</file>
+</xliff>
diff --git a/typo3/sysext/compatibility6/Resources/Private/Language/locallang_wizards.xlf b/typo3/sysext/compatibility6/Resources/Private/Language/locallang_wizards.xlf
new file mode 100644
index 000000000000..02d04ae9af72
--- /dev/null
+++ b/typo3/sysext/compatibility6/Resources/Private/Language/locallang_wizards.xlf
@@ -0,0 +1,335 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xliff version="1.0" xmlns:t3="http://typo3.org/schemas/xliff">
+	<file t3:id="1415814890" source-language="en" datatype="plaintext" original="messages" date="2011-10-17T20:22:34Z" product-name="lang">
+		<header/>
+		<body>
+			<trans-unit id="rte_undoLastChange">
+				<source>Undo/Redo last change (%s ago)</source>
+			</trans-unit>
+			<trans-unit id="tsprop">
+				<source>TypoScript property lookup</source>
+			</trans-unit>
+			<trans-unit id="tsprop_TSref">
+				<source>TSref online</source>
+			</trans-unit>
+			<trans-unit id="tsprop_tsconfig">
+				<source>TSconfig online</source>
+			</trans-unit>
+			<trans-unit id="tsprop_title">
+				<source>Object title</source>
+			</trans-unit>
+			<trans-unit id="tsprop_prefix">
+				<source>Object prefix</source>
+			</trans-unit>
+			<trans-unit id="tsprop_mixer_indent">
+				<source>Indent +2</source>
+			</trans-unit>
+			<trans-unit id="tsprop_mixer_outdent">
+				<source>Outdent -2</source>
+			</trans-unit>
+			<trans-unit id="tsprop_mixer_wrap">
+				<source>Wrap</source>
+			</trans-unit>
+			<trans-unit id="tsprop_mixer_transfer">
+				<source>Transfer &amp; Close</source>
+			</trans-unit>
+			<trans-unit id="tsprop_addToList">
+				<source>Add to list...</source>
+			</trans-unit>
+			<trans-unit id="table_title">
+				<source>Table wizard</source>
+			</trans-unit>
+			<trans-unit id="table_smallFields">
+				<source>Small fields</source>
+			</trans-unit>
+			<trans-unit id="table_addColumn">
+				<source>Add column to the right</source>
+			</trans-unit>
+			<trans-unit id="table_removeColumn">
+				<source>Remove column</source>
+			</trans-unit>
+			<trans-unit id="table_addRow">
+				<source>Add row below</source>
+			</trans-unit>
+			<trans-unit id="table_removeRow">
+				<source>Remove row</source>
+			</trans-unit>
+			<trans-unit id="table_left">
+				<source>Move left</source>
+			</trans-unit>
+			<trans-unit id="table_right">
+				<source>Move right</source>
+			</trans-unit>
+			<trans-unit id="table_up">
+				<source>Move up</source>
+			</trans-unit>
+			<trans-unit id="table_down">
+				<source>Move down</source>
+			</trans-unit>
+			<trans-unit id="table_top">
+				<source>Move to top</source>
+			</trans-unit>
+			<trans-unit id="table_bottom">
+				<source>Move to bottom</source>
+			</trans-unit>
+			<trans-unit id="table_start">
+				<source>Move to first column</source>
+			</trans-unit>
+			<trans-unit id="table_end">
+				<source>Move to last column</source>
+			</trans-unit>
+			<trans-unit id="table_noData">
+				<source>No table,field or uid given</source>
+			</trans-unit>
+			<trans-unit id="forms_title">
+				<source>Forms wizard</source>
+			</trans-unit>
+			<trans-unit id="forms_refresh">
+				<source>Refresh without saving</source>
+			</trans-unit>
+			<trans-unit id="forms_label">
+				<source>Label</source>
+			</trans-unit>
+			<trans-unit id="forms_type">
+				<source>Type</source>
+			</trans-unit>
+			<trans-unit id="forms_type_textarea">
+				<source>Text area</source>
+			</trans-unit>
+			<trans-unit id="forms_type_input">
+				<source>Input field</source>
+			</trans-unit>
+			<trans-unit id="forms_type_password">
+				<source>Password field</source>
+			</trans-unit>
+			<trans-unit id="forms_type_file">
+				<source>File upload</source>
+			</trans-unit>
+			<trans-unit id="forms_type_check">
+				<source>Check box</source>
+			</trans-unit>
+			<trans-unit id="forms_type_select">
+				<source>Selector box</source>
+			</trans-unit>
+			<trans-unit id="forms_type_radio">
+				<source>Radio buttons</source>
+			</trans-unit>
+			<trans-unit id="forms_type_hidden">
+				<source>Hidden value</source>
+			</trans-unit>
+			<trans-unit id="forms_type_submit">
+				<source>Submit Button</source>
+			</trans-unit>
+			<trans-unit id="forms_type_property">
+				<source>Property</source>
+			</trans-unit>
+			<trans-unit id="forms_type_label">
+				<source>Label</source>
+			</trans-unit>
+			<trans-unit id="forms_required">
+				<source>Required</source>
+			</trans-unit>
+			<trans-unit id="forms_fieldName">
+				<source>Field</source>
+			</trans-unit>
+			<trans-unit id="forms_cols">
+				<source>Columns</source>
+			</trans-unit>
+			<trans-unit id="forms_rows">
+				<source>Rows</source>
+			</trans-unit>
+			<trans-unit id="forms_size">
+				<source>Size</source>
+			</trans-unit>
+			<trans-unit id="forms_max">
+				<source>Max</source>
+			</trans-unit>
+			<trans-unit id="forms_autosize">
+				<source>Auto size</source>
+			</trans-unit>
+			<trans-unit id="forms_extra">
+				<source>No Wrap</source>
+			</trans-unit>
+			<trans-unit id="forms_default">
+				<source>Value</source>
+			</trans-unit>
+			<trans-unit id="forms_multiple">
+				<source>Multiple</source>
+			</trans-unit>
+			<trans-unit id="forms_options">
+				<source>List options</source>
+			</trans-unit>
+			<trans-unit id="forms_checked">
+				<source>Checked</source>
+			</trans-unit>
+			<trans-unit id="forms_preview">
+				<source>Preview of element</source>
+			</trans-unit>
+			<trans-unit id="forms_element">
+				<source>Element type</source>
+			</trans-unit>
+			<trans-unit id="forms_config">
+				<source>Detailed configuration</source>
+			</trans-unit>
+			<trans-unit id="forms_eform_subject">
+				<source>Subject</source>
+			</trans-unit>
+			<trans-unit id="forms_eform_recipient">
+				<source>Recipient email</source>
+			</trans-unit>
+			<trans-unit id="forms_eform_html_enabled">
+				<source>HTML mode enabled</source>
+			</trans-unit>
+			<trans-unit id="forms_eform_formtype_mail">
+				<source>Send button label</source>
+			</trans-unit>
+			<trans-unit id="forms_special_eform">
+				<source>Special configuration for mail forms</source>
+			</trans-unit>
+			<trans-unit id="colorpicker_title">
+				<source>Color Picker</source>
+			</trans-unit>
+			<trans-unit id="colorpicker_setClose">
+				<source>Save and Close</source>
+			</trans-unit>
+			<trans-unit id="colorpicker_colorValue">
+				<source>Selected Color:</source>
+			</trans-unit>
+			<trans-unit id="colorpicker_fromImage">
+				<source>Capture color from image (click on image):</source>
+			</trans-unit>
+			<trans-unit id="colorpicker_fromMatrix">
+				<source>Select color from matrix (websafe colors):</source>
+			</trans-unit>
+			<trans-unit id="colorpicker_fromList">
+				<source>Select HTML color name:</source>
+			</trans-unit>
+			<trans-unit id="colorpicker_black">
+				<source>BLACK</source>
+			</trans-unit>
+			<trans-unit id="colorpicker_white">
+				<source>WHITE</source>
+			</trans-unit>
+			<trans-unit id="grid_windowTitle">
+				<source>Set cell name and column number</source>
+			</trans-unit>
+			<trans-unit id="grid_labelName">
+				<source>Name</source>
+			</trans-unit>
+			<trans-unit id="grid_labelColumn">
+				<source>Column Number</source>
+			</trans-unit>
+			<trans-unit id="grid_labelSave">
+				<source>Save to cell</source>
+			</trans-unit>
+			<trans-unit id="grid_addColumn">
+				<source>Add column</source>
+			</trans-unit>
+			<trans-unit id="grid_removeColumn">
+				<source>Remove column</source>
+			</trans-unit>
+			<trans-unit id="grid_addRow">
+				<source>Add row</source>
+			</trans-unit>
+			<trans-unit id="grid_removeRow">
+				<source>Remove row</source>
+			</trans-unit>
+			<trans-unit id="grid_editCell">
+				<source>Edit cell</source>
+			</trans-unit>
+			<trans-unit id="grid_mergeCell">
+				<source>Combine with next cell</source>
+			</trans-unit>
+			<trans-unit id="grid_splitCell">
+				<source>Split cell</source>
+			</trans-unit>
+			<trans-unit id="grid_name">
+				<source>Name</source>
+			</trans-unit>
+			<trans-unit id="grid_column">
+				<source>Column number</source>
+			</trans-unit>
+			<trans-unit id="grid_notSet">
+				<source>not set</source>
+			</trans-unit>
+			<trans-unit id="grid_nameHelp">
+				<source>Enter a name for the cell.</source>
+			</trans-unit>
+			<trans-unit id="grid_columnHelp">
+				<source>The column position defines in which area the content is rendered in the frontend.</source>
+			</trans-unit>
+			<trans-unit id="imwizard.open-editor">
+				<source>Open Editor</source>
+			</trans-unit>
+			<trans-unit id="imwizard.supported-types-message">
+				<source>Image manipulation is only available for supported types:</source>
+			</trans-unit>
+			<trans-unit id="imwizard.no-image-found">
+				<source>No image found</source>
+			</trans-unit>
+			<trans-unit id="imwizard.no-image-found-message">
+				<source>No image found. Could also be that image is present but that the original dimensions are unknow.</source>
+			</trans-unit>
+			<trans-unit id="imwizard.image-manipulation">
+				<source>Image manipulation</source>
+			</trans-unit>
+			<trans-unit id="imwizard.image-title">
+				<source>Title</source>
+			</trans-unit>
+			<trans-unit id="imwizard.original-dimensions">
+				<source>Original dimensions</source>
+			</trans-unit>
+			<trans-unit id="imwizard.reset">
+				<source>Reset</source>
+			</trans-unit>
+			<trans-unit id="imwizard.accept">
+				<source>Accept</source>
+			</trans-unit>
+			<trans-unit id="imwizard.cancel">
+				<source>Cancel</source>
+			</trans-unit>
+			<trans-unit id="imwizard.aspect-ratio">
+				<source>Aspect ratio</source>
+			</trans-unit>
+			<trans-unit id="imwizard.set-aspect-ratio">
+				<source>Set Aspect Ratio</source>
+			</trans-unit>
+			<trans-unit id="imwizard.ratio.16_9">
+				<source>16:9</source>
+			</trans-unit>
+			<trans-unit id="imwizard.ratio.4_3">
+				<source>4:3</source>
+			</trans-unit>
+			<trans-unit id="imwizard.ratio.1_1">
+				<source>1:1</source>
+			</trans-unit>
+			<trans-unit id="imwizard.ratio.free">
+				<source>Free</source>
+			</trans-unit>
+			<trans-unit id="imwizard.zoom">
+				<source>Zoom</source>
+			</trans-unit>
+			<trans-unit id="imwizard.zoom-in">
+				<source>Zoom in</source>
+			</trans-unit>
+			<trans-unit id="imwizard.zoom-out">
+				<source>Zoom out</source>
+			</trans-unit>
+			<trans-unit id="imwizard.selection">
+				<source>Selected Size</source>
+			</trans-unit>
+			<trans-unit id="imwizard.crop-x">
+				<source>x:</source>
+			</trans-unit>
+			<trans-unit id="imwizard.crop-y">
+				<source>y:</source>
+			</trans-unit>
+			<trans-unit id="imwizard.crop-width">
+				<source>width:</source>
+			</trans-unit>
+			<trans-unit id="imwizard.crop-height">
+				<source>height:</source>
+			</trans-unit>
+		</body>
+	</file>
+</xliff>
diff --git a/typo3/sysext/compatibility6/Resources/Public/Images/wizard_link.gif b/typo3/sysext/compatibility6/Resources/Public/Images/wizard_link.gif
new file mode 100644
index 0000000000000000000000000000000000000000..7bfa6582dfc9e9904718c9ad1a2062bf95f89634
GIT binary patch
literal 582
zcmV-M0=fN1Nk%w1VGsZi0OoxFo}QlF-QA6ijd5{t{rAWB_xDjzQM<dlWo2beO-+%J
zk=3GU)S_$J+S={PZTITj`tj!a@Z|E=dWB~$?$ddQh=`Jsl9ZH`*~O>A!ov9Y`1aGT
z<jGZ+mzVeN<*=}@-I+@L_QZ2$JVixC+?h)8)O+>q<G{ec?$&|z-&@$&*zM4G{NTjr
z*R-mML-pKW_upgg*s<r!cfPHN{r1Alsc@*6W7E^q+p&fG{QUp&;Jv-Q#h6Kzh+o9S
z#Lv&q_u^YdMn>J8QEO{!_1s=*X=(T2TJX}edwYBD(yWPME6kQzzIqz?;$7|2e9^a%
zdu==M@$uKXc7}$AaBy&efq~bfWA@!_si~>o-`}olC*Pk=^5)p*zIXQK)R2&n(49uk
z&d#o`uJF@&t*xzLVPQx}NZ6%VT0<DvnpD-cddY=B|MTVNz>E3gvWtt0+uPfDd3pKC
zk@?4zZf<VAicH6kN&5Qw!NI|so15t9==SQ|s+)5E|Nj6000000A^8LW004aeEC2ui
z01yBW000N0fPI34goTEOh>41d1qT8EZ&^`~0tW?ycK`}{0eA{|4FNuUXE<OnCrBz4
z2?!Q(2njY_M{G$;UsE?4W;<aSWKbw>Z5u2MSOY&*BS8iRB2FP!4ps{u0Yw)dVjTlL
z6a+6o5?gzHIdEk|RCF^k1Vlz9AYO+pQZz74V<ZrV7}PxBkYa_92#8$hNW+AOod<~~
U%#pK33l~Lbl+>wV;!q#}JN9lg_W%F@

literal 0
HcmV?d00001

diff --git a/typo3/sysext/compatibility6/ext_localconf.php b/typo3/sysext/compatibility6/ext_localconf.php
index c3f2a7815262..e26e82b4aa88 100644
--- a/typo3/sysext/compatibility6/ext_localconf.php
+++ b/typo3/sysext/compatibility6/ext_localconf.php
@@ -97,8 +97,8 @@ if (!\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('form')) {
 	mod.wizards.newContentElement.wizardItems.forms {
 		elements.mailform {
 			iconIdentifier = content-elements-mailform
-			title = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:forms_mail_title
-			description = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:forms_mail_description
+			title = LLL:EXT:compatibility6/Resources/Private/Language/locallang.xlf:forms_mail_title
+			description = LLL:EXT:compatibility6/Resources/Private/Language/locallang.xlf:forms_mail_description
 			tt_content_defValues {
 				CType = mailform
 				bodytext (
@@ -138,8 +138,8 @@ if (!\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('form')) {
 mod.wizards.newContentElement.wizardItems.forms {
 	elements.search {
 		iconIdentifier = content-elements-searchform
-		title = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:forms_search_title
-		description = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:forms_search_description
+		title = LLL:EXT:compatibility6/Resources/Private/Language/locallang.xlf:forms_search_title
+		description = LLL:EXT:compatibility6/Resources/Private/Language/locallang.xlf:forms_search_description
 		tt_content_defValues.CType = search
 	}
 	show :=addToList(search)
diff --git a/typo3/sysext/lang/locallang_tca.xlf b/typo3/sysext/lang/locallang_tca.xlf
index c6b6e35e8c5c..c5bdc2241b3b 100644
--- a/typo3/sysext/lang/locallang_tca.xlf
+++ b/typo3/sysext/lang/locallang_tca.xlf
@@ -366,9 +366,6 @@
 			<trans-unit id="is_siteroot">
 				<source>Is root of website:</source>
 			</trans-unit>
-			<trans-unit id="storage_pid">
-				<source>General Record Storage page:</source>
-			</trans-unit>
 			<trans-unit id="be_users">
 				<source>Backend user</source>
 			</trans-unit>
-- 
GitLab