diff --git a/typo3/sysext/adodb/checkconnectionwizard.php b/typo3/sysext/adodb/checkconnectionwizard.php
index 2a183ed19207113383303d62e5edd4051f7962cd..7616151d293440b62c3ea6a23009f2659a1eaeec 100644
--- a/typo3/sysext/adodb/checkconnectionwizard.php
+++ b/typo3/sysext/adodb/checkconnectionwizard.php
@@ -33,7 +33,7 @@ require $BACK_PATH . 'init.php';
 // Include ADODB library:
 require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('adodb') . 'adodb/adodb.inc.php';
 // Include language labels:
-$LANG->includeLLFile('EXT:adodb/locallang_wizard.xml');
+$LANG->includeLLFile('EXT:adodb/locallang_wizard.xlf');
 /*
  * @deprecated since 6.0, the classname tx_adodb_checkconnectionwizard and this file is obsolete
  * and will be removed with 6.2. The class was renamed and is now located at:
diff --git a/typo3/sysext/backend/Classes/Controller/File/RenameFileController.php b/typo3/sysext/backend/Classes/Controller/File/RenameFileController.php
index 241b1ba8b0b5d273607f4f70992334e6190f480c..024660c8d41694bf4cb0548969c7fb181139140a 100644
--- a/typo3/sysext/backend/Classes/Controller/File/RenameFileController.php
+++ b/typo3/sysext/backend/Classes/Controller/File/RenameFileController.php
@@ -130,7 +130,6 @@ class RenameFileController {
 	 * @todo Define visibility
 	 */
 	public function main() {
-		//TODO: change locallang*.php to locallang*.xml
 		// Make page header:
 		$this->content = $this->doc->startPage($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:file_rename.php.pagetitle'));
 		$pageContent = $this->doc->header($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:file_rename.php.pagetitle'));
diff --git a/typo3/sysext/backend/Classes/Controller/NewRecordController.php b/typo3/sysext/backend/Classes/Controller/NewRecordController.php
index 9e4ac4f1e42a6c471f3836afb0b2d2f8de9833c9..a964d6344f3a33279ea414e45a278463d9a0f9a8 100644
--- a/typo3/sysext/backend/Classes/Controller/NewRecordController.php
+++ b/typo3/sysext/backend/Classes/Controller/NewRecordController.php
@@ -289,7 +289,7 @@ class NewRecordController {
 		if (!$this->pagesOnly) {
 			// New page
 			if ($this->showNewRecLink('pages')) {
-				$buttons['new_page'] = '<a href="' . htmlspecialchars(GeneralUtility::linkThisScript(array('pagesOnly' => '1'))) . '" title="' . $GLOBALS['LANG']->sL('LLL:EXT:cms/layout/locallang.xml:newPage', 1) . '">' . IconUtility::getSpriteIcon('actions-page-new') . '</a>';
+				$buttons['new_page'] = '<a href="' . htmlspecialchars(GeneralUtility::linkThisScript(array('pagesOnly' => '1'))) . '" title="' . $GLOBALS['LANG']->sL('LLL:EXT:cms/layout/locallang.xlf:newPage', 1) . '">' . IconUtility::getSpriteIcon('actions-page-new') . '</a>';
 			}
 			// CSH
 			$buttons['csh'] = BackendUtility::cshItem('xMOD_csh_corebe', 'new_regular', $GLOBALS['BACK_PATH'], '', TRUE);
diff --git a/typo3/sysext/backend/Classes/Controller/PageLayoutController.php b/typo3/sysext/backend/Classes/Controller/PageLayoutController.php
index 59c4d7a30c600276588ff241cc6837bb557d7dc3..02852f03366769c2952e4d35ac578054e6ee9649 100644
--- a/typo3/sysext/backend/Classes/Controller/PageLayoutController.php
+++ b/typo3/sysext/backend/Classes/Controller/PageLayoutController.php
@@ -279,7 +279,7 @@ class PageLayoutController {
 		// example settings:
 		// 	$GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['cms']['db_layout']['addTables']['tx_myext'] =
 		//		array ('default' => array(
-		//				'MENU' => 'LLL:EXT:tx_myext/locallang_db.xml:menuDefault',
+		//				'MENU' => 'LLL:EXT:tx_myext/locallang_db.xlf:menuDefault',
 		//				'fList' =>  'title,description,image',
 		//				'icon' => TRUE));
 		if (is_array($this->externalTables)) {
diff --git a/typo3/sysext/backend/Classes/Controller/PageTreeNavigationController.php b/typo3/sysext/backend/Classes/Controller/PageTreeNavigationController.php
index ea6208fccea5946e673e7b8d333b5991c2b0bd42..54f4a1f2956f651df0fdb16de89affde344b488f 100644
--- a/typo3/sysext/backend/Classes/Controller/PageTreeNavigationController.php
+++ b/typo3/sysext/backend/Classes/Controller/PageTreeNavigationController.php
@@ -252,14 +252,14 @@ class PageTreeNavigationController {
 		);
 		// New Page
 		$onclickNewPageWizard = 'top.content.list_frame.location.href=top.TS.PATH_typo3+\'db_new.php?pagesOnly=1&amp;id=\'+Tree.pageID;';
-		$buttons['new_page'] = '<a href="#" onclick="' . $onclickNewPageWizard . '" title="' . $GLOBALS['LANG']->sL('LLL:EXT:cms/layout/locallang.xml:newPage', TRUE) . '">' . IconUtility::getSpriteIcon('actions-page-new') . '</a>';
+		$buttons['new_page'] = '<a href="#" onclick="' . $onclickNewPageWizard . '" title="' . $GLOBALS['LANG']->sL('LLL:EXT:cms/layout/locallang.xlf:newPage', TRUE) . '">' . IconUtility::getSpriteIcon('actions-page-new') . '</a>';
 		// Refresh
 		$buttons['refresh'] = '<a href="' . htmlspecialchars(GeneralUtility::getIndpEnv('REQUEST_URI')) . '" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.refresh', TRUE) . '">' . IconUtility::getSpriteIcon('actions-system-refresh') . '</a>';
 		// CSH
 		$buttons['csh'] = str_replace('typo3-csh-inline', 'typo3-csh-inline show-right', BackendUtility::cshItem('xMOD_csh_corebe', 'pagetree', $GLOBALS['BACK_PATH'], '', TRUE));
 		// Filter
 		if ($this->hasFilterBox) {
-			$buttons['filter'] = '<a href="#" id="tree-toolbar-filter-item">' . IconUtility::getSpriteIcon('actions-system-tree-search-open', array('title' => $GLOBALS['LANG']->sL('LLL:EXT:cms/layout/locallang.xml:labels.filter', 1))) . '</a>';
+			$buttons['filter'] = '<a href="#" id="tree-toolbar-filter-item">' . IconUtility::getSpriteIcon('actions-system-tree-search-open', array('title' => $GLOBALS['LANG']->sL('LLL:EXT:cms/layout/locallang.xlf:labels.filter', 1))) . '</a>';
 		}
 		return $buttons;
 	}
diff --git a/typo3/sysext/backend/Classes/Form/Element/InlineElement.php b/typo3/sysext/backend/Classes/Form/Element/InlineElement.php
index 986b1b462c193173ea2b67e0f7d9e0a683310c8a..6190730bc7687a41092df996d4c849fbbb6b2057 100644
--- a/typo3/sysext/backend/Classes/Form/Element/InlineElement.php
+++ b/typo3/sysext/backend/Classes/Form/Element/InlineElement.php
@@ -996,7 +996,7 @@ class InlineElement {
 	 * @return void
 	 */
 	protected function processAjaxRequestConstruct(&$ajaxArguments) {
-		$GLOBALS['LANG']->includeLLFile('EXT:lang/locallang_alt_doc.xml');
+		$GLOBALS['LANG']->includeLLFile('EXT:lang/locallang_alt_doc.xlf');
 		// Create a new anonymous object:
 		$GLOBALS['SOBE'] = new \stdClass();
 		$GLOBALS['SOBE']->MOD_MENU = array(
diff --git a/typo3/sysext/backend/Classes/Tree/Pagetree/ExtdirectTreeDataProvider.php b/typo3/sysext/backend/Classes/Tree/Pagetree/ExtdirectTreeDataProvider.php
index eccef18d2a3bf616545adaaafb6935ebbfe91fef..2a1f281cdb92364ed199dfac672c1a23a9a7d459 100644
--- a/typo3/sysext/backend/Classes/Tree/Pagetree/ExtdirectTreeDataProvider.php
+++ b/typo3/sysext/backend/Classes/Tree/Pagetree/ExtdirectTreeDataProvider.php
@@ -186,9 +186,9 @@ class ExtdirectTreeDataProvider extends \TYPO3\CMS\Backend\Tree\AbstractExtJsTre
 				'dropZoneElementRestored' => $GLOBALS['LANG']->sL($file . 'tree.dropZoneElementRestored', TRUE),
 				'searchTermInfo' => $GLOBALS['LANG']->sL($file . 'tree.searchTermInfo', TRUE),
 				'temporaryMountPointIndicatorInfo' => $GLOBALS['LANG']->sl($file . 'labels.temporaryDBmount', TRUE),
-				'deleteDialogTitle' => $GLOBALS['LANG']->sL('LLL:EXT:cms/layout/locallang.xml:deleteItem', TRUE),
-				'deleteDialogMessage' => $GLOBALS['LANG']->sL('LLL:EXT:cms/layout/locallang.xml:deleteWarning', TRUE),
-				'recursiveDeleteDialogMessage' => $GLOBALS['LANG']->sL('LLL:EXT:cms/layout/locallang.xml:recursiveDeleteWarning', TRUE)
+				'deleteDialogTitle' => $GLOBALS['LANG']->sL('LLL:EXT:cms/layout/locallang.xlf:deleteItem', TRUE),
+				'deleteDialogMessage' => $GLOBALS['LANG']->sL('LLL:EXT:cms/layout/locallang.xlf:deleteWarning', TRUE),
+				'recursiveDeleteDialogMessage' => $GLOBALS['LANG']->sL('LLL:EXT:cms/layout/locallang.xlf:recursiveDeleteWarning', TRUE)
 			),
 			'Configuration' => array(
 				'hideFilter' => $GLOBALS['BE_USER']->getTSConfigVal('options.pageTree.hideFilter'),
diff --git a/typo3/sysext/cms/Configuration/TCA/tt_content.php b/typo3/sysext/cms/Configuration/TCA/tt_content.php
index e1cc60152aa64b06c601a92450e57d5d29ad5eeb..84f9d97a3f069b34ca47063289111d342386fe63 100644
--- a/typo3/sysext/cms/Configuration/TCA/tt_content.php
+++ b/typo3/sysext/cms/Configuration/TCA/tt_content.php
@@ -84,98 +84,98 @@ return array(
 				'type' => 'select',
 				'items' => array(
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:CType.div.standard',
+						'LLL:EXT:cms/locallang_ttc.xlf:CType.div.standard',
 						'--div--'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:CType.I.0',
+						'LLL:EXT:cms/locallang_ttc.xlf:CType.I.0',
 						'header',
 						'i/tt_content_header.gif'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:CType.I.1',
+						'LLL:EXT:cms/locallang_ttc.xlf:CType.I.1',
 						'text',
 						'i/tt_content.gif'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:CType.I.2',
+						'LLL:EXT:cms/locallang_ttc.xlf:CType.I.2',
 						'textpic',
 						'i/tt_content_textpic.gif'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:CType.I.3',
+						'LLL:EXT:cms/locallang_ttc.xlf:CType.I.3',
 						'image',
 						'i/tt_content_image.gif'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:CType.div.lists',
+						'LLL:EXT:cms/locallang_ttc.xlf:CType.div.lists',
 						'--div--'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:CType.I.4',
+						'LLL:EXT:cms/locallang_ttc.xlf:CType.I.4',
 						'bullets',
 						'i/tt_content_bullets.gif'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:CType.I.5',
+						'LLL:EXT:cms/locallang_ttc.xlf:CType.I.5',
 						'table',
 						'i/tt_content_table.gif'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:CType.I.6',
+						'LLL:EXT:cms/locallang_ttc.xlf:CType.I.6',
 						'uploads',
 						'i/tt_content_uploads.gif'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:CType.div.forms',
+						'LLL:EXT:cms/locallang_ttc.xlf:CType.div.forms',
 						'--div--'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:CType.I.8',
+						'LLL:EXT:cms/locallang_ttc.xlf:CType.I.8',
 						'mailform',
 						'i/tt_content_form.gif'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:CType.I.9',
+						'LLL:EXT:cms/locallang_ttc.xlf:CType.I.9',
 						'search',
 						'i/tt_content_search.gif'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:CType.div.special',
+						'LLL:EXT:cms/locallang_ttc.xlf:CType.div.special',
 						'--div--'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:CType.I.7',
+						'LLL:EXT:cms/locallang_ttc.xlf:CType.I.7',
 						'multimedia',
 						'i/tt_content_mm.gif'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:CType.I.18',
+						'LLL:EXT:cms/locallang_ttc.xlf:CType.I.18',
 						'media',
 						'i/tt_content_mm.gif'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:CType.I.12',
+						'LLL:EXT:cms/locallang_ttc.xlf:CType.I.12',
 						'menu',
 						'i/tt_content_menu.gif'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:CType.I.13',
+						'LLL:EXT:cms/locallang_ttc.xlf:CType.I.13',
 						'shortcut',
 						'i/tt_content_shortcut.gif'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:CType.I.14',
+						'LLL:EXT:cms/locallang_ttc.xlf:CType.I.14',
 						'list',
 						'i/tt_content_list.gif'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:CType.I.16',
+						'LLL:EXT:cms/locallang_ttc.xlf:CType.I.16',
 						'div',
 						'i/tt_content_div.gif'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:CType.I.17',
+						'LLL:EXT:cms/locallang_ttc.xlf:CType.I.17',
 						'html',
 						'i/tt_content_html.gif'
 					)
@@ -194,7 +194,7 @@ return array(
 				'type' => 'check',
 				'items' => array(
 					'1' => array(
-						'0' => 'LLL:EXT:cms/locallang_ttc.xml:hidden.I.0'
+						'0' => 'LLL:EXT:cms/locallang_ttc.xlf:hidden.I.0'
 					)
 				)
 			)
@@ -300,15 +300,15 @@ return array(
 						'0'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:layout.I.1',
+						'LLL:EXT:cms/locallang_ttc.xlf:layout.I.1',
 						'1'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:layout.I.2',
+						'LLL:EXT:cms/locallang_ttc.xlf:layout.I.2',
 						'2'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:layout.I.3',
+						'LLL:EXT:cms/locallang_ttc.xlf:layout.I.3',
 						'3'
 					)
 				),
@@ -317,13 +317,13 @@ return array(
 		),
 		'colPos' => array(
 			'exclude' => 1,
-			'label' => 'LLL:EXT:cms/locallang_ttc.xml:colPos',
+			'label' => 'LLL:EXT:cms/locallang_ttc.xlf:colPos',
 			'config' => array(
 				'type' => 'select',
 				'itemsProcFunc' => 'TYPO3\\CMS\\Backend\\View\\BackendLayoutView->colPosListItemProcFunc',
 				'items' => array(
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:colPos.I.0',
+						'LLL:EXT:cms/locallang_ttc.xlf:colPos.I.0',
 						'1'
 					),
 					array(
@@ -331,11 +331,11 @@ return array(
 						'0'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:colPos.I.2',
+						'LLL:EXT:cms/locallang_ttc.xlf:colPos.I.2',
 						'2'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:colPos.I.3',
+						'LLL:EXT:cms/locallang_ttc.xlf:colPos.I.3',
 						'3'
 					)
 				),
@@ -344,7 +344,7 @@ return array(
 		),
 		'date' => array(
 			'exclude' => 1,
-			'label' => 'LLL:EXT:cms/locallang_ttc.xml:date',
+			'label' => 'LLL:EXT:cms/locallang_ttc.xlf:date',
 			'config' => array(
 				'type' => 'input',
 				'size' => '13',
@@ -356,7 +356,7 @@ return array(
 		'header' => array(
 			'l10n_mode' => 'prefixLangTitle',
 			'l10n_cat' => 'text',
-			'label' => 'LLL:EXT:cms/locallang_ttc.xml:header',
+			'label' => 'LLL:EXT:cms/locallang_ttc.xlf:header',
 			'config' => array(
 				'type' => 'input',
 				'size' => '50',
@@ -364,7 +364,7 @@ return array(
 			)
 		),
 		'header_position' => array(
-			'label' => 'LLL:EXT:cms/locallang_ttc.xml:header_position',
+			'label' => 'LLL:EXT:cms/locallang_ttc.xlf:header_position',
 			'exclude' => 1,
 			'config' => array(
 				'type' => 'select',
@@ -374,15 +374,15 @@ return array(
 						''
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:header_position.I.1',
+						'LLL:EXT:cms/locallang_ttc.xlf:header_position.I.1',
 						'center'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:header_position.I.2',
+						'LLL:EXT:cms/locallang_ttc.xlf:header_position.I.2',
 						'right'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:header_position.I.3',
+						'LLL:EXT:cms/locallang_ttc.xlf:header_position.I.3',
 						'left'
 					)
 				),
@@ -390,7 +390,7 @@ return array(
 			)
 		),
 		'header_link' => array(
-			'label' => 'LLL:EXT:cms/locallang_ttc.xml:header_link',
+			'label' => 'LLL:EXT:cms/locallang_ttc.xlf:header_link',
 			'exclude' => 1,
 			'config' => array(
 				'type' => 'input',
@@ -401,7 +401,7 @@ return array(
 					'_PADDING' => 2,
 					'link' => array(
 						'type' => 'popup',
-						'title' => 'LLL:EXT:cms/locallang_ttc.xml:header_link_formlabel',
+						'title' => 'LLL:EXT:cms/locallang_ttc.xlf:header_link_formlabel',
 						'icon' => 'link_popup.gif',
 						'script' => 'browse_links.php?mode=wizard',
 						'JSopenParams' => 'height=300,width=500,status=0,menubar=0,scrollbars=1'
@@ -421,27 +421,27 @@ return array(
 						'0'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:header_layout.I.1',
+						'LLL:EXT:cms/locallang_ttc.xlf:header_layout.I.1',
 						'1'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:header_layout.I.2',
+						'LLL:EXT:cms/locallang_ttc.xlf:header_layout.I.2',
 						'2'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:header_layout.I.3',
+						'LLL:EXT:cms/locallang_ttc.xlf:header_layout.I.3',
 						'3'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:header_layout.I.4',
+						'LLL:EXT:cms/locallang_ttc.xlf:header_layout.I.4',
 						'4'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:header_layout.I.5',
+						'LLL:EXT:cms/locallang_ttc.xlf:header_layout.I.5',
 						'5'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:header_layout.I.6',
+						'LLL:EXT:cms/locallang_ttc.xlf:header_layout.I.6',
 						'100'
 					)
 				),
@@ -473,7 +473,7 @@ return array(
 						'notNewRecords' => 1,
 						'RTEonly' => 1,
 						'type' => 'script',
-						'title' => 'LLL:EXT:cms/locallang_ttc.xml:bodytext.W.RTE',
+						'title' => 'LLL:EXT:cms/locallang_ttc.xlf:bodytext.W.RTE',
 						'icon' => 'wizard_rte2.gif',
 						'script' => 'wizard_rte.php'
 					),
@@ -481,7 +481,7 @@ return array(
 						'notNewRecords' => 1,
 						'enableByTypeConfig' => 1,
 						'type' => 'script',
-						'title' => 'LLL:EXT:cms/locallang_ttc.xml:bodytext.W.table',
+						'title' => 'LLL:EXT:cms/locallang_ttc.xlf:bodytext.W.table',
 						'icon' => 'wizard_table.gif',
 						'script' => 'wizard_table.php',
 						'params' => array(
@@ -492,7 +492,7 @@ return array(
 						'notNewRecords' => 1,
 						'enableByTypeConfig' => 1,
 						'type' => 'script',
-						'title' => 'LLL:EXT:cms/locallang_ttc.xml:bodytext.W.forms',
+						'title' => 'LLL:EXT:cms/locallang_ttc.xlf:bodytext.W.forms',
 						'icon' => 'wizard_forms.gif',
 						'script' => 'wizard_forms.php?special=formtype_mail',
 						'params' => array(
@@ -508,7 +508,7 @@ return array(
 		),
 		'text_align' => array(
 			'exclude' => 1,
-			'label' => 'LLL:EXT:cms/locallang_ttc.xml:text_align',
+			'label' => 'LLL:EXT:cms/locallang_ttc.xlf:text_align',
 			'config' => array(
 				'type' => 'select',
 				'items' => array(
@@ -517,15 +517,15 @@ return array(
 						''
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:text_align.I.1',
+						'LLL:EXT:cms/locallang_ttc.xlf:text_align.I.1',
 						'center'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:text_align.I.2',
+						'LLL:EXT:cms/locallang_ttc.xlf:text_align.I.2',
 						'right'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:text_align.I.3',
+						'LLL:EXT:cms/locallang_ttc.xlf:text_align.I.3',
 						'left'
 					)
 				),
@@ -534,7 +534,7 @@ return array(
 		),
 		'text_face' => array(
 			'exclude' => 1,
-			'label' => 'LLL:EXT:cms/locallang_ttc.xml:text_face',
+			'label' => 'LLL:EXT:cms/locallang_ttc.xlf:text_face',
 			'config' => array(
 				'type' => 'select',
 				'items' => array(
@@ -560,7 +560,7 @@ return array(
 		),
 		'text_size' => array(
 			'exclude' => 1,
-			'label' => 'LLL:EXT:cms/locallang_ttc.xml:text_size',
+			'label' => 'LLL:EXT:cms/locallang_ttc.xlf:text_size',
 			'config' => array(
 				'type' => 'select',
 				'items' => array(
@@ -569,31 +569,31 @@ return array(
 						'0'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:text_size.I.1',
+						'LLL:EXT:cms/locallang_ttc.xlf:text_size.I.1',
 						'1'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:text_size.I.2',
+						'LLL:EXT:cms/locallang_ttc.xlf:text_size.I.2',
 						'2'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:text_size.I.3',
+						'LLL:EXT:cms/locallang_ttc.xlf:text_size.I.3',
 						'3'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:text_size.I.4',
+						'LLL:EXT:cms/locallang_ttc.xlf:text_size.I.4',
 						'4'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:text_size.I.5',
+						'LLL:EXT:cms/locallang_ttc.xlf:text_size.I.5',
 						'5'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:text_size.I.6',
+						'LLL:EXT:cms/locallang_ttc.xlf:text_size.I.6',
 						'10'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:text_size.I.7',
+						'LLL:EXT:cms/locallang_ttc.xlf:text_size.I.7',
 						'11'
 					)
 				),
@@ -602,7 +602,7 @@ return array(
 		),
 		'text_color' => array(
 			'exclude' => 1,
-			'label' => 'LLL:EXT:cms/locallang_ttc.xml:text_color',
+			'label' => 'LLL:EXT:cms/locallang_ttc.xlf:text_color',
 			'config' => array(
 				'type' => 'select',
 				'items' => array(
@@ -611,15 +611,15 @@ return array(
 						'0'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:text_color.I.1',
+						'LLL:EXT:cms/locallang_ttc.xlf:text_color.I.1',
 						'1'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:text_color.I.2',
+						'LLL:EXT:cms/locallang_ttc.xlf:text_color.I.2',
 						'2'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:text_color.I.3',
+						'LLL:EXT:cms/locallang_ttc.xlf:text_color.I.3',
 						'200'
 					),
 					array(
@@ -627,47 +627,47 @@ return array(
 						'--div--'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:text_color.I.5',
+						'LLL:EXT:cms/locallang_ttc.xlf:text_color.I.5',
 						'240'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:text_color.I.6',
+						'LLL:EXT:cms/locallang_ttc.xlf:text_color.I.6',
 						'241'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:text_color.I.7',
+						'LLL:EXT:cms/locallang_ttc.xlf:text_color.I.7',
 						'242'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:text_color.I.8',
+						'LLL:EXT:cms/locallang_ttc.xlf:text_color.I.8',
 						'243'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:text_color.I.9',
+						'LLL:EXT:cms/locallang_ttc.xlf:text_color.I.9',
 						'244'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:text_color.I.10',
+						'LLL:EXT:cms/locallang_ttc.xlf:text_color.I.10',
 						'245'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:text_color.I.11',
+						'LLL:EXT:cms/locallang_ttc.xlf:text_color.I.11',
 						'246'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:text_color.I.12',
+						'LLL:EXT:cms/locallang_ttc.xlf:text_color.I.12',
 						'247'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:text_color.I.13',
+						'LLL:EXT:cms/locallang_ttc.xlf:text_color.I.13',
 						'248'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:text_color.I.14',
+						'LLL:EXT:cms/locallang_ttc.xlf:text_color.I.14',
 						'249'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:text_color.I.15',
+						'LLL:EXT:cms/locallang_ttc.xlf:text_color.I.15',
 						'250'
 					)
 				),
@@ -676,24 +676,24 @@ return array(
 		),
 		'text_properties' => array(
 			'exclude' => 1,
-			'label' => 'LLL:EXT:cms/locallang_ttc.xml:text_properties',
+			'label' => 'LLL:EXT:cms/locallang_ttc.xlf:text_properties',
 			'config' => array(
 				'type' => 'check',
 				'items' => array(
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:text_properties.I.0',
+						'LLL:EXT:cms/locallang_ttc.xlf:text_properties.I.0',
 						''
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:text_properties.I.1',
+						'LLL:EXT:cms/locallang_ttc.xlf:text_properties.I.1',
 						''
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:text_properties.I.2',
+						'LLL:EXT:cms/locallang_ttc.xlf:text_properties.I.2',
 						''
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:text_properties.I.3',
+						'LLL:EXT:cms/locallang_ttc.xlf:text_properties.I.3',
 						''
 					)
 				),
@@ -744,7 +744,7 @@ return array(
 		),
 		'imagewidth' => array(
 			'exclude' => 1,
-			'label' => 'LLL:EXT:cms/locallang_ttc.xml:imagewidth',
+			'label' => 'LLL:EXT:cms/locallang_ttc.xlf:imagewidth',
 			'config' => array(
 				'type' => 'input',
 				'size' => '4',
@@ -759,7 +759,7 @@ return array(
 		),
 		'imageheight' => array(
 			'exclude' => 1,
-			'label' => 'LLL:EXT:cms/locallang_ttc.xml:imageheight',
+			'label' => 'LLL:EXT:cms/locallang_ttc.xlf:imageheight',
 			'config' => array(
 				'type' => 'input',
 				'size' => '4',
@@ -774,61 +774,61 @@ return array(
 		),
 		'imageorient' => array(
 			'exclude' => 1,
-			'label' => 'LLL:EXT:cms/locallang_ttc.xml:imageorient',
+			'label' => 'LLL:EXT:cms/locallang_ttc.xlf:imageorient',
 			'config' => array(
 				'type' => 'select',
 				'items' => array(
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:imageorient.I.0',
+						'LLL:EXT:cms/locallang_ttc.xlf:imageorient.I.0',
 						0,
 						'selicons/above_center.gif'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:imageorient.I.1',
+						'LLL:EXT:cms/locallang_ttc.xlf:imageorient.I.1',
 						1,
 						'selicons/above_right.gif'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:imageorient.I.2',
+						'LLL:EXT:cms/locallang_ttc.xlf:imageorient.I.2',
 						2,
 						'selicons/above_left.gif'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:imageorient.I.3',
+						'LLL:EXT:cms/locallang_ttc.xlf:imageorient.I.3',
 						8,
 						'selicons/below_center.gif'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:imageorient.I.4',
+						'LLL:EXT:cms/locallang_ttc.xlf:imageorient.I.4',
 						9,
 						'selicons/below_right.gif'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:imageorient.I.5',
+						'LLL:EXT:cms/locallang_ttc.xlf:imageorient.I.5',
 						10,
 						'selicons/below_left.gif'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:imageorient.I.6',
+						'LLL:EXT:cms/locallang_ttc.xlf:imageorient.I.6',
 						17,
 						'selicons/intext_right.gif'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:imageorient.I.7',
+						'LLL:EXT:cms/locallang_ttc.xlf:imageorient.I.7',
 						18,
 						'selicons/intext_left.gif'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:imageorient.I.8',
+						'LLL:EXT:cms/locallang_ttc.xlf:imageorient.I.8',
 						'--div--'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:imageorient.I.9',
+						'LLL:EXT:cms/locallang_ttc.xlf:imageorient.I.9',
 						25,
 						'selicons/intext_right_nowrap.gif'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:imageorient.I.10',
+						'LLL:EXT:cms/locallang_ttc.xlf:imageorient.I.10',
 						26,
 						'selicons/intext_left_nowrap.gif'
 					)
@@ -840,7 +840,7 @@ return array(
 		),
 		'imageborder' => array(
 			'exclude' => 1,
-			'label' => 'LLL:EXT:cms/locallang_ttc.xml:imageborder',
+			'label' => 'LLL:EXT:cms/locallang_ttc.xlf:imageborder',
 			'config' => array(
 				'type' => 'check',
 				'items' => array(
@@ -852,19 +852,19 @@ return array(
 		),
 		'image_noRows' => array(
 			'exclude' => 1,
-			'label' => 'LLL:EXT:cms/locallang_ttc.xml:image_noRows',
+			'label' => 'LLL:EXT:cms/locallang_ttc.xlf:image_noRows',
 			'config' => array(
 				'type' => 'check',
 				'items' => array(
 					'1' => array(
-						'0' => 'LLL:EXT:cms/locallang_ttc.xml:image_noRows.I.0'
+						'0' => 'LLL:EXT:cms/locallang_ttc.xlf:image_noRows.I.0'
 					)
 				)
 			)
 		),
 		'image_link' => array(
 			'exclude' => 1,
-			'label' => 'LLL:EXT:cms/locallang_ttc.xml:image_link',
+			'label' => 'LLL:EXT:cms/locallang_ttc.xlf:image_link',
 			'config' => array(
 				'type' => 'text',
 				'cols' => '30',
@@ -873,7 +873,7 @@ return array(
 					'_PADDING' => 2,
 					'link' => array(
 						'type' => 'popup',
-						'title' => 'LLL:EXT:cms/locallang_ttc.xml:image_link_formlabel',
+						'title' => 'LLL:EXT:cms/locallang_ttc.xlf:image_link_formlabel',
 						'icon' => 'link_popup.gif',
 						'script' => 'browse_links.php?mode=wizard',
 						'JSopenParams' => 'height=300,width=500,status=0,menubar=0,scrollbars=1'
@@ -884,7 +884,7 @@ return array(
 		),
 		'image_zoom' => array(
 			'exclude' => 1,
-			'label' => 'LLL:EXT:cms/locallang_ttc.xml:image_zoom',
+			'label' => 'LLL:EXT:cms/locallang_ttc.xlf:image_zoom',
 			'config' => array(
 				'type' => 'check',
 				'items' => array(
@@ -896,48 +896,48 @@ return array(
 		),
 		'image_effects' => array(
 			'exclude' => 1,
-			'label' => 'LLL:EXT:cms/locallang_ttc.xml:image_effects',
+			'label' => 'LLL:EXT:cms/locallang_ttc.xlf:image_effects',
 			'config' => array(
 				'type' => 'select',
 				'items' => array(
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:image_effects.I.0',
+						'LLL:EXT:cms/locallang_ttc.xlf:image_effects.I.0',
 						0
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:image_effects.I.1',
+						'LLL:EXT:cms/locallang_ttc.xlf:image_effects.I.1',
 						1
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:image_effects.I.2',
+						'LLL:EXT:cms/locallang_ttc.xlf:image_effects.I.2',
 						2
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:image_effects.I.3',
+						'LLL:EXT:cms/locallang_ttc.xlf:image_effects.I.3',
 						3
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:image_effects.I.4',
+						'LLL:EXT:cms/locallang_ttc.xlf:image_effects.I.4',
 						10
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:image_effects.I.5',
+						'LLL:EXT:cms/locallang_ttc.xlf:image_effects.I.5',
 						11
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:image_effects.I.6',
+						'LLL:EXT:cms/locallang_ttc.xlf:image_effects.I.6',
 						20
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:image_effects.I.7',
+						'LLL:EXT:cms/locallang_ttc.xlf:image_effects.I.7',
 						23
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:image_effects.I.8',
+						'LLL:EXT:cms/locallang_ttc.xlf:image_effects.I.8',
 						25
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:image_effects.I.9',
+						'LLL:EXT:cms/locallang_ttc.xlf:image_effects.I.9',
 						26
 					)
 				)
@@ -945,44 +945,44 @@ return array(
 		),
 		'image_frames' => array(
 			'exclude' => 1,
-			'label' => 'LLL:EXT:cms/locallang_ttc.xml:image_frames',
+			'label' => 'LLL:EXT:cms/locallang_ttc.xlf:image_frames',
 			'config' => array(
 				'type' => 'select',
 				'items' => array(
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:image_frames.I.0',
+						'LLL:EXT:cms/locallang_ttc.xlf:image_frames.I.0',
 						0
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:image_frames.I.1',
+						'LLL:EXT:cms/locallang_ttc.xlf:image_frames.I.1',
 						1
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:image_frames.I.2',
+						'LLL:EXT:cms/locallang_ttc.xlf:image_frames.I.2',
 						2
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:image_frames.I.3',
+						'LLL:EXT:cms/locallang_ttc.xlf:image_frames.I.3',
 						3
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:image_frames.I.4',
+						'LLL:EXT:cms/locallang_ttc.xlf:image_frames.I.4',
 						4
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:image_frames.I.5',
+						'LLL:EXT:cms/locallang_ttc.xlf:image_frames.I.5',
 						5
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:image_frames.I.6',
+						'LLL:EXT:cms/locallang_ttc.xlf:image_frames.I.6',
 						6
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:image_frames.I.7',
+						'LLL:EXT:cms/locallang_ttc.xlf:image_frames.I.7',
 						7
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:image_frames.I.8',
+						'LLL:EXT:cms/locallang_ttc.xlf:image_frames.I.8',
 						8
 					)
 				)
@@ -990,7 +990,7 @@ return array(
 		),
 		'image_compression' => array(
 			'exclude' => 1,
-			'label' => 'LLL:EXT:cms/locallang_ttc.xml:image_compression',
+			'label' => 'LLL:EXT:cms/locallang_ttc.xlf:image_compression',
 			'config' => array(
 				'type' => 'select',
 				'items' => array(
@@ -999,7 +999,7 @@ return array(
 						0
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:image_compression.I.1',
+						'LLL:EXT:cms/locallang_ttc.xlf:image_compression.I.1',
 						1
 					),
 					array(
@@ -1055,23 +1055,23 @@ return array(
 						35
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:image_compression.I.15',
+						'LLL:EXT:cms/locallang_ttc.xlf:image_compression.I.15',
 						21
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:image_compression.I.16',
+						'LLL:EXT:cms/locallang_ttc.xlf:image_compression.I.16',
 						22
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:image_compression.I.17',
+						'LLL:EXT:cms/locallang_ttc.xlf:image_compression.I.17',
 						24
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:image_compression.I.18',
+						'LLL:EXT:cms/locallang_ttc.xlf:image_compression.I.18',
 						26
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:image_compression.I.19',
+						'LLL:EXT:cms/locallang_ttc.xlf:image_compression.I.19',
 						28
 					)
 				)
@@ -1079,7 +1079,7 @@ return array(
 		),
 		'imagecols' => array(
 			'exclude' => 1,
-			'label' => 'LLL:EXT:cms/locallang_ttc.xml:imagecols',
+			'label' => 'LLL:EXT:cms/locallang_ttc.xlf:imagecols',
 			'config' => array(
 				'type' => 'select',
 				'items' => array(
@@ -1130,7 +1130,7 @@ return array(
 		),
 		'imagecaption_position' => array(
 			'exclude' => 1,
-			'label' => 'LLL:EXT:cms/locallang_ttc.xml:imagecaption_position',
+			'label' => 'LLL:EXT:cms/locallang_ttc.xlf:imagecaption_position',
 			'config' => array(
 				'type' => 'select',
 				'items' => array(
@@ -1139,15 +1139,15 @@ return array(
 						''
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:imagecaption_position.I.1',
+						'LLL:EXT:cms/locallang_ttc.xlf:imagecaption_position.I.1',
 						'center'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:imagecaption_position.I.2',
+						'LLL:EXT:cms/locallang_ttc.xlf:imagecaption_position.I.2',
 						'right'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:imagecaption_position.I.3',
+						'LLL:EXT:cms/locallang_ttc.xlf:imagecaption_position.I.3',
 						'left'
 					)
 				),
@@ -1156,7 +1156,7 @@ return array(
 		),
 		'altText' => array(
 			'exclude' => 1,
-			'label' => 'LLL:EXT:cms/locallang_ttc.xml:image_altText',
+			'label' => 'LLL:EXT:cms/locallang_ttc.xlf:image_altText',
 			'config' => array(
 				'type' => 'text',
 				'cols' => '30',
@@ -1165,7 +1165,7 @@ return array(
 		),
 		'titleText' => array(
 			'exclude' => 1,
-			'label' => 'LLL:EXT:cms/locallang_ttc.xml:image_titleText',
+			'label' => 'LLL:EXT:cms/locallang_ttc.xlf:image_titleText',
 			'config' => array(
 				'type' => 'text',
 				'cols' => '30',
@@ -1174,7 +1174,7 @@ return array(
 		),
 		'longdescURL' => array(
 			'exclude' => 1,
-			'label' => 'LLL:EXT:cms/locallang_ttc.xml:image_longdescURL',
+			'label' => 'LLL:EXT:cms/locallang_ttc.xlf:image_longdescURL',
 			'config' => array(
 				'type' => 'text',
 				'cols' => '30',
@@ -1183,7 +1183,7 @@ return array(
 					'_PADDING' => 2,
 					'link' => array(
 						'type' => 'popup',
-						'title' => 'LLL:EXT:cms/locallang_ttc.xml:image_link_formlabel',
+						'title' => 'LLL:EXT:cms/locallang_ttc.xlf:image_link_formlabel',
 						'icon' => 'link_popup.gif',
 						'script' => 'browse_links.php?mode=wizard',
 						'params' => array(
@@ -1197,12 +1197,12 @@ return array(
 			)
 		),
 		'cols' => array(
-			'label' => 'LLL:EXT:cms/locallang_ttc.xml:cols',
+			'label' => 'LLL:EXT:cms/locallang_ttc.xlf:cols',
 			'config' => array(
 				'type' => 'select',
 				'items' => array(
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:cols.I.0',
+						'LLL:EXT:cms/locallang_ttc.xlf:cols.I.0',
 						'0'
 					),
 					array(
@@ -1269,27 +1269,27 @@ return array(
 				'type' => 'select',
 				'items' => array(
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:recursive.I.0',
+						'LLL:EXT:cms/locallang_ttc.xlf:recursive.I.0',
 						'0'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:recursive.I.1',
+						'LLL:EXT:cms/locallang_ttc.xlf:recursive.I.1',
 						'1'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:recursive.I.2',
+						'LLL:EXT:cms/locallang_ttc.xlf:recursive.I.2',
 						'2'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:recursive.I.3',
+						'LLL:EXT:cms/locallang_ttc.xlf:recursive.I.3',
 						'3'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:recursive.I.4',
+						'LLL:EXT:cms/locallang_ttc.xlf:recursive.I.4',
 						'4'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:recursive.I.5',
+						'LLL:EXT:cms/locallang_ttc.xlf:recursive.I.5',
 						'250'
 					)
 				),
@@ -1297,44 +1297,44 @@ return array(
 			)
 		),
 		'menu_type' => array(
-			'label' => 'LLL:EXT:cms/locallang_ttc.xml:menu_type',
+			'label' => 'LLL:EXT:cms/locallang_ttc.xlf:menu_type',
 			'config' => array(
 				'type' => 'select',
 				'items' => array(
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:menu_type.I.0',
+						'LLL:EXT:cms/locallang_ttc.xlf:menu_type.I.0',
 						'0'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:menu_type.I.1',
+						'LLL:EXT:cms/locallang_ttc.xlf:menu_type.I.1',
 						'1'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:menu_type.I.2',
+						'LLL:EXT:cms/locallang_ttc.xlf:menu_type.I.2',
 						'4'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:menu_type.I.3',
+						'LLL:EXT:cms/locallang_ttc.xlf:menu_type.I.3',
 						'7'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:menu_type.I.4',
+						'LLL:EXT:cms/locallang_ttc.xlf:menu_type.I.4',
 						'2'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:menu_type.I.8',
+						'LLL:EXT:cms/locallang_ttc.xlf:menu_type.I.8',
 						'8'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:menu_type.I.5',
+						'LLL:EXT:cms/locallang_ttc.xlf:menu_type.I.5',
 						'3'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:menu_type.I.6',
+						'LLL:EXT:cms/locallang_ttc.xlf:menu_type.I.6',
 						'5'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:menu_type.I.7',
+						'LLL:EXT:cms/locallang_ttc.xlf:menu_type.I.7',
 						'6'
 					)
 				),
@@ -1342,7 +1342,7 @@ return array(
 			)
 		),
 		'list_type' => array(
-			'label' => 'LLL:EXT:cms/locallang_ttc.xml:list_type',
+			'label' => 'LLL:EXT:cms/locallang_ttc.xlf:list_type',
 			'config' => array(
 				'type' => 'select',
 				'items' => array(
@@ -1371,7 +1371,7 @@ return array(
 		),
 		'table_bgColor' => array(
 			'exclude' => 1,
-			'label' => 'LLL:EXT:cms/locallang_ttc.xml:table_bgColor',
+			'label' => 'LLL:EXT:cms/locallang_ttc.xlf:table_bgColor',
 			'config' => array(
 				'type' => 'select',
 				'items' => array(
@@ -1380,15 +1380,15 @@ return array(
 						'0'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:table_bgColor.I.1',
+						'LLL:EXT:cms/locallang_ttc.xlf:table_bgColor.I.1',
 						'1'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:table_bgColor.I.2',
+						'LLL:EXT:cms/locallang_ttc.xlf:table_bgColor.I.2',
 						'2'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:table_bgColor.I.3',
+						'LLL:EXT:cms/locallang_ttc.xlf:table_bgColor.I.3',
 						'200'
 					),
 					array(
@@ -1396,23 +1396,23 @@ return array(
 						'--div--'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:table_bgColor.I.5',
+						'LLL:EXT:cms/locallang_ttc.xlf:table_bgColor.I.5',
 						'240'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:table_bgColor.I.6',
+						'LLL:EXT:cms/locallang_ttc.xlf:table_bgColor.I.6',
 						'241'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:table_bgColor.I.7',
+						'LLL:EXT:cms/locallang_ttc.xlf:table_bgColor.I.7',
 						'242'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:table_bgColor.I.8',
+						'LLL:EXT:cms/locallang_ttc.xlf:table_bgColor.I.8',
 						'243'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:table_bgColor.I.9',
+						'LLL:EXT:cms/locallang_ttc.xlf:table_bgColor.I.9',
 						'244'
 					)
 				),
@@ -1421,7 +1421,7 @@ return array(
 		),
 		'table_border' => array(
 			'exclude' => 1,
-			'label' => 'LLL:EXT:cms/locallang_ttc.xml:table_border',
+			'label' => 'LLL:EXT:cms/locallang_ttc.xlf:table_border',
 			'config' => array(
 				'type' => 'input',
 				'size' => '3',
@@ -1436,7 +1436,7 @@ return array(
 		),
 		'table_cellspacing' => array(
 			'exclude' => 1,
-			'label' => 'LLL:EXT:cms/locallang_ttc.xml:table_cellspacing',
+			'label' => 'LLL:EXT:cms/locallang_ttc.xlf:table_cellspacing',
 			'config' => array(
 				'type' => 'input',
 				'size' => '3',
@@ -1451,7 +1451,7 @@ return array(
 		),
 		'table_cellpadding' => array(
 			'exclude' => 1,
-			'label' => 'LLL:EXT:cms/locallang_ttc.xml:table_cellpadding',
+			'label' => 'LLL:EXT:cms/locallang_ttc.xlf:table_cellpadding',
 			'config' => array(
 				'type' => 'input',
 				'size' => '3',
@@ -1465,7 +1465,7 @@ return array(
 			)
 		),
 		'media' => array(
-			'label' => 'LLL:EXT:cms/locallang_ttc.xml:media',
+			'label' => 'LLL:EXT:cms/locallang_ttc.xlf:media',
 			'config' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getFileFieldTCAConfig('media', array(
 				'appearance' => array(
 					'createNewRelationLinkTitle' => 'LLL:EXT:cms/locallang_ttc.xlf:media.addFileReference'
@@ -1486,7 +1486,7 @@ return array(
 			)
 		),
 		'multimedia' => array(
-			'label' => 'LLL:EXT:cms/locallang_ttc.xml:multimedia',
+			'label' => 'LLL:EXT:cms/locallang_ttc.xlf:multimedia',
 			'config' => array(
 				'type' => 'group',
 				'internal_type' => 'file',
@@ -1499,7 +1499,7 @@ return array(
 			)
 		),
 		'filelink_size' => array(
-			'label' => 'LLL:EXT:cms/locallang_ttc.xml:filelink_size',
+			'label' => 'LLL:EXT:cms/locallang_ttc.xlf:filelink_size',
 			'config' => array(
 				'type' => 'check',
 				'items' => array(
@@ -1510,7 +1510,7 @@ return array(
 			)
 		),
 		'filelink_sorting' => array(
-			'label' => 'LLL:EXT:cms/locallang_ttc.xml:filelink_sorting',
+			'label' => 'LLL:EXT:cms/locallang_ttc.xlf:filelink_sorting',
 			'config' => array(
 				'type' => 'select',
 				'items' => array(
@@ -1523,7 +1523,7 @@ return array(
 			)
 		),
 		'target' => array(
-			'label' => 'LLL:EXT:cms/locallang_ttc.xml:target',
+			'label' => 'LLL:EXT:cms/locallang_ttc.xlf:target',
 			'config' => array(
 				'type' => 'input',
 				'size' => 20,
@@ -1533,7 +1533,7 @@ return array(
 						'type' => 'select',
 						'mode' => '',
 						'items' => array(
-							array('LLL:EXT:cms/locallang_ttc.xml:target.I.1', '_blank')
+							array('LLL:EXT:cms/locallang_ttc.xlf:target.I.1', '_blank')
 						)
 					)
 				),
@@ -1541,7 +1541,7 @@ return array(
 			)
 		),
 		'records' => array(
-			'label' => 'LLL:EXT:cms/locallang_ttc.xml:records',
+			'label' => 'LLL:EXT:cms/locallang_ttc.xlf:records',
 			'config' => array(
 				'type' => 'group',
 				'internal_type' => 'db',
@@ -1559,7 +1559,7 @@ return array(
 		),
 		'spaceBefore' => array(
 			'exclude' => 1,
-			'label' => 'LLL:EXT:cms/locallang_ttc.xml:spaceBefore',
+			'label' => 'LLL:EXT:cms/locallang_ttc.xlf:spaceBefore',
 			'config' => array(
 				'type' => 'input',
 				'size' => '5',
@@ -1573,7 +1573,7 @@ return array(
 		),
 		'spaceAfter' => array(
 			'exclude' => 1,
-			'label' => 'LLL:EXT:cms/locallang_ttc.xml:spaceAfter',
+			'label' => 'LLL:EXT:cms/locallang_ttc.xlf:spaceAfter',
 			'config' => array(
 				'type' => 'input',
 				'size' => '5',
@@ -1587,7 +1587,7 @@ return array(
 		),
 		'section_frame' => array(
 			'exclude' => 1,
-			'label' => 'LLL:EXT:cms/locallang_ttc.xml:section_frame',
+			'label' => 'LLL:EXT:cms/locallang_ttc.xlf:section_frame',
 			'config' => array(
 				'type' => 'select',
 				'items' => array(
@@ -1596,35 +1596,35 @@ return array(
 						'0'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:section_frame.I.1',
+						'LLL:EXT:cms/locallang_ttc.xlf:section_frame.I.1',
 						'1'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:section_frame.I.2',
+						'LLL:EXT:cms/locallang_ttc.xlf:section_frame.I.2',
 						'5'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:section_frame.I.3',
+						'LLL:EXT:cms/locallang_ttc.xlf:section_frame.I.3',
 						'6'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:section_frame.I.4',
+						'LLL:EXT:cms/locallang_ttc.xlf:section_frame.I.4',
 						'10'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:section_frame.I.5',
+						'LLL:EXT:cms/locallang_ttc.xlf:section_frame.I.5',
 						'11'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:section_frame.I.6',
+						'LLL:EXT:cms/locallang_ttc.xlf:section_frame.I.6',
 						'12'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:section_frame.I.7',
+						'LLL:EXT:cms/locallang_ttc.xlf:section_frame.I.7',
 						'20'
 					),
 					array(
-						'LLL:EXT:cms/locallang_ttc.xml:section_frame.I.8',
+						'LLL:EXT:cms/locallang_ttc.xlf:section_frame.I.8',
 						'21'
 					)
 				),
@@ -1633,7 +1633,7 @@ return array(
 		),
 		'sectionIndex' => array(
 			'exclude' => 1,
-			'label' => 'LLL:EXT:cms/locallang_ttc.xml:sectionIndex',
+			'label' => 'LLL:EXT:cms/locallang_ttc.xlf:sectionIndex',
 			'config' => array(
 				'type' => 'check',
 				'default' => 1,
@@ -1646,7 +1646,7 @@ return array(
 		),
 		'linkToTop' => array(
 			'exclude' => 1,
-			'label' => 'LLL:EXT:cms/locallang_ttc.xml:linkToTop',
+			'label' => 'LLL:EXT:cms/locallang_ttc.xlf:linkToTop',
 			'config' => array(
 				'type' => 'check',
 				'items' => array(
@@ -1658,20 +1658,20 @@ return array(
 		),
 		'rte_enabled' => array(
 			'exclude' => 1,
-			'label' => 'LLL:EXT:cms/locallang_ttc.xml:rte_enabled',
+			'label' => 'LLL:EXT:cms/locallang_ttc.xlf:rte_enabled',
 			'config' => array(
 				'type' => 'check',
 				'showIfRTE' => 1,
 				'items' => array(
 					'1' => array(
-						'0' => 'LLL:EXT:cms/locallang_ttc.xml:rte_enabled.I.0'
+						'0' => 'LLL:EXT:cms/locallang_ttc.xlf:rte_enabled.I.0'
 					)
 				)
 			)
 		),
 		'pi_flexform' => array(
 			'l10n_display' => 'hideDiff',
-			'label' => 'LLL:EXT:cms/locallang_ttc.xml:pi_flexform',
+			'label' => 'LLL:EXT:cms/locallang_ttc.xlf:pi_flexform',
 			'config' => array(
 				'type' => 'flex',
 				'ds_pointerField' => 'list_type,CType',
@@ -1708,7 +1708,7 @@ return array(
 			)
 		),
 		'accessibility_title' => array(
-			'label' => 'LLL:EXT:cms/locallang_ttc.xml:accessibility_title',
+			'label' => 'LLL:EXT:cms/locallang_ttc.xlf:accessibility_title',
 			'config' => array(
 				'type' => 'input',
 				'size' => 20,
@@ -1717,7 +1717,7 @@ return array(
 			)
 		),
 		'accessibility_bypass' => array(
-			'label' => 'LLL:EXT:cms/locallang_ttc.xml:accessibility_bypass',
+			'label' => 'LLL:EXT:cms/locallang_ttc.xlf:accessibility_bypass',
 			'config' => array(
 				'type' => 'check',
 				'items' => array(
@@ -1728,7 +1728,7 @@ return array(
 			)
 		),
 		'accessibility_bypass_text' => array(
-			'label' => 'LLL:EXT:cms/locallang_ttc.xml:accessibility_bypass_text',
+			'label' => 'LLL:EXT:cms/locallang_ttc.xlf:accessibility_bypass_text',
 			'config' => array(
 				'type' => 'input',
 				'size' => 20,
@@ -1755,190 +1755,190 @@ return array(
 			'showitem' => 'CType'
 		),
 		'header' => array(
-			'showitem' => '--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.general;general,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.headers;headers,
-				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.appearance,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.frames;frames,
-				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.access,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.visibility;visibility,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.access;access,
-				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.extended'
+			'showitem' => '--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.general;general,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.headers;headers,
+				--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.appearance,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.frames;frames,
+				--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.visibility;visibility,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.access;access,
+				--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.extended'
 		),
 		'text' => array(
-			'showitem' => '--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.general;general,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.header;header,
-					bodytext;LLL:EXT:cms/locallang_ttc.xml:bodytext_formlabel;;richtext:rte_transform[flag=rte_enabled|mode=ts_css],
-					rte_enabled;LLL:EXT:cms/locallang_ttc.xml:rte_enabled_formlabel,
-					--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.appearance,
-						--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.frames;frames,
-						--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.textlayout;textlayout,
-				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.access,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.visibility;visibility,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.access;access,
-				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.extended'
+			'showitem' => '--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.general;general,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.header;header,
+					bodytext;LLL:EXT:cms/locallang_ttc.xlf:bodytext_formlabel;;richtext:rte_transform[flag=rte_enabled|mode=ts_css],
+					rte_enabled;LLL:EXT:cms/locallang_ttc.xlf:rte_enabled_formlabel,
+					--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.appearance,
+						--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.frames;frames,
+						--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.textlayout;textlayout,
+				--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.visibility;visibility,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.access;access,
+				--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.extended'
 		),
 		'textpic' => array(
-			'showitem' => '--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.general;general,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.header;header,
+			'showitem' => '--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.general;general,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.header;header,
 					bodytext;Text;;richtext:rte_transform[flag=rte_enabled|mode=ts_css],
-					rte_enabled;LLL:EXT:cms/locallang_ttc.xml:rte_enabled_formlabel,' . '--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.images,
+					rte_enabled;LLL:EXT:cms/locallang_ttc.xlf:rte_enabled_formlabel,' . '--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.images,
 					image,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.imagelinks;imagelinks,' . '--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.appearance,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.frames;frames,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.image_settings;image_settings,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.imageblock;imageblock,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.textlayout;textlayout,
-				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.access,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.visibility;visibility,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.access;access,
-				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.extended'
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.imagelinks;imagelinks,' . '--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.appearance,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.frames;frames,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.image_settings;image_settings,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.imageblock;imageblock,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.textlayout;textlayout,
+				--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.visibility;visibility,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.access;access,
+				--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.extended'
 		),
 		'image' => array(
-			'showitem' => '--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.general;general,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.header;header,
-				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.images,
+			'showitem' => '--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.general;general,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.header;header,
+				--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.images,
 					image,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.imagelinks;imagelinks,
-				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.appearance,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.frames;frames,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.image_settings;image_settings,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.imageblock;imageblock,
-				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.access,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.visibility;visibility,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.access;access,
-				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.extended'
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.imagelinks;imagelinks,
+				--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.appearance,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.frames;frames,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.image_settings;image_settings,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.imageblock;imageblock,
+				--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.visibility;visibility,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.access;access,
+				--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.extended'
 		),
 		'bullets' => array(
-			'showitem' => '--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.general;general,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.header;header,
-					bodytext;LLL:EXT:cms/locallang_ttc.xml:bodytext.ALT.bulletlist_formlabel;;nowrap,
-				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.appearance,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.frames;frames,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.textlayout;textlayout,
-				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.access,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.visibility;visibility,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.access;access,
-				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.extended'
+			'showitem' => '--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.general;general,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.header;header,
+					bodytext;LLL:EXT:cms/locallang_ttc.xlf:bodytext.ALT.bulletlist_formlabel;;nowrap,
+				--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.appearance,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.frames;frames,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.textlayout;textlayout,
+				--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.visibility;visibility,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.access;access,
+				--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.extended'
 		),
 		'table' => array(
-			'showitem' => '--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.general;general,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.header;header,
-					bodytext;LLL:EXT:cms/locallang_ttc.xml:bodytext.ALT.table_formlabel;;nowrap:wizards[table],
-				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.appearance,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.frames;frames,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.table_layout;tablelayout,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.textlayout;textlayout,
-				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.access,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.visibility;visibility,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.access;access,
-				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.extended'
+			'showitem' => '--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.general;general,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.header;header,
+					bodytext;LLL:EXT:cms/locallang_ttc.xlf:bodytext.ALT.table_formlabel;;nowrap:wizards[table],
+				--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.appearance,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.frames;frames,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.table_layout;tablelayout,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.textlayout;textlayout,
+				--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.visibility;visibility,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.access;access,
+				--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.extended'
 		),
 		// file list
 		'uploads' => array(
-			'showitem' => '--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.general;general,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.header;header,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:media;uploads,
-				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.appearance,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.frames;frames,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.uploads_layout;uploadslayout,
-				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.access,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.visibility;visibility,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.access;access,
-				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.extended'
+			'showitem' => '--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.general;general,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.header;header,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:media;uploads,
+				--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.appearance,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.frames;frames,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.uploads_layout;uploadslayout,
+				--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.visibility;visibility,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.access;access,
+				--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.extended'
 		),
 		'multimedia' => array(
-			'showitem' => '--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.general;general,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.header;header,
-				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.media,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.multimediafiles;multimediafiles,
-				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.appearance,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.frames;frames,
-				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.access,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.visibility;visibility,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.access;access,
-				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.extended'
+			'showitem' => '--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.general;general,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.header;header,
+				--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.media,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.multimediafiles;multimediafiles,
+				--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.appearance,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.frames;frames,
+				--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.visibility;visibility,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.access;access,
+				--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.extended'
 		),
 		'media' => array(
-			'showitem' => '--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.general;general,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.header;header,
-				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.media,
+			'showitem' => '--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.general;general,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.header;header,
+				--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.media,
 					pi_flexform; ;,
-				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.appearance,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.frames;frames,
-				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.access,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.visibility;visibility,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.access;access,
-				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.behaviour,
-					bodytext;LLL:EXT:cms/locallang_ttc.xml:bodytext.ALT.media_formlabel;;richtext:rte_transform[flag=rte_enabled|mode=ts_css],
-				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.extended'
+				--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.appearance,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.frames;frames,
+				--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.visibility;visibility,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.access;access,
+				--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.behaviour,
+					bodytext;LLL:EXT:cms/locallang_ttc.xlf:bodytext.ALT.media_formlabel;;richtext:rte_transform[flag=rte_enabled|mode=ts_css],
+				--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.extended'
 		),
 		'menu' => array(
-			'showitem' => '--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.general;general,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.header;header,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.menu;menu,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.menu_accessibility;menu_accessibility,
-				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.appearance,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.frames;frames,
-				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.access,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.visibility;visibility,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.access;access,
-				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.extended',
+			'showitem' => '--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.general;general,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.header;header,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.menu;menu,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.menu_accessibility;menu_accessibility,
+				--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.appearance,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.frames;frames,
+				--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.visibility;visibility,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.access;access,
+				--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.extended',
 			'subtype_value_field' => 'menu_type',
 			'subtypes_excludelist' => array(
 				'2' => 'pages'
 			)
 		),
 		'mailform' => array(
-			'showitem' => '--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.general;general,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.header;header,
-					bodytext;LLL:EXT:cms/locallang_ttc.xml:bodytext.ALT.mailform_formlabel;;nowrap:wizards[forms],
-				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.appearance,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.frames;frames,
-				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.access,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.visibility;visibility,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.access;access,
-				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.behaviour,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.mailform;mailform,
-				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.extended'
+			'showitem' => '--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.general;general,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.header;header,
+					bodytext;LLL:EXT:cms/locallang_ttc.xlf:bodytext.ALT.mailform_formlabel;;nowrap:wizards[forms],
+				--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.appearance,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.frames;frames,
+				--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.visibility;visibility,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.access;access,
+				--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.behaviour,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.mailform;mailform,
+				--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.extended'
 		),
 		'search' => array(
-			'showitem' => '--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.general;general,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.header;header,
-				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.appearance,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.frames;frames,
-				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.access,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.visibility;visibility,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.access;access,
-				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.behaviour,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.searchform;searchform,
-				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.extended'
+			'showitem' => '--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.general;general,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.header;header,
+				--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.appearance,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.frames;frames,
+				--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.visibility;visibility,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.access;access,
+				--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.behaviour,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.searchform;searchform,
+				--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.extended'
 		),
 		'shortcut' => array(
-			'showitem' => '--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.general;general,
-					header;LLL:EXT:cms/locallang_ttc.xml:header.ALT.shortcut_formlabel,
-					records;LLL:EXT:cms/locallang_ttc.xml:records_formlabel,
-				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.appearance,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.frames;frames,
-				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.access,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.visibility;visibility,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.access;access,
-				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.extended'
+			'showitem' => '--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.general;general,
+					header;LLL:EXT:cms/locallang_ttc.xlf:header.ALT.shortcut_formlabel,
+					records;LLL:EXT:cms/locallang_ttc.xlf:records_formlabel,
+				--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.appearance,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.frames;frames,
+				--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.visibility;visibility,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.access;access,
+				--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.extended'
 		),
 		'list' => array(
-			'showitem' => '--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.general;general,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.header;header,
-				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.plugin,
-					list_type;LLL:EXT:cms/locallang_ttc.xml:list_type_formlabel,
-				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.appearance,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.frames;frames,
-				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.access,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.visibility;visibility,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.access;access,
-				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.behaviour,
-					select_key;LLL:EXT:cms/locallang_ttc.xml:select_key_formlabel,
-					pages;LLL:EXT:cms/locallang_ttc.xml:pages.ALT.list_formlabel,
+			'showitem' => '--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.general;general,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.header;header,
+				--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.plugin,
+					list_type;LLL:EXT:cms/locallang_ttc.xlf:list_type_formlabel,
+				--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.appearance,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.frames;frames,
+				--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.visibility;visibility,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.access;access,
+				--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.behaviour,
+					select_key;LLL:EXT:cms/locallang_ttc.xlf:select_key_formlabel,
+					pages;LLL:EXT:cms/locallang_ttc.xlf:pages.ALT.list_formlabel,
 					recursive,
-				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.extended',
+				--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.extended',
 			'subtype_value_field' => 'list_type',
 			'subtypes_excludelist' => array(
 				'3' => 'layout',
@@ -1956,25 +1956,25 @@ return array(
 			)
 		),
 		'div' => array(
-			'showitem' => '--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.general;general,
-					header;LLL:EXT:cms/locallang_ttc.xml:header.ALT.div_formlabel,
-				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.appearance,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.frames;frames,
-				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.access,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.visibility;visibility,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.access;access,
-				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.extended'
+			'showitem' => '--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.general;general,
+					header;LLL:EXT:cms/locallang_ttc.xlf:header.ALT.div_formlabel,
+				--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.appearance,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.frames;frames,
+				--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.visibility;visibility,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.access;access,
+				--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.extended'
 		),
 		'html' => array(
-			'showitem' => '--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.general;general,
-					header;LLL:EXT:cms/locallang_ttc.xml:header.ALT.html_formlabel,
+			'showitem' => '--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.general;general,
+					header;LLL:EXT:cms/locallang_ttc.xlf:header.ALT.html_formlabel,
 					bodytext,
-				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.appearance,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.frames;frames,
-				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.access,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.visibility;visibility,
-					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.access;access,
-				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.extended'
+				--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.appearance,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.frames;frames,
+				--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.visibility;visibility,
+					--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.access;access,
+				--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.extended'
 		)
 	),
 	'palettes' => array(
@@ -2024,79 +2024,79 @@ return array(
 			'showitem' => 'sys_language_uid, l18n_parent, colPos'
 		),
 		'general' => array(
-			'showitem' => 'CType;LLL:EXT:cms/locallang_ttc.xml:CType_formlabel, colPos;LLL:EXT:cms/locallang_ttc.xml:colPos_formlabel, sys_language_uid;LLL:EXT:cms/locallang_ttc.xml:sys_language_uid_formlabel',
+			'showitem' => 'CType;LLL:EXT:cms/locallang_ttc.xlf:CType_formlabel, colPos;LLL:EXT:cms/locallang_ttc.xlf:colPos_formlabel, sys_language_uid;LLL:EXT:cms/locallang_ttc.xlf:sys_language_uid_formlabel',
 			'canNotCollapse' => 1
 		),
 		'header' => array(
-			'showitem' => 'header;LLL:EXT:cms/locallang_ttc.xml:header_formlabel, --linebreak--, header_layout;LLL:EXT:cms/locallang_ttc.xml:header_layout_formlabel, header_position;LLL:EXT:cms/locallang_ttc.xml:header_position_formlabel, date;LLL:EXT:cms/locallang_ttc.xml:date_formlabel, --linebreak--, header_link;LLL:EXT:cms/locallang_ttc.xml:header_link_formlabel',
+			'showitem' => 'header;LLL:EXT:cms/locallang_ttc.xlf:header_formlabel, --linebreak--, header_layout;LLL:EXT:cms/locallang_ttc.xlf:header_layout_formlabel, header_position;LLL:EXT:cms/locallang_ttc.xlf:header_position_formlabel, date;LLL:EXT:cms/locallang_ttc.xlf:date_formlabel, --linebreak--, header_link;LLL:EXT:cms/locallang_ttc.xlf:header_link_formlabel',
 			'canNotCollapse' => 1
 		),
 		'headers' => array(
-			'showitem' => 'header;LLL:EXT:cms/locallang_ttc.xml:header_formlabel, --linebreak--, header_layout;LLL:EXT:cms/locallang_ttc.xml:header_layout_formlabel, header_position;LLL:EXT:cms/locallang_ttc.xml:header_position_formlabel, date;LLL:EXT:cms/locallang_ttc.xml:date_formlabel, --linebreak--, header_link;LLL:EXT:cms/locallang_ttc.xml:header_link_formlabel, --linebreak--, subheader;LLL:EXT:cms/locallang_ttc.xml:subheader_formlabel',
+			'showitem' => 'header;LLL:EXT:cms/locallang_ttc.xlf:header_formlabel, --linebreak--, header_layout;LLL:EXT:cms/locallang_ttc.xlf:header_layout_formlabel, header_position;LLL:EXT:cms/locallang_ttc.xlf:header_position_formlabel, date;LLL:EXT:cms/locallang_ttc.xlf:date_formlabel, --linebreak--, header_link;LLL:EXT:cms/locallang_ttc.xlf:header_link_formlabel, --linebreak--, subheader;LLL:EXT:cms/locallang_ttc.xlf:subheader_formlabel',
 			'canNotCollapse' => 1
 		),
 		'multimediafiles' => array(
-			'showitem' => 'multimedia;LLL:EXT:cms/locallang_ttc.xml:multimedia_formlabel, bodytext;LLL:EXT:cms/locallang_ttc.xml:bodytext.ALT.multimedia_formlabel;;nowrap',
+			'showitem' => 'multimedia;LLL:EXT:cms/locallang_ttc.xlf:multimedia_formlabel, bodytext;LLL:EXT:cms/locallang_ttc.xlf:bodytext.ALT.multimedia_formlabel;;nowrap',
 			'canNotCollapse' => 1
 		),
 		'imagelinks' => array(
-			'showitem' => 'image_zoom;LLL:EXT:cms/locallang_ttc.xml:image_zoom_formlabel',
+			'showitem' => 'image_zoom;LLL:EXT:cms/locallang_ttc.xlf:image_zoom_formlabel',
 			'canNotCollapse' => 1
 		),
 		'image_accessibility' => array(
-			'showitem' => 'altText;LLL:EXT:cms/locallang_ttc.xml:altText_formlabel, titleText;LLL:EXT:cms/locallang_ttc.xml:titleText_formlabel, --linebreak--, longdescURL;LLL:EXT:cms/locallang_ttc.xml:longdescURL_formlabel',
+			'showitem' => 'altText;LLL:EXT:cms/locallang_ttc.xlf:altText_formlabel, titleText;LLL:EXT:cms/locallang_ttc.xlf:titleText_formlabel, --linebreak--, longdescURL;LLL:EXT:cms/locallang_ttc.xlf:longdescURL_formlabel',
 			'canNotCollapse' => 1
 		),
 		'image_settings' => array(
-			'showitem' => 'imagewidth;LLL:EXT:cms/locallang_ttc.xml:imagewidth_formlabel, imageheight;LLL:EXT:cms/locallang_ttc.xml:imageheight_formlabel, imageborder;LLL:EXT:cms/locallang_ttc.xml:imageborder_formlabel, --linebreak--, image_compression;LLL:EXT:cms/locallang_ttc.xml:image_compression_formlabel, image_effects;LLL:EXT:cms/locallang_ttc.xml:image_effects_formlabel, image_frames;LLL:EXT:cms/locallang_ttc.xml:image_frames_formlabel',
+			'showitem' => 'imagewidth;LLL:EXT:cms/locallang_ttc.xlf:imagewidth_formlabel, imageheight;LLL:EXT:cms/locallang_ttc.xlf:imageheight_formlabel, imageborder;LLL:EXT:cms/locallang_ttc.xlf:imageborder_formlabel, --linebreak--, image_compression;LLL:EXT:cms/locallang_ttc.xlf:image_compression_formlabel, image_effects;LLL:EXT:cms/locallang_ttc.xlf:image_effects_formlabel, image_frames;LLL:EXT:cms/locallang_ttc.xlf:image_frames_formlabel',
 			'canNotCollapse' => 1
 		),
 		'imageblock' => array(
-			'showitem' => 'imageorient;LLL:EXT:cms/locallang_ttc.xml:imageorient_formlabel, imagecols;LLL:EXT:cms/locallang_ttc.xml:imagecols_formlabel, --linebreak--, image_noRows;LLL:EXT:cms/locallang_ttc.xml:image_noRows_formlabel, imagecaption_position;LLL:EXT:cms/locallang_ttc.xml:imagecaption_position_formlabel',
+			'showitem' => 'imageorient;LLL:EXT:cms/locallang_ttc.xlf:imageorient_formlabel, imagecols;LLL:EXT:cms/locallang_ttc.xlf:imagecols_formlabel, --linebreak--, image_noRows;LLL:EXT:cms/locallang_ttc.xlf:image_noRows_formlabel, imagecaption_position;LLL:EXT:cms/locallang_ttc.xlf:imagecaption_position_formlabel',
 			'canNotCollapse' => 1
 		),
 		'uploads' => array(
-			'showitem' => 'media;LLL:EXT:cms/locallang_ttc.xml:media.ALT.uploads_formlabel, --linebreak--, file_collections;LLL:EXT:cms/locallang_ttc.xml:file_collections.ALT.uploads_formlabel, --linebreak--, filelink_sorting, target',
+			'showitem' => 'media;LLL:EXT:cms/locallang_ttc.xlf:media.ALT.uploads_formlabel, --linebreak--, file_collections;LLL:EXT:cms/locallang_ttc.xlf:file_collections.ALT.uploads_formlabel, --linebreak--, filelink_sorting, target',
 			'canNotCollapse' => 1
 		),
 		'mailform' => array(
-			'showitem' => 'pages;LLL:EXT:cms/locallang_ttc.xml:pages.ALT.mailform, --linebreak--, subheader;LLL:EXT:cms/locallang_ttc.xml:subheader.ALT.mailform_formlabel',
+			'showitem' => 'pages;LLL:EXT:cms/locallang_ttc.xlf:pages.ALT.mailform, --linebreak--, subheader;LLL:EXT:cms/locallang_ttc.xlf:subheader.ALT.mailform_formlabel',
 			'canNotCollapse' => 1
 		),
 		'searchform' => array(
-			'showitem' => 'pages;LLL:EXT:cms/locallang_ttc.xml:pages.ALT.searchform',
+			'showitem' => 'pages;LLL:EXT:cms/locallang_ttc.xlf:pages.ALT.searchform',
 			'canNotCollapse' => 1
 		),
 		'menu' => array(
-			'showitem' => 'menu_type;LLL:EXT:cms/locallang_ttc.xml:menu_type_formlabel, --linebreak--, pages;LLL:EXT:cms/locallang_ttc.xml:pages.ALT.menu_formlabel',
+			'showitem' => 'menu_type;LLL:EXT:cms/locallang_ttc.xlf:menu_type_formlabel, --linebreak--, pages;LLL:EXT:cms/locallang_ttc.xlf:pages.ALT.menu_formlabel',
 			'canNotCollapse' => 1
 		),
 		'menu_accessibility' => array(
-			'showitem' => 'accessibility_title;LLL:EXT:cms/locallang_ttc.xml:menu.ALT.accessibility_title_formlabel, --linebreak--, accessibility_bypass;LLL:EXT:cms/locallang_ttc.xml:menu.ALT.accessibility_bypass_formlabel, accessibility_bypass_text;LLL:EXT:cms/locallang_ttc.xml:menu.ALT.accessibility_bypass_text_formlabel',
+			'showitem' => 'accessibility_title;LLL:EXT:cms/locallang_ttc.xlf:menu.ALT.accessibility_title_formlabel, --linebreak--, accessibility_bypass;LLL:EXT:cms/locallang_ttc.xlf:menu.ALT.accessibility_bypass_formlabel, accessibility_bypass_text;LLL:EXT:cms/locallang_ttc.xlf:menu.ALT.accessibility_bypass_text_formlabel',
 			'canNotCollapse' => 1
 		),
 		'visibility' => array(
-			'showitem' => 'hidden;LLL:EXT:cms/locallang_ttc.xml:hidden_formlabel, sectionIndex;LLL:EXT:cms/locallang_ttc.xml:sectionIndex_formlabel, linkToTop;LLL:EXT:cms/locallang_ttc.xml:linkToTop_formlabel',
+			'showitem' => 'hidden;LLL:EXT:cms/locallang_ttc.xlf:hidden_formlabel, sectionIndex;LLL:EXT:cms/locallang_ttc.xlf:sectionIndex_formlabel, linkToTop;LLL:EXT:cms/locallang_ttc.xlf:linkToTop_formlabel',
 			'canNotCollapse' => 1
 		),
 		'access' => array(
-			'showitem' => 'starttime;LLL:EXT:cms/locallang_ttc.xml:starttime_formlabel, endtime;LLL:EXT:cms/locallang_ttc.xml:endtime_formlabel, --linebreak--, fe_group;LLL:EXT:cms/locallang_ttc.xml:fe_group_formlabel',
+			'showitem' => 'starttime;LLL:EXT:cms/locallang_ttc.xlf:starttime_formlabel, endtime;LLL:EXT:cms/locallang_ttc.xlf:endtime_formlabel, --linebreak--, fe_group;LLL:EXT:cms/locallang_ttc.xlf:fe_group_formlabel',
 			'canNotCollapse' => 1
 		),
 		'frames' => array(
-			'showitem' => 'layout;LLL:EXT:cms/locallang_ttc.xml:layout_formlabel, spaceBefore;LLL:EXT:cms/locallang_ttc.xml:spaceBefore_formlabel, spaceAfter;LLL:EXT:cms/locallang_ttc.xml:spaceAfter_formlabel, section_frame;LLL:EXT:cms/locallang_ttc.xml:section_frame_formlabel',
+			'showitem' => 'layout;LLL:EXT:cms/locallang_ttc.xlf:layout_formlabel, spaceBefore;LLL:EXT:cms/locallang_ttc.xlf:spaceBefore_formlabel, spaceAfter;LLL:EXT:cms/locallang_ttc.xlf:spaceAfter_formlabel, section_frame;LLL:EXT:cms/locallang_ttc.xlf:section_frame_formlabel',
 			'canNotCollapse' => 1
 		),
 		'textlayout' => array(
-			'showitem' => 'text_align;LLL:EXT:cms/locallang_ttc.xml:text_align_formlabel, text_face;LLL:EXT:cms/locallang_ttc.xml:text_face_formlabel, text_size;LLL:EXT:cms/locallang_ttc.xml:text_size_formlabel, text_color;LLL:EXT:cms/locallang_ttc.xml:text_color_formlabel, --linebreak--, text_properties;LLL:EXT:cms/locallang_ttc.xml:text_properties_formlabel',
+			'showitem' => 'text_align;LLL:EXT:cms/locallang_ttc.xlf:text_align_formlabel, text_face;LLL:EXT:cms/locallang_ttc.xlf:text_face_formlabel, text_size;LLL:EXT:cms/locallang_ttc.xlf:text_size_formlabel, text_color;LLL:EXT:cms/locallang_ttc.xlf:text_color_formlabel, --linebreak--, text_properties;LLL:EXT:cms/locallang_ttc.xlf:text_properties_formlabel',
 			'canNotCollapse' => 1
 		),
 		'tablelayout' => array(
-			'showitem' => 'table_bgColor;LLL:EXT:cms/locallang_ttc.xml:table_bgColor_formlabel, table_border;LLL:EXT:cms/locallang_ttc.xml:table_border_formlabel, table_cellspacing;LLL:EXT:cms/locallang_ttc.xml:table_cellspacing_formlabel, table_cellpadding;LLL:EXT:cms/locallang_ttc.xml:table_cellpadding_formlabel',
+			'showitem' => 'table_bgColor;LLL:EXT:cms/locallang_ttc.xlf:table_bgColor_formlabel, table_border;LLL:EXT:cms/locallang_ttc.xlf:table_border_formlabel, table_cellspacing;LLL:EXT:cms/locallang_ttc.xlf:table_cellspacing_formlabel, table_cellpadding;LLL:EXT:cms/locallang_ttc.xlf:table_cellpadding_formlabel',
 			'canNotCollapse' => 1
 		),
 		'uploadslayout' => array(
-			'showitem' => 'filelink_size;LLL:EXT:cms/locallang_ttc.xml:filelink_size_formlabel',
+			'showitem' => 'filelink_size;LLL:EXT:cms/locallang_ttc.xlf:filelink_size_formlabel',
 			'canNotCollapse' => 1
 		)
 	)
diff --git a/typo3/sysext/cms/ext_localconf.php b/typo3/sysext/cms/ext_localconf.php
index 66e5bf19f60db33855859465ad92ca2b7326eb3f..0c9297b4db2690ed08343b4f2b5fd3135dbc3c16 100644
--- a/typo3/sysext/cms/ext_localconf.php
+++ b/typo3/sysext/cms/ext_localconf.php
@@ -14,28 +14,28 @@ if (!defined('TYPO3_MODE')) {
 mod.wizards.newContentElement {
 	renderMode = tabs
 	wizardItems {
-		common.header = LLL:EXT:cms/layout/locallang_db_new_content_el.xml:common
+		common.header = LLL:EXT:cms/layout/locallang_db_new_content_el.xlf:common
 		common.elements {
 			header {
 				icon = gfx/c_wiz/regular_header.gif
-				title = LLL:EXT:cms/layout/locallang_db_new_content_el.xml:common_headerOnly_title
-				description = LLL:EXT:cms/layout/locallang_db_new_content_el.xml:common_headerOnly_description
+				title = LLL:EXT:cms/layout/locallang_db_new_content_el.xlf:common_headerOnly_title
+				description = LLL:EXT:cms/layout/locallang_db_new_content_el.xlf:common_headerOnly_description
 				tt_content_defValues {
 					CType = header
 				}
 			}
 			text {
 				icon = gfx/c_wiz/regular_text.gif
-				title = LLL:EXT:cms/layout/locallang_db_new_content_el.xml:common_regularText_title
-				description = LLL:EXT:cms/layout/locallang_db_new_content_el.xml:common_regularText_description
+				title = LLL:EXT:cms/layout/locallang_db_new_content_el.xlf:common_regularText_title
+				description = LLL:EXT:cms/layout/locallang_db_new_content_el.xlf:common_regularText_description
 				tt_content_defValues {
 					CType = text
 				}
 			}
 			textpic {
 				icon = gfx/c_wiz/text_image_right.gif
-				title = LLL:EXT:cms/layout/locallang_db_new_content_el.xml:common_textImage_title
-				description = LLL:EXT:cms/layout/locallang_db_new_content_el.xml:common_textImage_description
+				title = LLL:EXT:cms/layout/locallang_db_new_content_el.xlf:common_textImage_title
+				description = LLL:EXT:cms/layout/locallang_db_new_content_el.xlf:common_textImage_description
 				tt_content_defValues {
 					CType = textpic
 					imageorient = 17
@@ -43,24 +43,24 @@ mod.wizards.newContentElement {
 			}
 			image {
 				icon = gfx/c_wiz/images_only.gif
-				title = LLL:EXT:cms/layout/locallang_db_new_content_el.xml:common_imagesOnly_title
-				description = LLL:EXT:cms/layout/locallang_db_new_content_el.xml:common_imagesOnly_description
+				title = LLL:EXT:cms/layout/locallang_db_new_content_el.xlf:common_imagesOnly_title
+				description = LLL:EXT:cms/layout/locallang_db_new_content_el.xlf:common_imagesOnly_description
 				tt_content_defValues {
 					CType = image
 				}
 			}
 			bullets {
 				icon = gfx/c_wiz/bullet_list.gif
-				title = LLL:EXT:cms/layout/locallang_db_new_content_el.xml:common_bulletList_title
-				description = LLL:EXT:cms/layout/locallang_db_new_content_el.xml:common_bulletList_description
+				title = LLL:EXT:cms/layout/locallang_db_new_content_el.xlf:common_bulletList_title
+				description = LLL:EXT:cms/layout/locallang_db_new_content_el.xlf:common_bulletList_description
 				tt_content_defValues {
 					CType = bullets
 				}
 			}
 			table {
 				icon = gfx/c_wiz/table.gif
-				title = LLL:EXT:cms/layout/locallang_db_new_content_el.xml:common_table_title
-				description = LLL:EXT:cms/layout/locallang_db_new_content_el.xml:common_table_description
+				title = LLL:EXT:cms/layout/locallang_db_new_content_el.xlf:common_table_title
+				description = LLL:EXT:cms/layout/locallang_db_new_content_el.xlf:common_table_description
 				tt_content_defValues {
 					CType = table
 				}
@@ -69,36 +69,36 @@ mod.wizards.newContentElement {
 		}
 		common.show = header,text,textpic,image,bullets,table
 
-		special.header = LLL:EXT:cms/layout/locallang_db_new_content_el.xml:special
+		special.header = LLL:EXT:cms/layout/locallang_db_new_content_el.xlf:special
 		special.elements {
 			uploads {
 				icon = gfx/c_wiz/filelinks.gif
-				title = LLL:EXT:cms/layout/locallang_db_new_content_el.xml:special_filelinks_title
-				description = LLL:EXT:cms/layout/locallang_db_new_content_el.xml:special_filelinks_description
+				title = LLL:EXT:cms/layout/locallang_db_new_content_el.xlf:special_filelinks_title
+				description = LLL:EXT:cms/layout/locallang_db_new_content_el.xlf:special_filelinks_description
 				tt_content_defValues {
 					CType = uploads
 				}
 			}
 			multimedia {
 				icon = gfx/c_wiz/multimedia.gif
-				title = LLL:EXT:cms/layout/locallang_db_new_content_el.xml:special_multimedia_title
-				description = LLL:EXT:cms/layout/locallang_db_new_content_el.xml:special_multimedia_description
+				title = LLL:EXT:cms/layout/locallang_db_new_content_el.xlf:special_multimedia_title
+				description = LLL:EXT:cms/layout/locallang_db_new_content_el.xlf:special_multimedia_description
 				tt_content_defValues {
 					CType = multimedia
 				}
 			}
 			media {
 				icon = gfx/c_wiz/multimedia.gif
-				title = LLL:EXT:cms/layout/locallang_db_new_content_el.xml:special_media_title
-				description = LLL:EXT:cms/layout/locallang_db_new_content_el.xml:special_media_description
+				title = LLL:EXT:cms/layout/locallang_db_new_content_el.xlf:special_media_title
+				description = LLL:EXT:cms/layout/locallang_db_new_content_el.xlf:special_media_description
 				tt_content_defValues {
 					CType = media
 				}
 			}
 			menu {
 				icon = gfx/c_wiz/sitemap2.gif
-				title = LLL:EXT:cms/layout/locallang_db_new_content_el.xml:special_menus_title
-				description = LLL:EXT:cms/layout/locallang_db_new_content_el.xml:special_menus_description
+				title = LLL:EXT:cms/layout/locallang_db_new_content_el.xlf:special_menus_title
+				description = LLL:EXT:cms/layout/locallang_db_new_content_el.xlf:special_menus_description
 				tt_content_defValues {
 					CType = menu
 					menu_type = 0
@@ -106,24 +106,24 @@ mod.wizards.newContentElement {
 			}
 			html {
 				icon = gfx/c_wiz/html.gif
-				title = LLL:EXT:cms/layout/locallang_db_new_content_el.xml:special_plainHTML_title
-				description = LLL:EXT:cms/layout/locallang_db_new_content_el.xml:special_plainHTML_description
+				title = LLL:EXT:cms/layout/locallang_db_new_content_el.xlf:special_plainHTML_title
+				description = LLL:EXT:cms/layout/locallang_db_new_content_el.xlf:special_plainHTML_description
 				tt_content_defValues {
 					CType = html
 				}
 			}
 			div {
 				icon = gfx/c_wiz/div.gif
-				title = LLL:EXT:cms/layout/locallang_db_new_content_el.xml:special_divider_title
-				description = LLL:EXT:cms/layout/locallang_db_new_content_el.xml:special_divider_description
+				title = LLL:EXT:cms/layout/locallang_db_new_content_el.xlf:special_divider_title
+				description = LLL:EXT:cms/layout/locallang_db_new_content_el.xlf:special_divider_description
 				tt_content_defValues {
 					CType = div
 				}
 			}
 			shortcut {
 				icon = gfx/c_wiz/shortcut.gif
-				title = LLL:EXT:cms/layout/locallang_db_new_content_el.xml:special_shortcut_title
-				description = LLL:EXT:cms/layout/locallang_db_new_content_el.xml:special_shortcut_description
+				title = LLL:EXT:cms/layout/locallang_db_new_content_el.xlf:special_shortcut_title
+				description = LLL:EXT:cms/layout/locallang_db_new_content_el.xlf:special_shortcut_description
 				tt_content_defValues {
 					CType = shortcut
 				}
@@ -132,12 +132,12 @@ mod.wizards.newContentElement {
 		}
 		special.show = uploads,media,menu,html,div,shortcut
 
-		forms.header = LLL:EXT:cms/layout/locallang_db_new_content_el.xml:forms
+		forms.header = LLL:EXT:cms/layout/locallang_db_new_content_el.xlf:forms
 		forms.elements {
 			mailform {
 				icon = gfx/c_wiz/mailform.gif
-				title = LLL:EXT:cms/layout/locallang_db_new_content_el.xml:forms_mail_title
-				description = LLL:EXT:cms/layout/locallang_db_new_content_el.xml:forms_mail_description
+				title = LLL:EXT:cms/layout/locallang_db_new_content_el.xlf:forms_mail_title
+				description = LLL:EXT:cms/layout/locallang_db_new_content_el.xlf:forms_mail_description
 				tt_content_defValues {
 					CType = mailform
 					bodytext (
@@ -155,8 +155,8 @@ mod.wizards.newContentElement {
 			}
 			search {
 				icon = gfx/c_wiz/searchform.gif
-				title = LLL:EXT:cms/layout/locallang_db_new_content_el.xml:forms_search_title
-				description = LLL:EXT:cms/layout/locallang_db_new_content_el.xml:forms_search_description
+				title = LLL:EXT:cms/layout/locallang_db_new_content_el.xlf:forms_search_title
+				description = LLL:EXT:cms/layout/locallang_db_new_content_el.xlf:forms_search_description
 				tt_content_defValues {
 					CType = search
 				}
@@ -164,12 +164,12 @@ mod.wizards.newContentElement {
 		}
 		forms.show = mailform,search
 
-		plugins.header = LLL:EXT:cms/layout/locallang_db_new_content_el.xml:plugins
+		plugins.header = LLL:EXT:cms/layout/locallang_db_new_content_el.xlf:plugins
 		plugins.elements {
 			general {
 				icon = gfx/c_wiz/user_defined.gif
-				title = LLL:EXT:cms/layout/locallang_db_new_content_el.xml:plugins_general_title
-				description = LLL:EXT:cms/layout/locallang_db_new_content_el.xml:plugins_general_description
+				title = LLL:EXT:cms/layout/locallang_db_new_content_el.xlf:plugins_general_title
+				description = LLL:EXT:cms/layout/locallang_db_new_content_el.xlf:plugins_general_description
 				tt_content_defValues.CType = list
 			}
 		}
diff --git a/typo3/sysext/cms/ext_tables.php b/typo3/sysext/cms/ext_tables.php
index 8c7647e9a3795a69e01acc40d8aa930171ed4fea..5424b44234a217a87341779138ba6bec3fe18f92 100755
--- a/typo3/sysext/cms/ext_tables.php
+++ b/typo3/sysext/cms/ext_tables.php
@@ -4,8 +4,8 @@ if (!defined('TYPO3_MODE')) {
 }
 if (TYPO3_MODE == 'BE') {
 	\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addModule('web', 'layout', 'top', \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'layout/');
-	\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('_MOD_web_layout', 'EXT:cms/locallang_csh_weblayout.xml');
-	\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('_MOD_web_info', 'EXT:cms/locallang_csh_webinfo.xml');
+	\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('_MOD_web_layout', 'EXT:cms/locallang_csh_weblayout.xlf');
+	\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('_MOD_web_info', 'EXT:cms/locallang_csh_webinfo.xlf');
 	\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::insertModuleFunction('web_info', 'tx_cms_webinfo_page', \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'web_info/class.tx_cms_webinfo.php', 'LLL:EXT:cms/locallang_tca.xlf:mod_tx_cms_webinfo_page');
 	\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::insertModuleFunction('web_info', 'tx_cms_webinfo_lang', \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'web_info/class.tx_cms_webinfo_lang.php', 'LLL:EXT:cms/locallang_tca.xlf:mod_tx_cms_webinfo_lang');
 }
diff --git a/typo3/sysext/cms/layout/conf.php b/typo3/sysext/cms/layout/conf.php
index 85efa7001b1d508f5b1a5c0c568f475c1e7aaaf4..e1a703854b3884fe3837a3fc2b4d877bf5261aa1 100755
--- a/typo3/sysext/cms/layout/conf.php
+++ b/typo3/sysext/cms/layout/conf.php
@@ -2,7 +2,7 @@
 define('TYPO3_MOD_PATH', 'sysext/cms/layout/');
 $BACK_PATH = '../../../';
 $MLANG['default']['tabs_images']['tab'] = 'layout.gif';
-$MLANG['default']['ll_ref'] = 'LLL:EXT:cms/layout/locallang_mod.xml';
+$MLANG['default']['ll_ref'] = 'LLL:EXT:cms/layout/locallang_mod.xlf';
 $MCONF['script'] = 'db_layout.php';
 $MCONF['access'] = 'user,group';
 $MCONF['name'] = 'web_layout';
diff --git a/typo3/sysext/cms/layout/db_layout.php b/typo3/sysext/cms/layout/db_layout.php
index 62cfbb8bf58878fb9c49cb39d11a5aaacc0cd7ae..0ed854a83b25db8b56e0c09a8d35d95fc839a86f 100755
--- a/typo3/sysext/cms/layout/db_layout.php
+++ b/typo3/sysext/cms/layout/db_layout.php
@@ -37,7 +37,7 @@
 unset($MCONF);
 require 'conf.php';
 require $BACK_PATH . 'init.php';
-$LANG->includeLLFile('EXT:cms/layout/locallang.xml');
+$LANG->includeLLFile('EXT:cms/layout/locallang.xlf');
 
 $BE_USER->modAccess($MCONF, 1);
 // Will open up records locked by current user. It's assumed that the locking should end if this script is hit.
diff --git a/typo3/sysext/cms/layout/db_new_content_el.php b/typo3/sysext/cms/layout/db_new_content_el.php
index bb3171579ed77c1ef418a8a1d31e4d9ebf2e953f..83073fd0be9c060a296b9f8d185200331aa1f686 100644
--- a/typo3/sysext/cms/layout/db_new_content_el.php
+++ b/typo3/sysext/cms/layout/db_new_content_el.php
@@ -42,7 +42,7 @@ unset($MLANG);
 // Merging locallang files/arrays:
 $GLOBALS['LANG']->includeLLFile('EXT:lang/locallang_misc.xlf');
 $LOCAL_LANG_orig = $LOCAL_LANG;
-$LANG->includeLLFile('EXT:cms/layout/locallang_db_new_content_el.xml');
+$LANG->includeLLFile('EXT:cms/layout/locallang_db_new_content_el.xlf');
 $LOCAL_LANG = \TYPO3\CMS\Core\Utility\GeneralUtility::array_merge_recursive_overrule($LOCAL_LANG_orig, $LOCAL_LANG);
 // Exits if 'cms' extension is not loaded:
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('cms', 1);
diff --git a/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php b/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php
index 8134b43c0f5ad2a2a2e7538c7dd839b6aa3d9309..f896b6cc6cea90d694482bb684641e22820d86df 100644
--- a/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php
+++ b/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php
@@ -376,7 +376,7 @@ class ExtensionManagementUtility {
 	 * - $table = 'tt_content'
 	 * - $field = 'CType'
 	 * - $item = array(
-	 * 'LLL:EXT:cms/locallang_ttc.xml:CType.I.10',
+	 * 'LLL:EXT:cms/locallang_ttc.xlf:CType.I.10',
 	 * 'login',
 	 * 'i/tt_content_login.gif',
 	 * ),
diff --git a/typo3/sysext/core/Configuration/TCA/sys_news.php b/typo3/sysext/core/Configuration/TCA/sys_news.php
index 37736a556770f35711c9bf3b74d4f619d9542f2b..b5d5520ec48bbc086deb199309df58202c67c1ac 100644
--- a/typo3/sysext/core/Configuration/TCA/sys_news.php
+++ b/typo3/sysext/core/Configuration/TCA/sys_news.php
@@ -76,7 +76,7 @@ return array(
 						'notNewRecords' => 1,
 						'RTEonly' => 1,
 						'type' => 'script',
-						'title' => 'LLL:EXT:cms/locallang_ttc.php:bodytext.W.RTE',
+						'title' => 'LLL:EXT:cms/locallang_ttc.xlf:bodytext.W.RTE',
 						'icon' => 'wizard_rte2.gif',
 						'script' => 'wizard_rte.php'
 					)
diff --git a/typo3/sysext/core/ext_tables.php b/typo3/sysext/core/ext_tables.php
index 48c35db6abce075d11b9214e35a82b7fa0932ae6..627b757675bd89ae5219f5516849bd9a24818fe7 100644
--- a/typo3/sysext/core/ext_tables.php
+++ b/typo3/sysext/core/ext_tables.php
@@ -196,7 +196,7 @@ $GLOBALS['TBE_STYLES'] = array(
  * documentation found in "Inside TYPO3"
  */
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('pages', 'EXT:lang/locallang_csh_pages.xlf');
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('be_users', 'EXT:lang/locallang_csh_be_users.xml');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('be_users', 'EXT:lang/locallang_csh_be_users.xlf');
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('be_groups', 'EXT:lang/locallang_csh_be_groups.xlf');
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('sys_filemounts', 'EXT:lang/locallang_csh_sysfilem.xlf');
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('sys_language', 'EXT:lang/locallang_csh_syslang.xlf');
diff --git a/typo3/sysext/css_styled_content/ext_tables.php b/typo3/sysext/css_styled_content/ext_tables.php
index d35b21e2c86c2b88bd22c594df989d7aa135c9f2..09746b7213dc14aeffbb99d1ce5d1f993a376ae4 100755
--- a/typo3/sysext/css_styled_content/ext_tables.php
+++ b/typo3/sysext/css_styled_content/ext_tables.php
@@ -7,7 +7,7 @@ if (!defined('TYPO3_MODE')) {
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('*', 'FILE:EXT:css_styled_content/flexform_ds.xml', 'table');
 
 $GLOBALS['TCA']['tt_content']['types']['table']['showitem'] = 'CType;;4;;1-1-1, hidden, header;;3;;2-2-2, linkToTop;;;;4-4-4,
-			--div--;LLL:EXT:cms/locallang_ttc.xml:CType.I.5, layout;;10;;3-3-3, cols, bodytext;;9;nowrap:wizards[table], text_properties, pi_flexform,
+			--div--;LLL:EXT:cms/locallang_ttc.xlf:CType.I.5, layout;;10;;3-3-3, cols, bodytext;;9;nowrap:wizards[table], text_properties, pi_flexform,
 			--div--;LLL:EXT:cms/locallang_tca.xlf:pages.tabs.access, starttime, endtime, fe_group';
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile($_EXTKEY, 'static/', 'CSS Styled Content');
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile($_EXTKEY, 'static/v3.8/', 'CSS Styled Content TYPO3 v3.8');
diff --git a/typo3/sysext/dbal/mod1/conf.php b/typo3/sysext/dbal/mod1/conf.php
index 9720faadda29b313b1d99d257c1ad233fa9222a0..863b287f81b4711e997a920aee0b752461e8184c 100644
--- a/typo3/sysext/dbal/mod1/conf.php
+++ b/typo3/sysext/dbal/mod1/conf.php
@@ -3,5 +3,5 @@ $MCONF['name'] = 'tools_txdbalM1';
 $MCONF['access'] = 'admin';
 $MCONF['script'] = '_DISPATCH';
 $MLANG['default']['tabs_images']['tab'] = 'moduleicon.gif';
-$MLANG['default']['ll_ref'] = 'LLL:EXT:dbal/mod1/locallang_mod.xml';
+$MLANG['default']['ll_ref'] = 'LLL:EXT:dbal/mod1/locallang_mod.xlf';
 ?>
\ No newline at end of file
diff --git a/typo3/sysext/dbal/mod1/index.php b/typo3/sysext/dbal/mod1/index.php
index e4c6a5a020636ab81c8d7f4e84165862a57fa55a..43b675afeca8a67d85f158af5f559a194e12614e 100644
--- a/typo3/sysext/dbal/mod1/index.php
+++ b/typo3/sysext/dbal/mod1/index.php
@@ -29,7 +29,7 @@
  * @author 	Kasper Skårhøj <kasperYYYY@typo3.com>
  * @author 	Karsten Dambekalns <karsten@typo3.org>
  */
-$LANG->includeLLFile('EXT:dbal/mod1/locallang.xml');
+$LANG->includeLLFile('EXT:dbal/mod1/locallang.xlf');
 $BE_USER->modAccess($MCONF, 1);
 
 $SOBE = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Dbal\\Controller\\ModuleController');
diff --git a/typo3/sysext/extbase/Classes/Utility/ExtensionUtility.php b/typo3/sysext/extbase/Classes/Utility/ExtensionUtility.php
index 3c60e93472c41cf8355bb548480ed5ebeb788e98..b3210e29248060753ce4763cb0302f83281a3bca 100644
--- a/typo3/sysext/extbase/Classes/Utility/ExtensionUtility.php
+++ b/typo3/sysext/extbase/Classes/Utility/ExtensionUtility.php
@@ -200,7 +200,7 @@ tt_content.' . $pluginSignature . ' {
 	 * @param string $subModuleName The submodule key.
 	 * @param string $position This can be used to set the position of the $sub module within the list of existing submodules for the main module. $position has this syntax: [cmd]:[submodule-key]. cmd can be "after", "before" or "top" (or blank which is default). If "after"/"before" then submodule will be inserted after/before the existing submodule with [submodule-key] if found. If not found, the bottom of list. If "top" the module is inserted in the top of the submodule list.
 	 * @param array $controllerActions is an array of allowed combinations of controller and action stored in an array (controller name as key and a comma separated list of action names as value, the first controller and its first action is chosen as default)
-	 * @param array $moduleConfiguration The configuration options of the module (icon, locallang.xml file)
+	 * @param array $moduleConfiguration The configuration options of the module (icon, locallang.xlf file)
 	 * @throws \InvalidArgumentException
 	 * @return void
 	 */
diff --git a/typo3/sysext/extbase/ext_tables.php b/typo3/sysext/extbase/ext_tables.php
index 667e6024941a4e26cdc6495ae711b3015a8529db..6fcca7f6911b0e2d61f0a7dd3e64a754641945d9 100644
--- a/typo3/sysext/extbase/ext_tables.php
+++ b/typo3/sysext/extbase/ext_tables.php
@@ -11,12 +11,12 @@ if (!isset($TCA['fe_users']['ctrl']['type'])) {
 	$tempColumns = array(
 		'tx_extbase_type' => array(
 			'exclude' => 1,
-			'label' => 'LLL:EXT:extbase/Resources/Private/Language/locallang_db.xml:fe_users.tx_extbase_type',
+			'label' => 'LLL:EXT:extbase/Resources/Private/Language/locallang_db.xlf:fe_users.tx_extbase_type',
 			'config' => array(
 				'type' => 'select',
 				'items' => array(
-					array('LLL:EXT:extbase/Resources/Private/Language/locallang_db.xml:fe_users.tx_extbase_type.0', '0'),
-					array('LLL:EXT:extbase/Resources/Private/Language/locallang_db.xml:fe_users.tx_extbase_type.Tx_Extbase_Domain_Model_FrontendUser', 'Tx_Extbase_Domain_Model_FrontendUser')
+					array('LLL:EXT:extbase/Resources/Private/Language/locallang_db.xlf:fe_users.tx_extbase_type.0', '0'),
+					array('LLL:EXT:extbase/Resources/Private/Language/locallang_db.xlf:fe_users.tx_extbase_type.Tx_Extbase_Domain_Model_FrontendUser', 'Tx_Extbase_Domain_Model_FrontendUser')
 				),
 				'size' => 1,
 				'maxitems' => 1,
@@ -33,12 +33,12 @@ if (!isset($TCA['fe_groups']['ctrl']['type'])) {
 	$tempColumns = array(
 		'tx_extbase_type' => array(
 			'exclude' => 1,
-			'label' => 'LLL:EXT:extbase/Resources/Private/Language/locallang_db.xml:fe_groups.tx_extbase_type',
+			'label' => 'LLL:EXT:extbase/Resources/Private/Language/locallang_db.xlf:fe_groups.tx_extbase_type',
 			'config' => array(
 				'type' => 'select',
 				'items' => array(
-					array('LLL:EXT:extbase/Resources/Private/Language/locallang_db.xml:fe_groups.tx_extbase_type.0', '0'),
-					array('LLL:EXT:extbase/Resources/Private/Language/locallang_db.xml:fe_groups.tx_extbase_type.Tx_Extbase_Domain_Model_FrontendUserGroup', 'Tx_Extbase_Domain_Model_FrontendUserGroup')
+					array('LLL:EXT:extbase/Resources/Private/Language/locallang_db.xlf:fe_groups.tx_extbase_type.0', '0'),
+					array('LLL:EXT:extbase/Resources/Private/Language/locallang_db.xlf:fe_groups.tx_extbase_type.Tx_Extbase_Domain_Model_FrontendUserGroup', 'Tx_Extbase_Domain_Model_FrontendUserGroup')
 				),
 				'size' => 1,
 				'maxitems' => 1,
@@ -53,8 +53,8 @@ if (!isset($TCA['fe_groups']['ctrl']['type'])) {
 $TCA['fe_groups']['types']['Tx_Extbase_Domain_Model_FrontendUserGroup'] = $TCA['fe_groups']['types']['0'];
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks']['TYPO3\\CMS\\Extbase\\Scheduler\\Task'] = array(
 	'extension' => $_EXTKEY,
-	'title' => 'LLL:EXT:extbase/Resources/Private/Language/locallang_db.xml:task.name',
-	'description' => 'LLL:EXT:extbase/Resources/Private/Language/locallang_db.xml:task.description',
+	'title' => 'LLL:EXT:extbase/Resources/Private/Language/locallang_db.xlf:task.name',
+	'description' => 'LLL:EXT:extbase/Resources/Private/Language/locallang_db.xlf:task.description',
 	'additionalFields' => 'TYPO3\\CMS\\Extbase\\Scheduler\\FieldProvider'
 );
 ?>
\ No newline at end of file
diff --git a/typo3/sysext/extensionmanager/Configuration/TCA/tx_extensionmanager_domain_model_extension.php b/typo3/sysext/extensionmanager/Configuration/TCA/tx_extensionmanager_domain_model_extension.php
index 3cd7d7284ad85ca532c86fce51eddb096aac92b6..510a807a571b9a8975a1b306e195bf34636d6719 100644
--- a/typo3/sysext/extensionmanager/Configuration/TCA/tx_extensionmanager_domain_model_extension.php
+++ b/typo3/sysext/extensionmanager/Configuration/TCA/tx_extensionmanager_domain_model_extension.php
@@ -1,7 +1,7 @@
 <?php
 return array(
 	'ctrl' => array(
-		'title' => 'LLL:EXT:extensionmanager/Resources/Private/Language/locallang_db.xml:tx_extensionmanager_domain_model_extension',
+		'title' => 'LLL:EXT:extensionmanager/Resources/Private/Language/locallang_db.xlf:tx_extensionmanager_domain_model_extension',
 		'label' => 'uid',
 		'default_sortby' => '',
 		'hideTable' => TRUE
@@ -12,7 +12,7 @@ return array(
 	'columns' => array(
 		'extension_key' => array(
 			'exclude' => 0,
-			'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xml:tx_extensionmanager_domain_model_extension.extensionkey',
+			'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xlf:tx_extensionmanager_domain_model_extension.extensionkey',
 			'config' => array(
 				'type' => 'input',
 				'size' => '30'
@@ -20,7 +20,7 @@ return array(
 		),
 		'version' => array(
 			'exclude' => 0,
-			'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xml:tx_extensionmanager_domain_model_extension.version',
+			'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xlf:tx_extensionmanager_domain_model_extension.version',
 			'config' => array(
 				'type' => 'input',
 				'size' => '30'
@@ -33,7 +33,7 @@ return array(
 		),
 		'integer_version' => array(
 			'exclude' => 0,
-			'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xml:tx_extensionmanager_domain_model_extension.integerversion',
+			'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xlf:tx_extensionmanager_domain_model_extension.integerversion',
 			'config' => array(
 				'type' => 'input',
 				'size' => '30'
@@ -41,7 +41,7 @@ return array(
 		),
 		'title' => array(
 			'exclude' => 0,
-			'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xml:tx_extensionmanager_domain_model_extension.title',
+			'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xlf:tx_extensionmanager_domain_model_extension.title',
 			'config' => array(
 				'type' => 'input',
 				'size' => '30'
@@ -49,7 +49,7 @@ return array(
 		),
 		'description' => array(
 			'exclude' => 0,
-			'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xml:tx_extensionmanager_domain_model_extension.description',
+			'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xlf:tx_extensionmanager_domain_model_extension.description',
 			'config' => array(
 				'type' => 'text',
 				'cols' => '30',
@@ -58,7 +58,7 @@ return array(
 		),
 		'state' => array(
 			'exclude' => 0,
-			'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xml:tx_extensionmanager_domain_model_extension.state',
+			'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xlf:tx_extensionmanager_domain_model_extension.state',
 			'config' => array(
 				'type' => 'input',
 				'size' => '30',
@@ -68,7 +68,7 @@ return array(
 		),
 		'category' => array(
 			'exclude' => 0,
-			'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xml:tx_extensionmanager_domain_model_extension.category',
+			'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xlf:tx_extensionmanager_domain_model_extension.category',
 			'config' => array(
 				'type' => 'input',
 				'size' => '30',
@@ -78,7 +78,7 @@ return array(
 		),
 		'last_updated' => array(
 			'exclude' => 0,
-			'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xml:tx_extensionmanager_domain_model_extension.lastupdated',
+			'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xlf:tx_extensionmanager_domain_model_extension.lastupdated',
 			'config' => array(
 				'type' => 'input',
 				'size' => '30',
@@ -87,7 +87,7 @@ return array(
 		),
 		'update_comment' => array(
 			'exclude' => 0,
-			'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xml:tx_extensionmanager_domain_model_extension.updatecomment',
+			'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xlf:tx_extensionmanager_domain_model_extension.updatecomment',
 			'config' => array(
 				'type' => 'text',
 				'cols' => '30',
@@ -96,7 +96,7 @@ return array(
 		),
 		'author_name' => array(
 			'exclude' => 0,
-			'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xml:tx_extensionmanager_domain_model_extension.authorname',
+			'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xlf:tx_extensionmanager_domain_model_extension.authorname',
 			'config' => array(
 				'type' => 'input',
 				'size' => '30'
@@ -104,7 +104,7 @@ return array(
 		),
 		'author_email' => array(
 			'exclude' => 0,
-			'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xml:tx_extensionmanager_domain_model_extension.authoremail',
+			'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xlf:tx_extensionmanager_domain_model_extension.authoremail',
 			'config' => array(
 				'type' => 'input',
 				'size' => '30'
@@ -112,7 +112,7 @@ return array(
 		),
 		'current_version' => array(
 			'exclude' => 0,
-			'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xml:tx_extensionmanager_domain_model_extension.currentversion',
+			'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xlf:tx_extensionmanager_domain_model_extension.currentversion',
 			'config' => array(
 				'type' => 'check',
 				'size' => '1'
@@ -120,7 +120,7 @@ return array(
 		),
 		'review_state' => array(
 			'exclude' => 0,
-			'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xml:tx_extensionmanager_domain_model_extension.reviewstate',
+			'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xlf:tx_extensionmanager_domain_model_extension.reviewstate',
 			'config' => array(
 				'type' => 'check',
 				'size' => '1'
@@ -128,7 +128,7 @@ return array(
 		),
 		'md5hash' => array(
 			'exclude' => 0,
-			'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xml:tx_extensionmanager_domain_model_extension.md5hash',
+			'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xlf:tx_extensionmanager_domain_model_extension.md5hash',
 			'config' => array(
 				'type' => 'input',
 				'size' => '1',
@@ -136,7 +136,7 @@ return array(
 		),
 		'serialized_dependencies' => array(
 			'exclude' => 0,
-			'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xml:tx_extensionmanager_domain_model_extension.serializedDependencies',
+			'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xlf:tx_extensionmanager_domain_model_extension.serializedDependencies',
 			'config' => array(
 				'type' => 'input',
 				'size' => '30',
diff --git a/typo3/sysext/extensionmanager/Configuration/TCA/tx_extensionmanager_domain_model_repository.php b/typo3/sysext/extensionmanager/Configuration/TCA/tx_extensionmanager_domain_model_repository.php
index eeb4e352791e359870b408ff0634abb8f32c3462..d91014dde1eb67c14e85a3dda70dd4ee7ac1070d 100644
--- a/typo3/sysext/extensionmanager/Configuration/TCA/tx_extensionmanager_domain_model_repository.php
+++ b/typo3/sysext/extensionmanager/Configuration/TCA/tx_extensionmanager_domain_model_repository.php
@@ -1,7 +1,7 @@
 <?php
 return array(
 	'ctrl' => array(
-		'title' => 'LLL:EXT:extensionmanager/Resources/Private/Language/locallang_db.xml:tx_extensionmanager_domain_model_repository',
+		'title' => 'LLL:EXT:extensionmanager/Resources/Private/Language/locallang_db.xlf:tx_extensionmanager_domain_model_repository',
 		'label' => 'uid',
 		'default_sortby' => '',
 		'hideTable' => TRUE,
@@ -12,7 +12,7 @@ return array(
 	'columns' => array(
 		'title' => array(
 			'exclude' => 0,
-			'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xml:tx_extensionmanager_domain_model_repository.title',
+			'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xlf:tx_extensionmanager_domain_model_repository.title',
 			'config' => array(
 				'type' => 'input',
 				'size' => '30'
@@ -20,7 +20,7 @@ return array(
 		),
 		'description' => array(
 			'exclude' => 0,
-			'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xml:tx_extensionmanager_domain_model_repository.description',
+			'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xlf:tx_extensionmanager_domain_model_repository.description',
 			'config' => array(
 				'type' => 'input',
 				'size' => '30'
@@ -28,7 +28,7 @@ return array(
 		),
 		'wsdl_url' => array(
 			'exclude' => 0,
-			'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xml:tx_extensionmanager_domain_model_repository.wsdlUrl',
+			'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xlf:tx_extensionmanager_domain_model_repository.wsdlUrl',
 			'config' => array(
 				'type' => 'input',
 				'size' => '30'
@@ -36,7 +36,7 @@ return array(
 		),
 		'mirror_list_url' => array(
 			'exclude' => 0,
-			'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xml:tx_extensionmanager_domain_model_repository.mirrorListUrl',
+			'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xlf:tx_extensionmanager_domain_model_repository.mirrorListUrl',
 			'config' => array(
 				'type' => 'text',
 				'cols' => '30',
@@ -44,7 +44,7 @@ return array(
 		),
 		'last_update' => array(
 			'exclude' => 0,
-			'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xml:tx_extensionmanager_domain_model_repository.lastUpdate',
+			'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xlf:tx_extensionmanager_domain_model_repository.lastUpdate',
 			'config' => array(
 				'type' => 'input',
 				'size' => '30',
@@ -52,7 +52,7 @@ return array(
 		),
 		'extension_count' => array(
 			'exclude' => 0,
-			'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xml:tx_extensionmanager_domain_model_repository.extensionCount',
+			'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xlf:tx_extensionmanager_domain_model_repository.extensionCount',
 			'config' => array(
 				'type' => 'input',
 				'size' => '30',
diff --git a/typo3/sysext/extensionmanager/ext_tables.php b/typo3/sysext/extensionmanager/ext_tables.php
index 25804d3eefd0f2d86120fcc03c9f94e70dbdc920..7a8f94519b2f502af528d657d47e3f8dff2c4e18 100644
--- a/typo3/sysext/extensionmanager/ext_tables.php
+++ b/typo3/sysext/extensionmanager/ext_tables.php
@@ -19,7 +19,7 @@ if (TYPO3_MODE === 'BE') {
 		array(
 			'access' => 'user,group',
 			'icon' => 'EXT:' . $_EXTKEY . '/ext_icon.gif',
-			'labels' => 'LLL:EXT:' . $_EXTKEY . '/Resources/Private/Language/locallang_mod.xml',
+			'labels' => 'LLL:EXT:' . $_EXTKEY . '/Resources/Private/Language/locallang_mod.xlf',
 		)
 	);
 
diff --git a/typo3/sysext/felogin/Classes/Controller/FrontendLoginController.php b/typo3/sysext/felogin/Classes/Controller/FrontendLoginController.php
index 5b5ca2573e0a5633679df53774266576b291bcba..82e7c4948b4c68243c30227eb55eb66351f10ff0 100644
--- a/typo3/sysext/felogin/Classes/Controller/FrontendLoginController.php
+++ b/typo3/sysext/felogin/Classes/Controller/FrontendLoginController.php
@@ -904,7 +904,7 @@ class FrontendLoginController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin
 	}
 
 	/**
-	 * Returns the header / message value from flexform if present, else from locallang.xml
+	 * Returns the header / message value from flexform if present, else from locallang.xlf
 	 *
 	 * @param string $label label name
 	 * @param string $stdWrapArray TS stdWrap array
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Be/PagePathViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Be/PagePathViewHelper.php
index c3d99afa334d040e9ab108c26564843af8f4e752..1e228a8d38987a6a23fd10b823cb3d1c06db3507 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Be/PagePathViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Be/PagePathViewHelper.php
@@ -51,7 +51,7 @@ class PagePathViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Be\AbstractBackend
 			$title = $GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'];
 		}
 		// Setting the path of the page
-		$pagePath = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.path', 1) . ': <span class="typo3-docheader-pagePath">';
+		$pagePath = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.path', 1) . ': <span class="typo3-docheader-pagePath">';
 		// crop the title to title limit (or 50, if not defined)
 		$cropLength = empty($GLOBALS['BE_USER']->uc['titleLen']) ? 50 : $GLOBALS['BE_USER']->uc['titleLen'];
 		$croppedTitle = \TYPO3\CMS\Core\Utility\GeneralUtility::fixed_lgd_cs($title, -$cropLength);
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/TranslateViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/TranslateViewHelper.php
index 77233673612787925bb18cb3dcd2584c777da742..ea0839d4f123ae4a60f000db6e6c9498e5ecdcad 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/TranslateViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/TranslateViewHelper.php
@@ -34,7 +34,7 @@ namespace TYPO3\CMS\Fluid\ViewHelpers;
  * </output>
  *
  * <code title="Translate key from custom locallang file">
- * <f:translate key="LLL:EXT:myext/Resources/Private/Language/locallang.xml:key1" />
+ * <f:translate key="LLL:EXT:myext/Resources/Private/Language/locallang.xlf:key1" />
  * </code>
  * <output>
  * value of key "key1" in the current website language
diff --git a/typo3/sysext/form/Classes/View/Wizard/WizardView.php b/typo3/sysext/form/Classes/View/Wizard/WizardView.php
index e00f2d6b919e4e3047f6a3d8689119f94c547abb..d962472d80f5ba9e8357d063daa3176d649c7d30 100644
--- a/typo3/sysext/form/Classes/View/Wizard/WizardView.php
+++ b/typo3/sysext/form/Classes/View/Wizard/WizardView.php
@@ -54,7 +54,7 @@ class WizardView extends \TYPO3\CMS\Form\View\Wizard\AbstractWizardView {
 	 */
 	public function __construct(\TYPO3\CMS\Form\Domain\Repository\ContentRepository $repository) {
 		parent::__construct($repository);
-		$GLOBALS['LANG']->includeLLFile('EXT:form/Resources/Private/Language/locallang_wizard.xml');
+		$GLOBALS['LANG']->includeLLFile('EXT:form/Resources/Private/Language/locallang_wizard.xlf');
 		$GLOBALS['SOBE'] = $this;
 		// Define the document template object
 		$this->doc = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Template\\DocumentTemplate');
diff --git a/typo3/sysext/form/ext_tables.php b/typo3/sysext/form/ext_tables.php
index 90f749799390c13b96b4fe20b7f07028a5ea42d0..a48bec90398cf96075f82988a223b2e569aec42f 100644
--- a/typo3/sysext/form/ext_tables.php
+++ b/typo3/sysext/form/ext_tables.php
@@ -22,8 +22,8 @@ $GLOBALS['TCA']['tt_content']['types']['mailform']['showitem'] = '
 	hidden,
 	header;;3;;2-2-2,
 	linkToTop;;;;3-3-3,
-	--div--;LLL:EXT:cms/locallang_ttc.xml:CType.I.8,
-	bodytext;LLL:EXT:cms/locallang_ttc.php:bodytext.ALT.mailform;;nowrap:wizards[forms];3-3-3,
+	--div--;LLL:EXT:cms/locallang_ttc.xlf:CType.I.8,
+	bodytext;LLL:EXT:cms/locallang_ttc.xlf:bodytext.ALT.mailform;;nowrap:wizards[forms];3-3-3,
 	--div--;LLL:EXT:cms/locallang_tca.xlf:pages.tabs.access,
 	starttime,
 	endtime,
diff --git a/typo3/sysext/impexp/Classes/Task/ImportExportTask.php b/typo3/sysext/impexp/Classes/Task/ImportExportTask.php
index 34fb5f9acb3388de52d21442a809e6580f63d140..e42447f01c5dc40bce51a52ef4046c59cda8d9a6 100644
--- a/typo3/sysext/impexp/Classes/Task/ImportExportTask.php
+++ b/typo3/sysext/impexp/Classes/Task/ImportExportTask.php
@@ -45,7 +45,7 @@ class ImportExportTask implements \TYPO3\CMS\Taskcenter\TaskInterface {
 	 */
 	public function __construct(\TYPO3\CMS\Taskcenter\Controller\TaskModuleController $taskObject) {
 		$this->taskObject = $taskObject;
-		$GLOBALS['LANG']->includeLLFile('EXT:impexp/locallang_csh.xml');
+		$GLOBALS['LANG']->includeLLFile('EXT:impexp/locallang_csh.xlf');
 	}
 
 	/**
diff --git a/typo3/sysext/impexp/ext_tables.php b/typo3/sysext/impexp/ext_tables.php
index 5276d5509ca58d64c28d5e4acc367fc79071eab9..6ad3c54060ddaf65ba4b818e159c85e2e6ede3f3 100755
--- a/typo3/sysext/impexp/ext_tables.php
+++ b/typo3/sysext/impexp/ext_tables.php
@@ -13,7 +13,7 @@ if (TYPO3_MODE === 'BE') {
 	);
 	\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('xMOD_tx_impexp', 'EXT:impexp/locallang_csh.xlf');
 	// CSH labels for TYPO3 4.5 and greater.  These labels override the ones set above, while still falling back to the original labels if no translation is available.
-	$GLOBALS['TYPO3_CONF_VARS']['SYS']['locallangXMLOverride']['EXT:impexp/locallang_csh.xml'][] = 'EXT:impexp/locallang_csh_45.xml';
+	$GLOBALS['TYPO3_CONF_VARS']['SYS']['locallangXMLOverride']['EXT:impexp/locallang_csh.xml'][] = 'EXT:impexp/locallang_csh_45.xlf';
 	// Special context menu actions for the import/export module
 	$importExportActions = '
 		9000 = DIVIDER
@@ -21,7 +21,7 @@ if (TYPO3_MODE === 'BE') {
 		9100 = ITEM
 		9100 {
 			name = exportT3d
-			label = LLL:EXT:impexp/app/locallang.xml:export
+			label = LLL:EXT:impexp/app/locallang.xlf:export
 			spriteIcon = actions-document-export-t3d
 			callbackAction = exportT3d
 		}
diff --git a/typo3/sysext/indexed_search/Classes/FileContentParser.php b/typo3/sysext/indexed_search/Classes/FileContentParser.php
index 0b059bd19c379efefeb30c1b4fe7d419b1055b6c..b56c9e1557c4f78ddbbc2200c3564098272d0aed 100644
--- a/typo3/sysext/indexed_search/Classes/FileContentParser.php
+++ b/typo3/sysext/indexed_search/Classes/FileContentParser.php
@@ -98,7 +98,7 @@ class FileContentParser {
 		// Ignore extensions
 		$ignoreExtensions = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', strtolower($indexerConfig['ignoreExtensions']), 1);
 		if (in_array($extension, $ignoreExtensions)) {
-			$this->pObj->log_setTSlogMessage(sprintf($this->sL('LLL:EXT:indexed_search/locallang.xml:ignoreExtensions'), $extension), 1);
+			$this->pObj->log_setTSlogMessage(sprintf($this->sL('LLL:EXT:indexed_search/locallang.xlf:ignoreExtensions'), $extension), 1);
 			return FALSE;
 		}
 		// Switch on file extension:
@@ -114,10 +114,10 @@ class FileContentParser {
 						$this->pdf_mode = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange($indexerConfig['pdf_mode'], -100, 100);
 						$extOK = TRUE;
 					} else {
-						$this->pObj->log_setTSlogMessage(sprintf($this->sL('LLL:EXT:indexed_search/locallang.xml:pdfToolsNotFound'), $pdfPath), 3);
+						$this->pObj->log_setTSlogMessage(sprintf($this->sL('LLL:EXT:indexed_search/locallang.xlf:pdfToolsNotFound'), $pdfPath), 3);
 					}
 				} else {
-					$this->pObj->log_setTSlogMessage($this->sL('LLL:EXT:indexed_search/locallang.xml:pdfToolsDisabled'), 1);
+					$this->pObj->log_setTSlogMessage($this->sL('LLL:EXT:indexed_search/locallang.xlf:pdfToolsDisabled'), 1);
 				}
 				break;
 			case 'doc':
@@ -128,10 +128,10 @@ class FileContentParser {
 						$this->app['catdoc'] = $catdocPath . 'catdoc' . $exe;
 						$extOK = TRUE;
 					} else {
-						$this->pObj->log_setTSlogMessage(sprintf($this->sL('LLL:EXT:indexed_search/locallang.xml:catdocNotFound'), $catdocPath), 3);
+						$this->pObj->log_setTSlogMessage(sprintf($this->sL('LLL:EXT:indexed_search/locallang.xlf:catdocNotFound'), $catdocPath), 3);
 					}
 				} else {
-					$this->pObj->log_setTSlogMessage($this->sL('LLL:EXT:indexed_search/locallang.xml:catdocDisabled'), 1);
+					$this->pObj->log_setTSlogMessage($this->sL('LLL:EXT:indexed_search/locallang.xlf:catdocDisabled'), 1);
 				}
 				break;
 			case 'pps':
@@ -145,10 +145,10 @@ class FileContentParser {
 						$this->app['ppthtml'] = $ppthtmlPath . 'ppthtml' . $exe;
 						$extOK = TRUE;
 					} else {
-						$this->pObj->log_setTSlogMessage(sprintf($this->sL('LLL:EXT:indexed_search/locallang.xml:ppthtmlNotFound'), $ppthtmlPath), 3);
+						$this->pObj->log_setTSlogMessage(sprintf($this->sL('LLL:EXT:indexed_search/locallang.xlf:ppthtmlNotFound'), $ppthtmlPath), 3);
 					}
 				} else {
-					$this->pObj->log_setTSlogMessage($this->sL('LLL:EXT:indexed_search/locallang.xml:ppthtmlDisabled'), 1);
+					$this->pObj->log_setTSlogMessage($this->sL('LLL:EXT:indexed_search/locallang.xlf:ppthtmlDisabled'), 1);
 				}
 				break;
 			case 'xls':
@@ -160,10 +160,10 @@ class FileContentParser {
 						$this->app['xlhtml'] = $xlhtmlPath . 'xlhtml' . $exe;
 						$extOK = TRUE;
 					} else {
-						$this->pObj->log_setTSlogMessage(sprintf($this->sL('LLL:EXT:indexed_search/locallang.xml:xlhtmlNotFound'), $xlhtmlPath), 3);
+						$this->pObj->log_setTSlogMessage(sprintf($this->sL('LLL:EXT:indexed_search/locallang.xlf:xlhtmlNotFound'), $xlhtmlPath), 3);
 					}
 				} else {
-					$this->pObj->log_setTSlogMessage($this->sL('LLL:EXT:indexed_search/locallang.xml:xlhtmlDisabled'), 1);
+					$this->pObj->log_setTSlogMessage($this->sL('LLL:EXT:indexed_search/locallang.xlf:xlhtmlDisabled'), 1);
 				}
 				break;
 			case 'sxc':
@@ -184,10 +184,10 @@ class FileContentParser {
 						$this->app['unzip'] = $unzipPath . 'unzip' . $exe;
 						$extOK = TRUE;
 					} else {
-						$this->pObj->log_setTSlogMessage(sprintf($this->sL('LLL:EXT:indexed_search/locallang.xml:unzipNotFound'), $unzipPath), 3);
+						$this->pObj->log_setTSlogMessage(sprintf($this->sL('LLL:EXT:indexed_search/locallang.xlf:unzipNotFound'), $unzipPath), 3);
 					}
 				} else {
-					$this->pObj->log_setTSlogMessage($this->sL('LLL:EXT:indexed_search/locallang.xml:unzipDisabled'), 1);
+					$this->pObj->log_setTSlogMessage($this->sL('LLL:EXT:indexed_search/locallang.xlf:unzipDisabled'), 1);
 				}
 				break;
 			case 'rtf':
@@ -198,10 +198,10 @@ class FileContentParser {
 						$this->app['unrtf'] = $unrtfPath . 'unrtf' . $exe;
 						$extOK = TRUE;
 					} else {
-						$this->pObj->log_setTSlogMessage(sprintf($this->sL('LLL:EXT:indexed_search/locallang.xml:unrtfNotFound'), $unrtfPath), 3);
+						$this->pObj->log_setTSlogMessage(sprintf($this->sL('LLL:EXT:indexed_search/locallang.xlf:unrtfNotFound'), $unrtfPath), 3);
 					}
 				} else {
-					$this->pObj->log_setTSlogMessage($this->sL('LLL:EXT:indexed_search/locallang.xml:unrtfDisabled'), 1);
+					$this->pObj->log_setTSlogMessage($this->sL('LLL:EXT:indexed_search/locallang.xlf:unrtfDisabled'), 1);
 				}
 				break;
 			case 'txt':
@@ -314,13 +314,13 @@ class FileContentParser {
 			case 'pdf':
 				// PDF
 				if ($indexerConfig['pdftools']) {
-					return sprintf($this->sL('LLL:EXT:indexed_search/locallang.xml:extension.PDF'), $extension);
+					return sprintf($this->sL('LLL:EXT:indexed_search/locallang.xlf:extension.PDF'), $extension);
 				}
 				break;
 			case 'doc':
 				// Catdoc
 				if ($indexerConfig['catdoc']) {
-					return sprintf($this->sL('LLL:EXT:indexed_search/locallang.xml:extension.DOC'), $extension);
+					return sprintf($this->sL('LLL:EXT:indexed_search/locallang.xlf:extension.DOC'), $extension);
 				}
 				break;
 			case 'pps':
@@ -329,56 +329,56 @@ class FileContentParser {
 				// MS PowerPoint
 				// ppthtml
 				if ($indexerConfig['ppthtml']) {
-					return sprintf($this->sL('LLL:EXT:indexed_search/locallang.xml:extension.PP'), $extension);
+					return sprintf($this->sL('LLL:EXT:indexed_search/locallang.xlf:extension.PP'), $extension);
 				}
 				break;
 			case 'xls':
 				// MS Excel
 				// Xlhtml
 				if ($indexerConfig['xlhtml']) {
-					return sprintf($this->sL('LLL:EXT:indexed_search/locallang.xml:extension.XLS'), $extension);
+					return sprintf($this->sL('LLL:EXT:indexed_search/locallang.xlf:extension.XLS'), $extension);
 				}
 				break;
 			case 'sxc':
 				// Open Office Calc.
 				if ($indexerConfig['unzip']) {
-					return sprintf($this->sL('LLL:EXT:indexed_search/locallang.xml:extension.SXC'), $extension);
+					return sprintf($this->sL('LLL:EXT:indexed_search/locallang.xlf:extension.SXC'), $extension);
 				}
 				break;
 			case 'sxi':
 				// Open Office Impress
 				if ($indexerConfig['unzip']) {
-					return sprintf($this->sL('LLL:EXT:indexed_search/locallang.xml:extension.SXI'), $extension);
+					return sprintf($this->sL('LLL:EXT:indexed_search/locallang.xlf:extension.SXI'), $extension);
 				}
 				break;
 			case 'sxw':
 				// Open Office Writer
 				if ($indexerConfig['unzip']) {
-					return sprintf($this->sL('LLL:EXT:indexed_search/locallang.xml:extension.SXW'), $extension);
+					return sprintf($this->sL('LLL:EXT:indexed_search/locallang.xlf:extension.SXW'), $extension);
 				}
 				break;
 			case 'ods':
 				// Oasis OpenDocument Spreadsheet
 				if ($indexerConfig['unzip']) {
-					return sprintf($this->sL('LLL:EXT:indexed_search/locallang.xml:extension.ODS'), $extension);
+					return sprintf($this->sL('LLL:EXT:indexed_search/locallang.xlf:extension.ODS'), $extension);
 				}
 				break;
 			case 'odp':
 				// Oasis OpenDocument Presentation
 				if ($indexerConfig['unzip']) {
-					return sprintf($this->sL('LLL:EXT:indexed_search/locallang.xml:extension.ODP'), $extension);
+					return sprintf($this->sL('LLL:EXT:indexed_search/locallang.xlf:extension.ODP'), $extension);
 				}
 				break;
 			case 'odt':
 				// Oasis OpenDocument Text
 				if ($indexerConfig['unzip']) {
-					return sprintf($this->sL('LLL:EXT:indexed_search/locallang.xml:extension.ODT'), $extension);
+					return sprintf($this->sL('LLL:EXT:indexed_search/locallang.xlf:extension.ODT'), $extension);
 				}
 				break;
 			case 'rtf':
 				// Catdoc
 				if ($indexerConfig['unrtf']) {
-					return sprintf($this->sL('LLL:EXT:indexed_search/locallang.xml:extension.RTF'), $extension);
+					return sprintf($this->sL('LLL:EXT:indexed_search/locallang.xlf:extension.RTF'), $extension);
 				}
 				break;
 			case 'jpeg':
@@ -387,25 +387,25 @@ class FileContentParser {
 
 			case 'tif':
 				// PHP EXIF
-				return sprintf($this->sL('LLL:EXT:indexed_search/locallang.xml:extension.Images'), $extension);
+				return sprintf($this->sL('LLL:EXT:indexed_search/locallang.xlf:extension.Images'), $extension);
 				break;
 			case 'html':
 
 			case 'htm':
 				// PHP strip-tags()
-				return sprintf($this->sL('LLL:EXT:indexed_search/locallang.xml:extension.HTML'), $extension);
+				return sprintf($this->sL('LLL:EXT:indexed_search/locallang.xlf:extension.HTML'), $extension);
 				break;
 			case 'txt':
 				// Raw text
-				return sprintf($this->sL('LLL:EXT:indexed_search/locallang.xml:extension.TXT'), $extension);
+				return sprintf($this->sL('LLL:EXT:indexed_search/locallang.xlf:extension.TXT'), $extension);
 				break;
 			case 'csv':
 				// Raw text
-				return sprintf($this->sL('LLL:EXT:indexed_search/locallang.xml:extension.CSV'), $extension);
+				return sprintf($this->sL('LLL:EXT:indexed_search/locallang.xlf:extension.CSV'), $extension);
 				break;
 			case 'xml':
 				// PHP strip-tags()
-				return sprintf($this->sL('LLL:EXT:indexed_search/locallang.xml:extension.XML'), $extension);
+				return sprintf($this->sL('LLL:EXT:indexed_search/locallang.xlf:extension.XML'), $extension);
 				break;
 			default:
 				// Do nothing
@@ -481,7 +481,7 @@ class FileContentParser {
 							$content = \TYPO3\CMS\Core\Utility\GeneralUtility::getUrl($tempFileName);
 							unlink($tempFileName);
 						} else {
-							$this->pObj->log_setTSlogMessage(sprintf($this->sL('LLL:EXT:indexed_search/locallang.xml:pdfToolsFailed'), $absFile), 2);
+							$this->pObj->log_setTSlogMessage(sprintf($this->sL('LLL:EXT:indexed_search/locallang.xlf:pdfToolsFailed'), $absFile), 2);
 						}
 						if (strlen($content)) {
 							$contentArr = $this->pObj->splitRegularContent($this->removeEndJunk($content));
diff --git a/typo3/sysext/indexed_search/Configuration/TCA/index_config.php b/typo3/sysext/indexed_search/Configuration/TCA/index_config.php
index a62ce17bc21f316ff264b078ff1d3f5b7e1dadaf..a5f705f40cd1c9376264172b3b408ee6d3709e13 100644
--- a/typo3/sysext/indexed_search/Configuration/TCA/index_config.php
+++ b/typo3/sysext/indexed_search/Configuration/TCA/index_config.php
@@ -1,7 +1,7 @@
 <?php
 return array(
 	'ctrl' => array(
-		'title' => 'LLL:EXT:indexed_search/locallang_db.php:index_config',
+		'title' => 'LLL:EXT:indexed_search/locallang_db.xlf:index_config',
 		'label' => 'title',
 		'tstamp' => 'tstamp',
 		'crdate' => 'crdate',
@@ -40,7 +40,7 @@ return array(
 			)
 		),
 		'title' => array(
-			'label' => 'LLL:EXT:indexed_search/locallang_db.php:index_config.title',
+			'label' => 'LLL:EXT:indexed_search/locallang_db.xlf:index_config.title',
 			'config' => array(
 				'type' => 'input',
 				'size' => '30',
@@ -48,7 +48,7 @@ return array(
 			)
 		),
 		'description' => array(
-			'label' => 'LLL:EXT:indexed_search/locallang_db.php:index_config.description',
+			'label' => 'LLL:EXT:indexed_search/locallang_db.xlf:index_config.description',
 			'config' => array(
 				'type' => 'text',
 				'cols' => '30',
@@ -56,41 +56,41 @@ return array(
 			)
 		),
 		'type' => array(
-			'label' => 'LLL:EXT:indexed_search/locallang_db.php:index_config.type',
+			'label' => 'LLL:EXT:indexed_search/locallang_db.xlf:index_config.type',
 			'config' => array(
 				'type' => 'select',
 				'items' => array(
-					array('LLL:EXT:indexed_search/locallang_db.php:index_config.type.I.0', '0'),
-					array('LLL:EXT:indexed_search/locallang_db.php:index_config.type.I.1', '1'),
-					array('LLL:EXT:indexed_search/locallang_db.php:index_config.type.I.2', '2'),
-					array('LLL:EXT:indexed_search/locallang_db.php:index_config.type.I.3', '3'),
-					array('LLL:EXT:indexed_search/locallang_db.php:index_config.type.I.4', '4'),
-					array('LLL:EXT:indexed_search/locallang_db.php:index_config.type.I.5', '5')
+					array('LLL:EXT:indexed_search/locallang_db.xlf:index_config.type.I.0', '0'),
+					array('LLL:EXT:indexed_search/locallang_db.xlf:index_config.type.I.1', '1'),
+					array('LLL:EXT:indexed_search/locallang_db.xlf:index_config.type.I.2', '2'),
+					array('LLL:EXT:indexed_search/locallang_db.xlf:index_config.type.I.3', '3'),
+					array('LLL:EXT:indexed_search/locallang_db.xlf:index_config.type.I.4', '4'),
+					array('LLL:EXT:indexed_search/locallang_db.xlf:index_config.type.I.5', '5')
 				),
 				'size' => 1,
 				'maxitems' => 1
 			)
 		),
 		'depth' => array(
-			'label' => 'LLL:EXT:indexed_search/locallang_db.php:index_config.depth',
+			'label' => 'LLL:EXT:indexed_search/locallang_db.xlf:index_config.depth',
 			'config' => array(
 				'type' => 'select',
 				'items' => array(
-					array('LLL:EXT:indexed_search/locallang_db.php:index_config.depth.I.0', '0'),
-					array('LLL:EXT:indexed_search/locallang_db.php:index_config.depth.I.1', '1'),
-					array('LLL:EXT:indexed_search/locallang_db.php:index_config.depth.I.2', '2'),
-					array('LLL:EXT:indexed_search/locallang_db.php:index_config.depth.I.3', '3')
+					array('LLL:EXT:indexed_search/locallang_db.xlf:index_config.depth.I.0', '0'),
+					array('LLL:EXT:indexed_search/locallang_db.xlf:index_config.depth.I.1', '1'),
+					array('LLL:EXT:indexed_search/locallang_db.xlf:index_config.depth.I.2', '2'),
+					array('LLL:EXT:indexed_search/locallang_db.xlf:index_config.depth.I.3', '3')
 				),
 				'size' => 1,
 				'maxitems' => 1
 			)
 		),
 		'table2index' => array(
-			'label' => 'LLL:EXT:indexed_search/locallang_db.php:index_config.table2index',
+			'label' => 'LLL:EXT:indexed_search/locallang_db.xlf:index_config.table2index',
 			'config' => array(
 				'type' => 'select',
 				'items' => array(
-					array('LLL:EXT:indexed_search/locallang_db.php:index_config.table2index.I.0', '0')
+					array('LLL:EXT:indexed_search/locallang_db.xlf:index_config.table2index.I.0', '0')
 				),
 				'special' => 'tables',
 				'size' => 1,
@@ -98,7 +98,7 @@ return array(
 			)
 		),
 		'alternative_source_pid' => array(
-			'label' => 'LLL:EXT:indexed_search/locallang_db.php:index_config.alternative_source_pid',
+			'label' => 'LLL:EXT:indexed_search/locallang_db.xlf:index_config.alternative_source_pid',
 			'config' => array(
 				'type' => 'group',
 				'internal_type' => 'db',
@@ -114,7 +114,7 @@ return array(
 			)
 		),
 		'indexcfgs' => array(
-			'label' => 'LLL:EXT:indexed_search/locallang_db.php:index_config.indexcfgs',
+			'label' => 'LLL:EXT:indexed_search/locallang_db.xlf:index_config.indexcfgs',
 			'config' => array(
 				'type' => 'group',
 				'internal_type' => 'db',
@@ -130,48 +130,48 @@ return array(
 			)
 		),
 		'get_params' => array(
-			'label' => 'LLL:EXT:indexed_search/locallang_db.php:index_config.get_params',
+			'label' => 'LLL:EXT:indexed_search/locallang_db.xlf:index_config.get_params',
 			'config' => array(
 				'type' => 'input',
 				'size' => '30'
 			)
 		),
 		'fieldlist' => array(
-			'label' => 'LLL:EXT:indexed_search/locallang_db.php:index_config.fields',
+			'label' => 'LLL:EXT:indexed_search/locallang_db.xlf:index_config.fields',
 			'config' => array(
 				'type' => 'input',
 				'size' => '30'
 			)
 		),
 		'externalUrl' => array(
-			'label' => 'LLL:EXT:indexed_search/locallang_db.php:index_config.externalUrl',
+			'label' => 'LLL:EXT:indexed_search/locallang_db.xlf:index_config.externalUrl',
 			'config' => array(
 				'type' => 'input',
 				'size' => '30'
 			)
 		),
 		'chashcalc' => array(
-			'label' => 'LLL:EXT:indexed_search/locallang_db.php:index_config.chashcalc',
+			'label' => 'LLL:EXT:indexed_search/locallang_db.xlf:index_config.chashcalc',
 			'config' => array(
 				'type' => 'check'
 			)
 		),
 		'filepath' => array(
-			'label' => 'LLL:EXT:indexed_search/locallang_db.php:index_config.filepath',
+			'label' => 'LLL:EXT:indexed_search/locallang_db.xlf:index_config.filepath',
 			'config' => array(
 				'type' => 'input',
 				'size' => '30'
 			)
 		),
 		'extensions' => array(
-			'label' => 'LLL:EXT:indexed_search/locallang_db.php:index_config.extensions',
+			'label' => 'LLL:EXT:indexed_search/locallang_db.xlf:index_config.extensions',
 			'config' => array(
 				'type' => 'input',
 				'size' => '30'
 			)
 		),
 		'url_deny' => array(
-			'label' => 'LLL:EXT:indexed_search/locallang_db.php:index_config.url_deny',
+			'label' => 'LLL:EXT:indexed_search/locallang_db.xlf:index_config.url_deny',
 			'config' => array(
 				'type' => 'text',
 				'cols' => '30',
@@ -179,14 +179,14 @@ return array(
 			)
 		),
 		'records_indexonchange' => array(
-			'label' => 'LLL:EXT:indexed_search/locallang_db.php:index_config.records_indexonchange',
+			'label' => 'LLL:EXT:indexed_search/locallang_db.xlf:index_config.records_indexonchange',
 			'config' => array(
 				'type' => 'check',
 				'default' => '0'
 			)
 		),
 		'timer_next_indexing' => array(
-			'label' => 'LLL:EXT:indexed_search/locallang_db.php:index_config.timer_next_indexing',
+			'label' => 'LLL:EXT:indexed_search/locallang_db.xlf:index_config.timer_next_indexing',
 			'config' => array(
 				'type' => 'input',
 				'size' => '12',
@@ -197,7 +197,7 @@ return array(
 			)
 		),
 		'timer_offset' => array(
-			'label' => 'LLL:EXT:indexed_search/locallang_db.php:index_config.timer_offset',
+			'label' => 'LLL:EXT:indexed_search/locallang_db.xlf:index_config.timer_offset',
 			'config' => array(
 				'type' => 'input',
 				'size' => '8',
@@ -207,13 +207,13 @@ return array(
 			)
 		),
 		'timer_frequency' => array(
-			'label' => 'LLL:EXT:indexed_search/locallang_db.php:index_config.timer_frequency',
+			'label' => 'LLL:EXT:indexed_search/locallang_db.xlf:index_config.timer_frequency',
 			'config' => array(
 				'type' => 'select',
 				'items' => array(
-					array('LLL:EXT:indexed_search/locallang_db.php:index_config.timer_frequency.I.0', '3600'),
-					array('LLL:EXT:indexed_search/locallang_db.php:index_config.timer_frequency.I.1', '86400'),
-					array('LLL:EXT:indexed_search/locallang_db.php:index_config.timer_frequency.I.2', '604800')
+					array('LLL:EXT:indexed_search/locallang_db.xlf:index_config.timer_frequency.I.0', '3600'),
+					array('LLL:EXT:indexed_search/locallang_db.xlf:index_config.timer_frequency.I.1', '86400'),
+					array('LLL:EXT:indexed_search/locallang_db.xlf:index_config.timer_frequency.I.2', '604800')
 				),
 				'size' => 1,
 				'maxitems' => 1,
@@ -221,7 +221,7 @@ return array(
 			)
 		),
 		'recordsbatch' => array(
-			'label' => 'LLL:EXT:indexed_search/locallang_db.php:index_config.recordsbatch',
+			'label' => 'LLL:EXT:indexed_search/locallang_db.xlf:index_config.recordsbatch',
 			'config' => array(
 				'type' => 'input',
 				'size' => '8',
@@ -232,7 +232,7 @@ return array(
 			)
 		),
 		'set_id' => array(
-			'label' => 'LLL:EXT:indexed_search/locallang_db.php:index_config.set_id',
+			'label' => 'LLL:EXT:indexed_search/locallang_db.xlf:index_config.set_id',
 			'config' => array(
 				'type' => 'none'
 			)
@@ -243,7 +243,7 @@ return array(
 		'1' => array('showitem' => 'title;;1;;2-2-2, description, timer_next_indexing, timer_offset, timer_frequency, set_id, type;;;;3-3-3, table2index;;;;3-3-3, alternative_source_pid, fieldlist, get_params, chashcalc,recordsbatch,records_indexonchange'),
 		'2' => array('showitem' => 'title;;1;;2-2-2, description, timer_next_indexing, timer_offset, timer_frequency, set_id, type;;;;3-3-3, filepath;;;;3-3-3, extensions, depth'),
 		'3' => array('showitem' => 'title;;1;;2-2-2, description, timer_next_indexing, timer_offset, timer_frequency, set_id, type;;;;3-3-3, externalUrl;;;;3-3-3, depth, url_deny'),
-		'4' => array('showitem' => 'title;;1;;2-2-2, description, timer_next_indexing, timer_offset, timer_frequency, set_id, type;;;;3-3-3, alternative_source_pid;LLL:EXT:indexed_search/locallang_db.php:index_config.rootpage;;;3-3-3, depth'),
+		'4' => array('showitem' => 'title;;1;;2-2-2, description, timer_next_indexing, timer_offset, timer_frequency, set_id, type;;;;3-3-3, alternative_source_pid;LLL:EXT:indexed_search/locallang_db.xlf:index_config.rootpage;;;3-3-3, depth'),
 		'5' => array('showitem' => 'title;;;;2-2-2, description, type;;;;3-3-3, indexcfgs;;;;3-3-3')
 	),
 	'palettes' => array(
diff --git a/typo3/sysext/indexed_search/ext_tables.php b/typo3/sysext/indexed_search/ext_tables.php
index 68d6932fb6e778d10f499428efc3426da477f00e..d80b74a157520b2a145930e8890dc59f09b62ae4 100755
--- a/typo3/sysext/indexed_search/ext_tables.php
+++ b/typo3/sysext/indexed_search/ext_tables.php
@@ -2,7 +2,7 @@
 if (!defined('TYPO3_MODE')) {
 	die('Access denied.');
 }
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPlugin(array('LLL:EXT:indexed_search/locallang.php:mod_indexed_search', $_EXTKEY));
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPlugin(array('LLL:EXT:indexed_search/locallang.xlf:mod_indexed_search', $_EXTKEY));
 $TCA['tt_content']['types']['list']['subtypes_excludelist'][$_EXTKEY] = 'layout,select_key,pages';
 // Registers the Extbase plugin to be listed in the Backend.
 if (\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('extbase')) {
@@ -13,9 +13,9 @@ if (\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('extbase')) {
 }
 if (TYPO3_MODE == 'BE') {
 	\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addModule('tools', 'isearch', 'after:log', \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'mod/');
-	\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::insertModuleFunction('web_info', 'TYPO3\\CMS\\IndexedSearch\\Controller\\IndexedPagesController', \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'modfunc1/class.tx_indexedsearch_modfunc1.php', 'LLL:EXT:indexed_search/locallang.php:mod_indexed_search');
-	\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::insertModuleFunction('web_info', 'TYPO3\\CMS\\IndexedSearch\\Controller\\IndexingStatisticsController', \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'modfunc2/class.tx_indexedsearch_modfunc2.php', 'LLL:EXT:indexed_search/locallang.php:mod2_indexed_search');
+	\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::insertModuleFunction('web_info', 'TYPO3\\CMS\\IndexedSearch\\Controller\\IndexedPagesController', \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'modfunc1/class.tx_indexedsearch_modfunc1.php', 'LLL:EXT:indexed_search/locallang.xlf:mod_indexed_search');
+	\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::insertModuleFunction('web_info', 'TYPO3\\CMS\\IndexedSearch\\Controller\\IndexingStatisticsController', \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'modfunc2/class.tx_indexedsearch_modfunc2.php', 'LLL:EXT:indexed_search/locallang.xlf:mod2_indexed_search');
 }
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::allowTableOnStandardPages('index_config');
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('index_config', 'EXT:indexed_search/locallang_csh_indexcfg.xml');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('index_config', 'EXT:indexed_search/locallang_csh_indexcfg.xlf');
 ?>
\ No newline at end of file
diff --git a/typo3/sysext/indexed_search/mod/conf.php b/typo3/sysext/indexed_search/mod/conf.php
index f8786cb52c930c63f7a0073dc2738895c4e2a10f..97b0b43f0a7e6cfaf633521a529ca438aa9899c7 100755
--- a/typo3/sysext/indexed_search/mod/conf.php
+++ b/typo3/sysext/indexed_search/mod/conf.php
@@ -1,6 +1,6 @@
 <?php
 $MLANG['default']['tabs_images']['tab'] = 'isearch.gif';
-$MLANG['default']['ll_ref'] = 'LLL:EXT:indexed_search/mod/locallang_mod.xml';
+$MLANG['default']['ll_ref'] = 'LLL:EXT:indexed_search/mod/locallang_mod.xlf';
 $MCONF['script'] = '_DISPATCH';
 $MCONF['access'] = 'admin';
 $MCONF['name'] = 'tools_isearch';
diff --git a/typo3/sysext/info_pagetsconfig/ext_tables.php b/typo3/sysext/info_pagetsconfig/ext_tables.php
index d7977f7d1476ab82406ca859c4a4ad5d19f2fbaa..28c52273768b5dae8a4b049f58860a7b29f76d5a 100755
--- a/typo3/sysext/info_pagetsconfig/ext_tables.php
+++ b/typo3/sysext/info_pagetsconfig/ext_tables.php
@@ -3,7 +3,7 @@ if (!defined('TYPO3_MODE')) {
 	die('Access denied.');
 }
 if (TYPO3_MODE == 'BE') {
-	\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::insertModuleFunction('web_info', 'tx_infopagetsconfig_webinfo', \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'class.tx_infopagetsconfig_webinfo.php', 'LLL:EXT:info_pagetsconfig/locallang.php:mod_pagetsconfig');
+	\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::insertModuleFunction('web_info', 'tx_infopagetsconfig_webinfo', \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'class.tx_infopagetsconfig_webinfo.php', 'LLL:EXT:info_pagetsconfig/locallang.xlf:mod_pagetsconfig');
 }
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('_MOD_web_info', 'EXT:info_pagetsconfig/locallang_csh_webinfo.xml');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('_MOD_web_info', 'EXT:info_pagetsconfig/locallang_csh_webinfo.xlf');
 ?>
\ No newline at end of file
diff --git a/typo3/sysext/lang/Classes/Domain/Repository/LanguageRepository.php b/typo3/sysext/lang/Classes/Domain/Repository/LanguageRepository.php
index 9ef6c1adb1d3bf3465dc4266a2a6977351a1aada..ea22e64a84707ccbcb903cd99aec39d16a74e5f3 100644
--- a/typo3/sysext/lang/Classes/Domain/Repository/LanguageRepository.php
+++ b/typo3/sysext/lang/Classes/Domain/Repository/LanguageRepository.php
@@ -101,7 +101,7 @@ class LanguageRepository {
 			array_shift($languages);
 
 			foreach ($languages as $locale => $language) {
-				$label = htmlspecialchars($GLOBALS['LANG']->sL('LLL:EXT:setup/mod/locallang.xml:lang_' . $locale));
+				$label = htmlspecialchars($GLOBALS['LANG']->sL('LLL:EXT:setup/mod/locallang.xlf:lang_' . $locale));
 				if ($label === '') {
 					$label = htmlspecialchars($language);
 				}
diff --git a/typo3/sysext/lang/ext_tables.php b/typo3/sysext/lang/ext_tables.php
index 29442e6546b2f82aabd917eb38dab5042333ecae..e8a664962434a7dc083e4d02e797b07f40cd08f6 100644
--- a/typo3/sysext/lang/ext_tables.php
+++ b/typo3/sysext/lang/ext_tables.php
@@ -17,7 +17,7 @@ if (TYPO3_MODE == 'BE' && !(TYPO3_REQUESTTYPE & TYPO3_REQUESTTYPE_INSTALL)) {
 		array(
 			'access' => 'admin',
 			'icon' => 'EXT:' . $_EXTKEY . '/ext_icon.gif',
-			'labels' => 'LLL:EXT:' . $_EXTKEY . '/Resources/Private/Language/locallang_mod_language.xml',
+			'labels' => 'LLL:EXT:' . $_EXTKEY . '/Resources/Private/Language/locallang_mod_language.xlf',
 		)
 	);
 }
diff --git a/typo3/sysext/linkvalidator/Classes/LinkAnalyzer.php b/typo3/sysext/linkvalidator/Classes/LinkAnalyzer.php
index ce3694d38c117e59455fb790591ec7cfae1efe2e..8ee6e95cae76bc8e7d18500ff863e8998d1afcbc 100644
--- a/typo3/sysext/linkvalidator/Classes/LinkAnalyzer.php
+++ b/typo3/sysext/linkvalidator/Classes/LinkAnalyzer.php
@@ -99,7 +99,7 @@ class LinkAnalyzer {
 	 * Fill hookObjectsArr with different link types and possible XClasses.
 	 */
 	public function __construct() {
-		$GLOBALS['LANG']->includeLLFile('EXT:linkvalidator/Resources/Private/Language/Module/locallang.xml');
+		$GLOBALS['LANG']->includeLLFile('EXT:linkvalidator/Resources/Private/Language/Module/locallang.xlf');
 		// Hook to handle own checks
 		if (is_array($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['linkvalidator']['checkLinks'])) {
 			foreach ($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['linkvalidator']['checkLinks'] as $key => $classRef) {
diff --git a/typo3/sysext/lowlevel/Classes/View/ConfigurationView.php b/typo3/sysext/lowlevel/Classes/View/ConfigurationView.php
index fbf0bb8706e6541a022a42090cdbe07b174354a8..861d9841a89b027120d03b6b8cf36f932a38f4ca 100644
--- a/typo3/sysext/lowlevel/Classes/View/ConfigurationView.php
+++ b/typo3/sysext/lowlevel/Classes/View/ConfigurationView.php
@@ -73,7 +73,7 @@ class ConfigurationView {
 	 * Constructor
 	 */
 	public function __construct() {
-		$GLOBALS['LANG']->includeLLFile('EXT:lowlevel/config/locallang.xml');
+		$GLOBALS['LANG']->includeLLFile('EXT:lowlevel/config/locallang.xlf');
 		$GLOBALS['BE_USER']->modAccess($GLOBALS['MCONF'], 1);
 	}
 
diff --git a/typo3/sysext/lowlevel/Classes/View/DatabaseIntegrityView.php b/typo3/sysext/lowlevel/Classes/View/DatabaseIntegrityView.php
index 538b9ccdab1d1160232d3ed956d118ba52b5700d..f2609cc5fb8e9e9fd242e07f193a5a69a9a64a4c 100644
--- a/typo3/sysext/lowlevel/Classes/View/DatabaseIntegrityView.php
+++ b/typo3/sysext/lowlevel/Classes/View/DatabaseIntegrityView.php
@@ -76,7 +76,7 @@ class DatabaseIntegrityView {
 	 * Constructor
 	 */
 	public function __construct() {
-		$GLOBALS['LANG']->includeLLFile('EXT:lowlevel/dbint/locallang.xml');
+		$GLOBALS['LANG']->includeLLFile('EXT:lowlevel/dbint/locallang.xlf');
 		$GLOBALS['BE_USER']->modAccess($GLOBALS['MCONF'], 1);
 	}
 
diff --git a/typo3/sysext/lowlevel/config/conf.php b/typo3/sysext/lowlevel/config/conf.php
index fb63b82122f11dd321f4daf8843bcd6ba7b7208d..5560dd988ae0fec2c82ba28090852e8667c940c8 100755
--- a/typo3/sysext/lowlevel/config/conf.php
+++ b/typo3/sysext/lowlevel/config/conf.php
@@ -1,6 +1,6 @@
 <?php
 $MLANG['default']['tabs_images']['tab'] = 'config.gif';
-$MLANG['default']['ll_ref'] = 'LLL:EXT:lowlevel/config/locallang_mod.xml';
+$MLANG['default']['ll_ref'] = 'LLL:EXT:lowlevel/config/locallang_mod.xlf';
 $MCONF['script'] = '_DISPATCH';
 $MCONF['access'] = 'admin';
 $MCONF['name'] = 'system_config';
diff --git a/typo3/sysext/lowlevel/dbint/conf.php b/typo3/sysext/lowlevel/dbint/conf.php
index 4befbef1d70c239f961b286911d4be34c8508099..6b5e719274798ae420873d55696fb7b37f2e6c2e 100755
--- a/typo3/sysext/lowlevel/dbint/conf.php
+++ b/typo3/sysext/lowlevel/dbint/conf.php
@@ -1,6 +1,6 @@
 <?php
 $MLANG['default']['tabs_images']['tab'] = 'db.gif';
-$MLANG['default']['ll_ref'] = 'LLL:EXT:lowlevel/dbint/locallang_mod.xml';
+$MLANG['default']['ll_ref'] = 'LLL:EXT:lowlevel/dbint/locallang_mod.xlf';
 $MCONF['script'] = '_DISPATCH';
 $MCONF['access'] = 'admin';
 $MCONF['name'] = 'system_dbint';
diff --git a/typo3/sysext/opendocs/Classes/Controller/OpendocsController.php b/typo3/sysext/opendocs/Classes/Controller/OpendocsController.php
index b02425190235d5e99bf07a590c54af727660388f..3234a3e0e64df65c86e7b0f32d9ca431d2e6d8e5 100644
--- a/typo3/sysext/opendocs/Classes/Controller/OpendocsController.php
+++ b/typo3/sysext/opendocs/Classes/Controller/OpendocsController.php
@@ -54,7 +54,7 @@ class OpendocsController implements \TYPO3\CMS\Backend\Toolbar\ToolbarItemHookIn
 	 * @param \TYPO3\CMS\Backend\Controller\BackendController TYPO3 backend object reference
 	 */
 	public function __construct(\TYPO3\CMS\Backend\Controller\BackendController &$backendReference = NULL) {
-		$GLOBALS['LANG']->includeLLFile('EXT:opendocs/locallang_opendocs.xml');
+		$GLOBALS['LANG']->includeLLFile('EXT:opendocs/locallang_opendocs.xlf');
 		$this->backendReference = $backendReference;
 		$this->loadDocsFromUserSession();
 	}
diff --git a/typo3/sysext/openid/ext_tables.php b/typo3/sysext/openid/ext_tables.php
index e4bd6bbb99e42cc332cb5e66f899446ea740b285..6312010e5a9003d54b933a321127367a24b9a80a 100644
--- a/typo3/sysext/openid/ext_tables.php
+++ b/typo3/sysext/openid/ext_tables.php
@@ -7,7 +7,7 @@ if (!defined('TYPO3_MODE')) {
 $tempColumns = array(
 	'tx_openid_openid' => array(
 		'exclude' => 0,
-		'label' => 'LLL:EXT:openid/locallang_db.xml:be_users.tx_openid_openid',
+		'label' => 'LLL:EXT:openid/locallang_db.xlf:be_users.tx_openid_openid',
 		'config' => array(
 			'type' => 'input',
 			'size' => '30',
@@ -19,22 +19,22 @@ $tempColumns = array(
 // Add new columns to be_users table
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTCAcolumns('be_users', $tempColumns, FALSE);
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addToAllTCAtypes('be_users', 'tx_openid_openid;;;;1-1-1', '', 'after:username');
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('be_users', 'EXT:' . $_EXTKEY . '/locallang_csh.xml');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('be_users', 'EXT:' . $_EXTKEY . '/locallang_csh.xlf');
 // Prepare new columns for fe_users table
 $tempColumns['tx_openid_openid']['config']['eval'] = 'trim,nospace,uniqueInPid';
 // Add new columns to fe_users table
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTCAcolumns('fe_users', $tempColumns, FALSE);
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addFieldsToAllPalettesOfField('fe_users', 'username', 'tx_openid_openid');
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('fe_users', 'EXT:' . $_EXTKEY . '/locallang_csh.xml');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('fe_users', 'EXT:' . $_EXTKEY . '/locallang_csh.xlf');
 // Add field to setup module
 $GLOBALS['TYPO3_USER_SETTINGS']['columns']['tx_openid_openid'] = array(
 	'type' => 'user',
 	'table' => 'be_users',
-	'label' => 'LLL:EXT:openid/locallang_db.xml:_MOD_user_setup.tx_openid_openid',
+	'label' => 'LLL:EXT:openid/locallang_db.xlf:_MOD_user_setup.tx_openid_openid',
 	'csh' => 'tx_openid_openid',
 	'userFunc' => 'TYPO3\\CMS\\Openid\\OpenidModuleSetup->renderOpenID',
 	'access' => 'TYPO3\\CMS\\Openid\\OpenidModuleSetup'
 );
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addFieldsToUserSettings('tx_openid_openid', 'after:password2');
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('_MOD_user_setup', 'EXT:openid/locallang_csh_mod.xml');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('_MOD_user_setup', 'EXT:openid/locallang_csh_mod.xlf');
 ?>
\ No newline at end of file
diff --git a/typo3/sysext/recycler/Classes/Domain/Model/Tables.php b/typo3/sysext/recycler/Classes/Domain/Model/Tables.php
index 54f18f94330cc8606d102713408dec070704c682..2c55911a536a633fc467c7d47f713013eabfa433 100644
--- a/typo3/sysext/recycler/Classes/Domain/Model/Tables.php
+++ b/typo3/sysext/recycler/Classes/Domain/Model/Tables.php
@@ -71,7 +71,7 @@ class Tables {
 				'',
 				$deletedRecordsTotal,
 				'',
-				$GLOBALS['LANG']->sL('LLL:EXT:recycler/mod1/locallang.xml:label_alltables')
+				$GLOBALS['LANG']->sL('LLL:EXT:recycler/mod1/locallang.xlf:label_alltables')
 			));
 		}
 		$output = json_encode($jsonArray);
diff --git a/typo3/sysext/recycler/mod1/conf.php b/typo3/sysext/recycler/mod1/conf.php
index 6ea63dd3294e4a70b1dfe318b016fd03bb408f56..fe8cff93c6e57a4f8d4a4187eaa444406d534814 100644
--- a/typo3/sysext/recycler/mod1/conf.php
+++ b/typo3/sysext/recycler/mod1/conf.php
@@ -4,5 +4,5 @@ $MCONF['name'] = 'web_txrecyclerM1';
 $MCONF['script'] = '_DISPATCH';
 $MCONF['access'] = 'user,group';
 $MLANG['default']['tabs_images']['tab'] = 'moduleicon.gif';
-$MLANG['default']['ll_ref'] = 'LLL:EXT:recycler/mod1/locallang_mod.xml';
+$MLANG['default']['ll_ref'] = 'LLL:EXT:recycler/mod1/locallang_mod.xlf';
 ?>
\ No newline at end of file
diff --git a/typo3/sysext/recycler/mod1/index.php b/typo3/sysext/recycler/mod1/index.php
index 20a13b6e09ed75cdd1f7137b9cce1e0dbe7fd507..52ffb856e886aa3b4bab9ad7dcfb77d2cf519745 100644
--- a/typo3/sysext/recycler/mod1/index.php
+++ b/typo3/sysext/recycler/mod1/index.php
@@ -21,7 +21,7 @@
  *
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
-$LANG->includeLLFile('EXT:recycler/mod1/locallang.xml');
+$LANG->includeLLFile('EXT:recycler/mod1/locallang.xlf');
 $BE_USER->modAccess($MCONF, 1);
 /*
  * @deprecated since 6.0, the classname tx_recycler_module1 and this file is obsolete
diff --git a/typo3/sysext/reports/Classes/Report/Status/Status.php b/typo3/sysext/reports/Classes/Report/Status/Status.php
index d13debf0f7e39a40b7cab05be956ee826242e7ee..656317f808f6e504d4399898ce089443a06dfc44 100644
--- a/typo3/sysext/reports/Classes/Report/Status/Status.php
+++ b/typo3/sysext/reports/Classes/Report/Status/Status.php
@@ -40,7 +40,7 @@ class Status implements \TYPO3\CMS\Reports\ReportInterface {
 	 */
 	public function __construct() {
 		$this->getStatusProviders();
-		$GLOBALS['LANG']->includeLLFile('EXT:reports/reports/locallang.xml');
+		$GLOBALS['LANG']->includeLLFile('EXT:reports/reports/locallang.xlf');
 	}
 
 	/**
diff --git a/typo3/sysext/reports/Classes/Report/Status/WarningMessagePostProcessor.php b/typo3/sysext/reports/Classes/Report/Status/WarningMessagePostProcessor.php
index f582bbba0e4a193d1e8904c5767d30b5ca2b5496..9b18fa160cb580722c47a39ec9ddff009a117bfb 100644
--- a/typo3/sysext/reports/Classes/Report/Status/WarningMessagePostProcessor.php
+++ b/typo3/sysext/reports/Classes/Report/Status/WarningMessagePostProcessor.php
@@ -48,7 +48,7 @@ class WarningMessagePostProcessor {
 			if ($highestSeverity > \TYPO3\CMS\Reports\Status::OK) {
 				// Display a message that there's something wrong and that
 				// the admin should take a look at the detailed status report
-				$GLOBALS['LANG']->includeLLFile('EXT:reports/reports/locallang.xml');
+				$GLOBALS['LANG']->includeLLFile('EXT:reports/reports/locallang.xlf');
 				$reportModuleIdentifier = 'system_ReportsTxreportsm1';
 				$reportModuleParameters = array(
 					'tx_reports_system_reportstxreportsm1[extension]=tx_reports',
diff --git a/typo3/sysext/reports/Classes/Task/SystemStatusUpdateTaskNotificationEmailField.php b/typo3/sysext/reports/Classes/Task/SystemStatusUpdateTaskNotificationEmailField.php
index 8d358bbc9299c8515279ae392ba85521221b4582..77f78e61d7556da198d955fc8d92264550ae439e 100644
--- a/typo3/sysext/reports/Classes/Task/SystemStatusUpdateTaskNotificationEmailField.php
+++ b/typo3/sysext/reports/Classes/Task/SystemStatusUpdateTaskNotificationEmailField.php
@@ -66,7 +66,7 @@ class SystemStatusUpdateTaskNotificationEmailField implements \TYPO3\CMS\Schedul
 		$additionalFields = array();
 		$additionalFields[$fieldId] = array(
 			'code' => $fieldHtml,
-			'label' => 'LLL:EXT:reports/reports/locallang.xml:status_updateTaskField_notificationEmails',
+			'label' => 'LLL:EXT:reports/reports/locallang.xlf:status_updateTaskField_notificationEmails',
 			'cshKey' => '',
 			'cshLabel' => $fieldId
 		);
@@ -91,7 +91,7 @@ class SystemStatusUpdateTaskNotificationEmailField implements \TYPO3\CMS\Schedul
 			}
 		}
 		if (empty($submittedData[$this->fieldPrefix . 'NotificationEmail']) || !$validInput) {
-			$schedulerModule->addMessage($GLOBALS['LANG']->sL('LLL:EXT:reports/reports/locallang.xml:status_updateTaskField_notificationEmails_invalid'), \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR);
+			$schedulerModule->addMessage($GLOBALS['LANG']->sL('LLL:EXT:reports/reports/locallang.xlf:status_updateTaskField_notificationEmails_invalid'), \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR);
 			$validInput = FALSE;
 		}
 		return $validInput;
diff --git a/typo3/sysext/reports/ext_localconf.php b/typo3/sysext/reports/ext_localconf.php
index 073f58cf29828902b67b26b24849e4fd514c9cf4..4ff17e8575948d4026c94a4e6308f23b2fa19a67 100644
--- a/typo3/sysext/reports/ext_localconf.php
+++ b/typo3/sysext/reports/ext_localconf.php
@@ -5,8 +5,8 @@ if (!defined('TYPO3_MODE')) {
 
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks']['TYPO3\\CMS\\Reports\\Task\\SystemStatusUpdateTask'] = array(
 	'extension' => $_EXTKEY,
-	'title' => 'LLL:EXT:' . $_EXTKEY . '/reports/locallang.xml:status_updateTaskTitle',
-	'description' => 'LLL:EXT:' . $_EXTKEY . '/reports/locallang.xml:status_updateTaskDescription',
+	'title' => 'LLL:EXT:' . $_EXTKEY . '/reports/locallang.xlf:status_updateTaskTitle',
+	'description' => 'LLL:EXT:' . $_EXTKEY . '/reports/locallang.xlf:status_updateTaskDescription',
 	'additionalFields' => 'TYPO3\\CMS\\Reports\\Task\\SystemStatusUpdateTaskNotificationEmailField'
 );
 
diff --git a/typo3/sysext/reports/ext_tables.php b/typo3/sysext/reports/ext_tables.php
index 487c59a32d59fd8e29f32874464cc0aa09c72540..668c8e284028db5912ae61a0bea9405857480c30 100644
--- a/typo3/sysext/reports/ext_tables.php
+++ b/typo3/sysext/reports/ext_tables.php
@@ -17,8 +17,8 @@ if (TYPO3_MODE === 'BE') {
 		)
 	);
 	$statusReport = array(
-		'title' => 'LLL:EXT:reports/reports/locallang.xml:status_report_title',
-		'description' => 'LLL:EXT:reports/reports/locallang.xml:status_report_description',
+		'title' => 'LLL:EXT:reports/reports/locallang.xlf:status_report_title',
+		'description' => 'LLL:EXT:reports/reports/locallang.xlf:status_report_description',
 		'report' => 'TYPO3\\CMS\\Reports\\Report\\Status\\Status'
 	);
 	if (!is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['reports']['tx_reports']['status'])) {
diff --git a/typo3/sysext/rsaauth/Classes/BackendWarnings.php b/typo3/sysext/rsaauth/Classes/BackendWarnings.php
index 50f635386ae6ef725a7af9621acdd2284e8f1f74..32657e50be62ffe6fef089a254a5ebad5d6b4218 100644
--- a/typo3/sysext/rsaauth/Classes/BackendWarnings.php
+++ b/typo3/sysext/rsaauth/Classes/BackendWarnings.php
@@ -36,31 +36,31 @@ class BackendWarnings {
 	 *
 	 * @param array $warnings Warnings
 	 * @return void
-	 * @see 	\TYPO3\CMS\Backend\Utility\BackendUtility::displayWarningMessages()
+	 * @see \TYPO3\CMS\Backend\Utility\BackendUtility::displayWarningMessages()
 	 */
 	public function displayWarningMessages_postProcess(array &$warnings) {
 		$backend = \TYPO3\CMS\Rsaauth\Backend\BackendFactory::getBackend();
 		if ($backend instanceof \TYPO3\CMS\Rsaauth\Backend\CommandLineBackend) {
 			// Not using the PHP extension!
-			$warnings['rsaauth_cmdline'] = $GLOBALS['LANG']->sL('LLL:EXT:rsaauth/hooks/locallang.xml:hook_using_cmdline');
+			$warnings['rsaauth_cmdline'] = $GLOBALS['LANG']->sL('LLL:EXT:rsaauth/hooks/locallang.xlf:hook_using_cmdline');
 			// Check the path
 			$extconf = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['rsaauth']);
 			$path = trim($extconf['temporaryDirectory']);
 			if ($path == '') {
 				// Path is empty
-				$warnings['rsaauth'] = $GLOBALS['LANG']->sL('LLL:EXT:rsaauth/hooks/locallang.xml:hook_empty_directory');
+				$warnings['rsaauth'] = $GLOBALS['LANG']->sL('LLL:EXT:rsaauth/hooks/locallang.xlf:hook_empty_directory');
 			} elseif (!\TYPO3\CMS\Core\Utility\GeneralUtility::isAbsPath($path)) {
 				// Path is not absolute
-				$warnings['rsaauth'] = $GLOBALS['LANG']->sL('LLL:EXT:rsaauth/hooks/locallang.xml:hook_directory_not_absolute');
+				$warnings['rsaauth'] = $GLOBALS['LANG']->sL('LLL:EXT:rsaauth/hooks/locallang.xlf:hook_directory_not_absolute');
 			} elseif (!@is_dir($path)) {
 				// Path does not represent a directory
-				$warnings['rsaauth'] = $GLOBALS['LANG']->sL('LLL:EXT:rsaauth/hooks/locallang.xml:hook_directory_not_exist');
+				$warnings['rsaauth'] = $GLOBALS['LANG']->sL('LLL:EXT:rsaauth/hooks/locallang.xlf:hook_directory_not_exist');
 			} elseif (!@is_writable($path)) {
 				// Directory is not writable
-				$warnings['rsaauth'] = $GLOBALS['LANG']->sL('LLL:EXT:rsaauth/hooks/locallang.xml:hook_directory_not_writable');
+				$warnings['rsaauth'] = $GLOBALS['LANG']->sL('LLL:EXT:rsaauth/hooks/locallang.xlf:hook_directory_not_writable');
 			} elseif (substr($path, 0, strlen(PATH_site)) == PATH_site) {
 				// Directory is inside the site root
-				$warnings['rsaauth'] = $GLOBALS['LANG']->sL('LLL:EXT:rsaauth/hooks/locallang.xml:hook_directory_inside_siteroot');
+				$warnings['rsaauth'] = $GLOBALS['LANG']->sL('LLL:EXT:rsaauth/hooks/locallang.xlf:hook_directory_inside_siteroot');
 			}
 		}
 	}
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/BlockElements.php b/typo3/sysext/rtehtmlarea/Classes/Extension/BlockElements.php
index a3217dd66571cf489fee4498f16a3d4c76bffcc6..9e253f49372e49ade1e03b19cbd28b7c3d4b752c 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/BlockElements.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/BlockElements.php
@@ -36,7 +36,7 @@ class BlockElements extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
 	protected $pluginName = 'BlockElements';
 
 	// The name of the plugin registered by the extension
-	protected $relativePathToLocallangFile = 'extensions/BlockElements/locallang.xml';
+	protected $relativePathToLocallangFile = 'extensions/BlockElements/locallang.xlf';
 
 	// Path to this main locallang file of the extension relative to the extension dir.
 	protected $relativePathToSkin = 'extensions/BlockElements/skin/htmlarea.css';
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/BlockStyle.php b/typo3/sysext/rtehtmlarea/Classes/Extension/BlockStyle.php
index d182ef52e66d68f3bb6ca89f499093d137e8b909..6b5ff958add544c07c4a6b7c17dd3ff449beee07 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/BlockStyle.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/BlockStyle.php
@@ -36,7 +36,7 @@ class BlockStyle extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
 	protected $pluginName = 'BlockStyle';
 
 	// The name of the plugin registered by the extension
-	protected $relativePathToLocallangFile = 'extensions/BlockStyle/locallang.xml';
+	protected $relativePathToLocallangFile = 'extensions/BlockStyle/locallang.xlf';
 
 	// Path to this main locallang file of the extension relative to the extension dir.
 	protected $relativePathToSkin = '';
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/DefaultInline.php b/typo3/sysext/rtehtmlarea/Classes/Extension/DefaultInline.php
index 7b61b2cbf97c2c454c14fc4c34c698726ac171e5..a5acd3b1f4dce218afad0ef4dd3ba3aec6d2750b 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/DefaultInline.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/DefaultInline.php
@@ -36,7 +36,7 @@ class DefaultInline extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
 	protected $pluginName = 'DefaultInline';
 
 	// The name of the plugin registered by the extension
-	protected $relativePathToLocallangFile = 'extensions/DefaultInline/locallang.xml';
+	protected $relativePathToLocallangFile = 'extensions/DefaultInline/locallang.xlf';
 
 	// Path to this main locallang file of the extension relative to the extension dir.
 	protected $relativePathToSkin = 'extensions/DefaultInline/skin/htmlarea.css';
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/InlineElements.php b/typo3/sysext/rtehtmlarea/Classes/Extension/InlineElements.php
index 34fa9226e0a14c3b47603c634b4840824b1b5075..482faac60b6f23ac745fa49a32ddf2f466570c82 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/InlineElements.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/InlineElements.php
@@ -36,7 +36,7 @@ class InlineElements extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
 	protected $pluginName = 'InlineElements';
 
 	// The name of the plugin registered by the extension
-	protected $relativePathToLocallangFile = 'extensions/InlineElements/locallang.xml';
+	protected $relativePathToLocallangFile = 'extensions/InlineElements/locallang.xlf';
 
 	// Path to this main locallang file of the extension relative to the extension dir.
 	protected $relativePathToSkin = 'extensions/InlineElements/skin/htmlarea.css';
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/Language.php b/typo3/sysext/rtehtmlarea/Classes/Extension/Language.php
index 7a1a4de7d5b83c9505565d56e99a6e0a5728704a..9087398d0dc5c5def4f69e85fbde4adbbe29fbcf 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/Language.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/Language.php
@@ -36,7 +36,7 @@ class Language extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
 	protected $pluginName = 'Language';
 
 	// The name of the plugin registered by the extension
-	protected $relativePathToLocallangFile = 'extensions/Language/locallang.xml';
+	protected $relativePathToLocallangFile = 'extensions/Language/locallang.xlf';
 
 	// Path to this main locallang file of the extension relative to the extension dir.
 	protected $relativePathToSkin = 'extensions/Language/skin/htmlarea.css';
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/SelectFont.php b/typo3/sysext/rtehtmlarea/Classes/Extension/SelectFont.php
index f7cc5eeb82bf55a4ccbb92135f8a1d67cafc0ab1..9c0c87b7e990bb155599b9d161d4580947f9b3aa 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/SelectFont.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/SelectFont.php
@@ -36,7 +36,7 @@ class SelectFont extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
 	protected $pluginName = 'SelectFont';
 
 	// The name of the plugin registered by the extension
-	protected $relativePathToLocallangFile = 'extensions/SelectFont/locallang.xml';
+	protected $relativePathToLocallangFile = 'extensions/SelectFont/locallang.xlf';
 
 	// Path to this main locallang file of the extension relative to the extension dir.
 	protected $relativePathToSkin = '';
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/TextStyle.php b/typo3/sysext/rtehtmlarea/Classes/Extension/TextStyle.php
index a80c9ecca948f260b41f6e086c07575bf7c87bad..60d54eb977cc1c9452cde08c77615efd96d50ce8 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/TextStyle.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/TextStyle.php
@@ -36,7 +36,7 @@ class TextStyle extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
 	protected $pluginName = 'TextStyle';
 
 	// The name of the plugin registered by the extension
-	protected $relativePathToLocallangFile = 'extensions/TextStyle/locallang.xml';
+	protected $relativePathToLocallangFile = 'extensions/TextStyle/locallang.xlf';
 
 	// Path to this main locallang file of the extension relative to the extension dir.
 	protected $relativePathToSkin = '';
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/Typo3Color.php b/typo3/sysext/rtehtmlarea/Classes/Extension/Typo3Color.php
index 9b5bdcc0745d519254470e078cdeeb0c425c06f8..b25c70c784f1fa1622d0dc1d7abc3cb8f6cbcda5 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/Typo3Color.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/Typo3Color.php
@@ -36,7 +36,7 @@ class Typo3Color extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
 	protected $pluginName = 'TYPO3Color';
 
 	// The name of the plugin registered by the extension
-	protected $relativePathToLocallangFile = 'extensions/TYPO3Color/locallang.xml';
+	protected $relativePathToLocallangFile = 'extensions/TYPO3Color/locallang.xlf';
 
 	// Path to this main locallang file of the extension relative to the extension dir.
 	protected $relativePathToSkin = 'extensions/TYPO3Color/skin/htmlarea.css';
diff --git a/typo3/sysext/rtehtmlarea/Classes/Hook/StatusReportConflictsCheckHook.php b/typo3/sysext/rtehtmlarea/Classes/Hook/StatusReportConflictsCheckHook.php
index c50420ae0089579101a6f9c52e41c02a8ca4681b..7e3b4a96cf848e3298a3f5b2513552b9a2618162 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Hook/StatusReportConflictsCheckHook.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Hook/StatusReportConflictsCheckHook.php
@@ -46,7 +46,7 @@ class StatusReportConflictsCheckHook implements \TYPO3\CMS\Reports\StatusProvide
 	 * @return \TYPO3\CMS\Reports\Status
 	 */
 	protected function checkIfNoConflictingExtensionIsInstalled() {
-		$title = $GLOBALS['LANG']->sL('LLL:EXT:rtehtmlarea/hooks/statusreport/locallang.xml:title');
+		$title = $GLOBALS['LANG']->sL('LLL:EXT:rtehtmlarea/hooks/statusreport/locallang.xlf:title');
 		$conflictingExtensions = array();
 		if (is_array($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['rtehtmlarea']['conflicts'])) {
 			foreach ($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['rtehtmlarea']['conflicts'] as $extensionKey => $version) {
@@ -56,11 +56,11 @@ class StatusReportConflictsCheckHook implements \TYPO3\CMS\Reports\StatusProvide
 			}
 		}
 		if (count($conflictingExtensions)) {
-			$value = $GLOBALS['LANG']->sL('LLL:EXT:rtehtmlarea/hooks/statusreport/locallang.xml:keys') . ' ' . implode(', ', $conflictingExtensions);
-			$message = $GLOBALS['LANG']->sL('LLL:EXT:rtehtmlarea/hooks/statusreport/locallang.xml:uninstall');
+			$value = $GLOBALS['LANG']->sL('LLL:EXT:rtehtmlarea/hooks/statusreport/locallang.xlf:keys') . ' ' . implode(', ', $conflictingExtensions);
+			$message = $GLOBALS['LANG']->sL('LLL:EXT:rtehtmlarea/hooks/statusreport/locallang.xlf:uninstall');
 			$status = \TYPO3\CMS\Reports\Status::ERROR;
 		} else {
-			$value = $GLOBALS['LANG']->sL('LLL:EXT:rtehtmlarea/hooks/statusreport/locallang.xml:none');
+			$value = $GLOBALS['LANG']->sL('LLL:EXT:rtehtmlarea/hooks/statusreport/locallang.xlf:none');
 			$message = '';
 			$status = \TYPO3\CMS\Reports\Status::OK;
 		}
diff --git a/typo3/sysext/rtehtmlarea/Classes/RteHtmlAreaBase.php b/typo3/sysext/rtehtmlarea/Classes/RteHtmlAreaBase.php
index a8ecc4e17d9f5c5f386911d395ca725940ed4d94..8c1f652f13b2ace126a8f23bfd43e02b12c32b86 100644
--- a/typo3/sysext/rtehtmlarea/Classes/RteHtmlAreaBase.php
+++ b/typo3/sysext/rtehtmlarea/Classes/RteHtmlAreaBase.php
@@ -1106,7 +1106,7 @@ class RteHtmlAreaBase extends \TYPO3\CMS\Backend\Rte\AbstractRte {
 		$JSLanguageArray = 'HTMLArea.I18N = new Object();' . LF;
 		$labelsArray = array('tooltips' => array(), 'msg' => array(), 'dialogs' => array());
 		foreach ($labelsArray as $labels => $subArray) {
-			$LOCAL_LANG = GeneralUtility::readLLfile('EXT:' . $this->ID . '/htmlarea/locallang_' . $labels . '.xml', $this->language, 'utf-8');
+			$LOCAL_LANG = GeneralUtility::readLLfile('EXT:' . $this->ID . '/htmlarea/locallang_' . $labels . '.xlf', $this->language, 'utf-8');
 			if (!empty($LOCAL_LANG[$this->language])) {
 				$LOCAL_LANG[$this->language] = GeneralUtility::array_merge_recursive_overrule($LOCAL_LANG['default'], $LOCAL_LANG[$this->language], FALSE, FALSE);
 			} else {
@@ -1181,7 +1181,7 @@ class RteHtmlAreaBase extends \TYPO3\CMS\Backend\Rte\AbstractRte {
 	public function buildJSLangArray($plugin) {
 		$LOCAL_LANG = FALSE;
 		$extensionKey = is_object($this->registeredPlugins[$plugin]) ? $this->registeredPlugins[$plugin]->getExtensionKey() : $this->ID;
-		$LOCAL_LANG = GeneralUtility::readLLfile('EXT:' . $extensionKey . '/htmlarea/plugins/' . $plugin . '/locallang.xml', $this->language, 'utf-8', 1);
+		$LOCAL_LANG = GeneralUtility::readLLfile('EXT:' . $extensionKey . '/htmlarea/plugins/' . $plugin . '/locallang.xlf', $this->language, 'utf-8', 1);
 		$JSLanguageArray = 'HTMLArea.I18N["' . $plugin . '"] = new Object();' . LF;
 		if (is_array($LOCAL_LANG)) {
 			if (!empty($LOCAL_LANG[$this->language])) {
diff --git a/typo3/sysext/rtehtmlarea/Classes/SelectImage.php b/typo3/sysext/rtehtmlarea/Classes/SelectImage.php
index 72f0199b433ddc8201b7b9e7f02d758fb005173c..d22b96a4b8c1c20e7205374f9f227fa62919a54b 100644
--- a/typo3/sysext/rtehtmlarea/Classes/SelectImage.php
+++ b/typo3/sysext/rtehtmlarea/Classes/SelectImage.php
@@ -413,7 +413,7 @@ class SelectImage extends \TYPO3\CMS\Recordlist\Browser\ElementBrowser {
 				if (plugin.getButton("Language")) {
 					sz+=\'<tr><td\'+bgColor+\'><label for="iLang">\' + plugin.editor.getPlugin("Language").localize(\'Language-Tooltip\') + \': </label></td><td>\' + languageSelector + \'</td></tr>\';
 				}') . (in_array('clickenlarge', $removedProperties) || in_array('data-htmlarea-clickenlarge', $removedProperties) ? '' : '
-				sz+=\'<tr><td\'+bgColor+\'><label for="iClickEnlarge">' . $GLOBALS['LANG']->sL('LLL:EXT:cms/locallang_ttc.php:image_zoom', 1) . ' </label></td><td><input type="checkbox" name="iClickEnlarge" id="iClickEnlarge" value="0" /></td></tr>\';') . '
+				sz+=\'<tr><td\'+bgColor+\'><label for="iClickEnlarge">' . $GLOBALS['LANG']->sL('LLL:EXT:cms/locallang_ttc.xlf:image_zoom', 1) . ' </label></td><td><input type="checkbox" name="iClickEnlarge" id="iClickEnlarge" value="0" /></td></tr>\';') . '
 				sz+=\'<tr><td><input type="submit" value="' . $GLOBALS['LANG']->getLL('update') . '" onClick="return setImageProperties();"></td></tr>\';
 				sz+=\'</form></table>\';
 				return sz;
diff --git a/typo3/sysext/rtehtmlarea/Configuration/TCA/tx_rtehtmlarea_acronym.php b/typo3/sysext/rtehtmlarea/Configuration/TCA/tx_rtehtmlarea_acronym.php
index 9bc61fa9c4bb97fea23f6e5b5589c08e0fd974f2..aae5d8b22c6c4553107d448d906bc24f420eadaf 100644
--- a/typo3/sysext/rtehtmlarea/Configuration/TCA/tx_rtehtmlarea_acronym.php
+++ b/typo3/sysext/rtehtmlarea/Configuration/TCA/tx_rtehtmlarea_acronym.php
@@ -1,7 +1,7 @@
 <?php
 return array(
 	'ctrl' => array(
-		'title' => 'LLL:EXT:rtehtmlarea/locallang_db.xml:tx_rtehtmlarea_acronym',
+		'title' => 'LLL:EXT:rtehtmlarea/locallang_db.xlf:tx_rtehtmlarea_acronym',
 		'label' => 'term',
 		'default_sortby' => 'ORDER BY term',
 		'sortby' => 'sorting',
@@ -68,19 +68,19 @@ return array(
 		),
 		'type' => array(
 			'exclude' => 1,
-			'label' => 'LLL:EXT:rtehtmlarea/locallang_db.xml:tx_rtehtmlarea_acronym.type',
+			'label' => 'LLL:EXT:rtehtmlarea/locallang_db.xlf:tx_rtehtmlarea_acronym.type',
 			'config' => array(
 				'type' => 'radio',
 				'items' => array(
-					array('LLL:EXT:rtehtmlarea/locallang_db.xml:tx_rtehtmlarea_acronym.type.I.1', '2'),
-					array('LLL:EXT:rtehtmlarea/locallang_db.xml:tx_rtehtmlarea_acronym.type.I.0', '1')
+					array('LLL:EXT:rtehtmlarea/locallang_db.xlf:tx_rtehtmlarea_acronym.type.I.1', '2'),
+					array('LLL:EXT:rtehtmlarea/locallang_db.xlf:tx_rtehtmlarea_acronym.type.I.0', '1')
 				),
 				'default' => '2'
 			)
 		),
 		'term' => array(
 			'exclude' => 0,
-			'label' => 'LLL:EXT:rtehtmlarea/locallang_db.xml:tx_rtehtmlarea_acronym.term',
+			'label' => 'LLL:EXT:rtehtmlarea/locallang_db.xlf:tx_rtehtmlarea_acronym.term',
 			'config' => array(
 				'type' => 'input',
 				'size' => '30',
@@ -89,7 +89,7 @@ return array(
 		),
 		'acronym' => array(
 			'exclude' => 0,
-			'label' => 'LLL:EXT:rtehtmlarea/locallang_db.xml:tx_rtehtmlarea_acronym.acronym',
+			'label' => 'LLL:EXT:rtehtmlarea/locallang_db.xlf:tx_rtehtmlarea_acronym.acronym',
 			'config' => array(
 				'type' => 'input',
 				'size' => '30',
@@ -98,7 +98,7 @@ return array(
 		),
 		'static_lang_isocode' => array(
 			'exclude' => 0,
-			'label' => 'LLL:EXT:rtehtmlarea/locallang_db.xml:tx_rtehtmlarea_acronym.static_lang_isocode',
+			'label' => 'LLL:EXT:rtehtmlarea/locallang_db.xlf:tx_rtehtmlarea_acronym.static_lang_isocode',
 			'displayCond' => 'EXT:static_info_tables:LOADED:true',
 			'config' => array(
 				'type' => 'select',
diff --git a/typo3/sysext/rtehtmlarea/ext_tables.php b/typo3/sysext/rtehtmlarea/ext_tables.php
index 135292d0c2b42faf1932444bf08915a7e0e9375b..6fcc75ca27d37ad58cf13440e415c2d25faa44c1 100644
--- a/typo3/sysext/rtehtmlarea/ext_tables.php
+++ b/typo3/sysext/rtehtmlarea/ext_tables.php
@@ -8,7 +8,7 @@ if (!defined('TYPO3_MODE')) {
 require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'hooks/softref/ext_tables.php';
 
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::allowTableOnStandardPages('tx_rtehtmlarea_acronym');
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('tx_rtehtmlarea_acronym', 'EXT:' . $_EXTKEY . '/locallang_csh_abbreviation.xml');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('tx_rtehtmlarea_acronym', 'EXT:' . $_EXTKEY . '/locallang_csh_abbreviation.xlf');
 // Add contextual help files
 $htmlAreaRteContextHelpFiles = array(
 	'General' => 'EXT:' . $_EXTKEY . '/locallang_csh.xlf',
@@ -29,35 +29,35 @@ if (TYPO3_MODE === 'BE' && \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::i
 	$GLOBALS['TYPO3_USER_SETTINGS']['columns'] = array_merge($GLOBALS['TYPO3_USER_SETTINGS']['columns'], array(
 		'rteWidth' => array(
 			'type' => 'text',
-			'label' => 'LLL:EXT:rtehtmlarea/locallang.xml:rteWidth',
+			'label' => 'LLL:EXT:rtehtmlarea/locallang.xlf:rteWidth',
 			'csh' => 'xEXT_rtehtmlarea_General:rteWidth'
 		),
 		'rteHeight' => array(
 			'type' => 'text',
-			'label' => 'LLL:EXT:rtehtmlarea/locallang.xml:rteHeight',
+			'label' => 'LLL:EXT:rtehtmlarea/locallang.xlf:rteHeight',
 			'csh' => 'xEXT_rtehtmlarea_General:rteHeight'
 		),
 		'rteResize' => array(
 			'type' => 'check',
-			'label' => 'LLL:EXT:rtehtmlarea/locallang.xml:rteResize',
+			'label' => 'LLL:EXT:rtehtmlarea/locallang.xlf:rteResize',
 			'csh' => 'xEXT_rtehtmlarea_General:rteResize'
 		),
 		'rteMaxHeight' => array(
 			'type' => 'text',
-			'label' => 'LLL:EXT:rtehtmlarea/locallang.xml:rteMaxHeight',
+			'label' => 'LLL:EXT:rtehtmlarea/locallang.xlf:rteMaxHeight',
 			'csh' => 'xEXT_rtehtmlarea_General:rteMaxHeight'
 		),
 		'rteCleanPasteBehaviour' => array(
 			'type' => 'select',
-			'label' => 'LLL:EXT:rtehtmlarea/htmlarea/plugins/PlainText/locallang.xml:rteCleanPasteBehaviour',
+			'label' => 'LLL:EXT:rtehtmlarea/htmlarea/plugins/PlainText/locallang.xlf:rteCleanPasteBehaviour',
 			'items' => array(
-				'plainText' => 'LLL:EXT:rtehtmlarea/htmlarea/plugins/PlainText/locallang.xml:plainText',
-				'pasteStructure' => 'LLL:EXT:rtehtmlarea/htmlarea/plugins/PlainText/locallang.xml:pasteStructure',
-				'pasteFormat' => 'LLL:EXT:rtehtmlarea/htmlarea/plugins/PlainText/locallang.xml:pasteFormat'
+				'plainText' => 'LLL:EXT:rtehtmlarea/htmlarea/plugins/PlainText/locallang.xlf:plainText',
+				'pasteStructure' => 'LLL:EXT:rtehtmlarea/htmlarea/plugins/PlainText/locallang.xlf:pasteStructure',
+				'pasteFormat' => 'LLL:EXT:rtehtmlarea/htmlarea/plugins/PlainText/locallang.xlf:pasteFormat'
 			),
 			'csh' => 'xEXT_rtehtmlarea_PlainText:behaviour'
 		)
 	));
-	$GLOBALS['TYPO3_USER_SETTINGS']['showitem'] .= ',--div--;LLL:EXT:rtehtmlarea/locallang.xml:rteSettings,rteWidth,rteHeight,rteResize,rteMaxHeight,rteCleanPasteBehaviour';
+	$GLOBALS['TYPO3_USER_SETTINGS']['showitem'] .= ',--div--;LLL:EXT:rtehtmlarea/locallang.xlf:rteSettings,rteWidth,rteHeight,rteResize,rteMaxHeight,rteCleanPasteBehaviour';
 }
 ?>
\ No newline at end of file
diff --git a/typo3/sysext/rtehtmlarea/mod3/browse_links.php b/typo3/sysext/rtehtmlarea/mod3/browse_links.php
index 2ac3c9b230a51bf0f796a23d7125e160eae20d68..f283ab5fc63dcb5e29f85c7d404e9f9ef14e26aa 100644
--- a/typo3/sysext/rtehtmlarea/mod3/browse_links.php
+++ b/typo3/sysext/rtehtmlarea/mod3/browse_links.php
@@ -39,8 +39,8 @@ error_reporting(E_ALL & ~(E_STRICT | E_NOTICE | E_DEPRECATED));
 unset($MCONF);
 require 'conf.php';
 require $BACK_PATH . 'init.php';
-$LANG->includeLLFile('EXT:rtehtmlarea/mod3/locallang.xml');
-$LANG->includeLLFile('EXT:rtehtmlarea/htmlarea/locallang_dialogs.xml');
+$LANG->includeLLFile('EXT:rtehtmlarea/mod3/locallang.xlf');
+$LANG->includeLLFile('EXT:rtehtmlarea/htmlarea/locallang_dialogs.xlf');
 /*
  * @deprecated since 6.0, the classname tx_rtehtmlarea_SC_browse_links and this file is obsolete
  * and will be removed with 6.2. The class was renamed and is now located at:
diff --git a/typo3/sysext/rtehtmlarea/mod4/select_image.php b/typo3/sysext/rtehtmlarea/mod4/select_image.php
index befc033f17d4f62959307feee4df588ab41ec64c..26e9837edb32b20680b3f963b2018943f0425260 100644
--- a/typo3/sysext/rtehtmlarea/mod4/select_image.php
+++ b/typo3/sysext/rtehtmlarea/mod4/select_image.php
@@ -35,9 +35,9 @@ error_reporting(E_ALL & ~(E_STRICT | E_NOTICE | E_DEPRECATED));
 unset($MCONF);
 require 'conf.php';
 require $BACK_PATH . 'init.php';
-$LANG->includeLLFile('EXT:lang/locallang_TYPO3\\CMS\\Recordlist\\Browser\\ElementBrowser.xml');
-$LANG->includeLLFile('EXT:rtehtmlarea/mod4/locallang.xml');
-$LANG->includeLLFile('EXT:rtehtmlarea/htmlarea/locallang_dialogs.xml');
+$LANG->includeLLFile('EXT:lang/locallang_TYPO3\\CMS\\Recordlist\\Browser\\ElementBrowser.xlf');
+$LANG->includeLLFile('EXT:rtehtmlarea/mod4/locallang.xlf');
+$LANG->includeLLFile('EXT:rtehtmlarea/htmlarea/locallang_dialogs.xlf');
 /*
  * @deprecated since 6.0, the classname tx_rtehtmlarea_SC_select_image and this file is obsolete
  * and will be removed with 6.2. The class was renamed and is now located at:
diff --git a/typo3/sysext/rtehtmlarea/mod5/user.php b/typo3/sysext/rtehtmlarea/mod5/user.php
index 88d04c58f48539d706b04ecf55378767476ec1aa..2ecb0c0f2ca0efd1dc56221d9b0af9c734fb85df 100644
--- a/typo3/sysext/rtehtmlarea/mod5/user.php
+++ b/typo3/sysext/rtehtmlarea/mod5/user.php
@@ -35,8 +35,8 @@ error_reporting(E_ALL & ~(E_STRICT | E_NOTICE | E_DEPRECATED));
 unset($MCONF);
 require 'conf.php';
 require $BACK_PATH . 'init.php';
-$LANG->includeLLFile('EXT:rtehtmlarea/mod5/locallang.xml');
-$LANG->includeLLFile('EXT:rtehtmlarea/htmlarea/locallang_dialogs.xml');
+$LANG->includeLLFile('EXT:rtehtmlarea/mod5/locallang.xlf');
+$LANG->includeLLFile('EXT:rtehtmlarea/htmlarea/locallang_dialogs.xlf');
 // Make instance:
 $SOBE = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Rtehtmlarea\\User');
 $SOBE->init();
diff --git a/typo3/sysext/saltedpasswords/Classes/Task/BulkUpdateFieldProvider.php b/typo3/sysext/saltedpasswords/Classes/Task/BulkUpdateFieldProvider.php
index 62c55c7c0cf88c2a0f9f7ce1bb96af025b05cf32..f4b6de2b7e5eca0fe69bc39c2efd690d6513ae4f 100644
--- a/typo3/sysext/saltedpasswords/Classes/Task/BulkUpdateFieldProvider.php
+++ b/typo3/sysext/saltedpasswords/Classes/Task/BulkUpdateFieldProvider.php
@@ -78,7 +78,7 @@ class BulkUpdateFieldProvider implements \TYPO3\CMS\Scheduler\AdditionalFieldPro
 		$fieldHtml = '<input type="checkbox"' . ' name="' . $fieldName . '"' . ' id="' . $fieldId . '"' . ' value="' . $fieldValue . '"' . ($fieldChecked ? ' checked="checked"' : '') . ' />';
 		$additionalFields[$fieldId] = array(
 			'code' => $fieldHtml,
-			'label' => 'LLL:EXT:saltedpasswords/locallang.xml:ext.saltedpasswords.tasks.bulkupdate.label.canDeactivateSelf',
+			'label' => 'LLL:EXT:saltedpasswords/locallang.xlf:ext.saltedpasswords.tasks.bulkupdate.label.canDeactivateSelf',
 			'cshKey' => '_txsaltedpasswords',
 			'cshLabel' => $fieldId
 		);
@@ -89,7 +89,7 @@ class BulkUpdateFieldProvider implements \TYPO3\CMS\Scheduler\AdditionalFieldPro
 		$fieldHtml = '<input type="text" name="' . $fieldName . '" id="' . $fieldId . '" value="' . htmlspecialchars($fieldValue) . '" />';
 		$additionalFields[$fieldId] = array(
 			'code' => $fieldHtml,
-			'label' => 'LLL:EXT:saltedpasswords/locallang.xml:ext.saltedpasswords.tasks.bulkupdate.label.numberOfRecords',
+			'label' => 'LLL:EXT:saltedpasswords/locallang.xlf:ext.saltedpasswords.tasks.bulkupdate.label.numberOfRecords',
 			'cshKey' => '_txsaltedpasswords',
 			'cshLabel' => $fieldId
 		);
@@ -109,7 +109,7 @@ class BulkUpdateFieldProvider implements \TYPO3\CMS\Scheduler\AdditionalFieldPro
 		// If not, fail validation and issue error message
 		if (!is_numeric($submittedData['scheduler_saltedpasswordsBulkUpdateNumberOfRecords']) || intval($submittedData['scheduler_saltedpasswordsBulkUpdateNumberOfRecords']) < 0) {
 			$result = FALSE;
-			$parentObject->addMessage($GLOBALS['LANG']->sL('LLL:EXT:saltedpasswords/locallang.xml:ext.saltedpasswords.tasks.bulkupdate.invalidNumberOfRecords'), \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR);
+			$parentObject->addMessage($GLOBALS['LANG']->sL('LLL:EXT:saltedpasswords/locallang.xlf:ext.saltedpasswords.tasks.bulkupdate.invalidNumberOfRecords'), \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR);
 		}
 		return $result;
 	}
diff --git a/typo3/sysext/saltedpasswords/Classes/Task/BulkUpdateTask.php b/typo3/sysext/saltedpasswords/Classes/Task/BulkUpdateTask.php
index abfb832ceb717c673b0de353451172170916ddf2..b7c7b0a20c2a4a2c32ab3d11aa62936c6cb6bd06 100644
--- a/typo3/sysext/saltedpasswords/Classes/Task/BulkUpdateTask.php
+++ b/typo3/sysext/saltedpasswords/Classes/Task/BulkUpdateTask.php
@@ -106,7 +106,7 @@ class BulkUpdateTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
 	 * @return string Additional information
 	 */
 	public function getAdditionalInformation() {
-		$information = $GLOBALS['LANG']->sL('LLL:EXT:saltedpasswords/locallang.xml:ext.saltedpasswords.tasks.bulkupdate.label.additionalinformation.deactivateself') . $this->getCanDeactivateSelf() . '; ' . $GLOBALS['LANG']->sL('LLL:EXT:saltedpasswords/locallang.xml:ext.saltedpasswords.tasks.bulkupdate.label.additionalinformation.numberofrecords') . $this->getNumberOfRecords();
+		$information = $GLOBALS['LANG']->sL('LLL:EXT:saltedpasswords/locallang.xlf:ext.saltedpasswords.tasks.bulkupdate.label.additionalinformation.deactivateself') . $this->getCanDeactivateSelf() . '; ' . $GLOBALS['LANG']->sL('LLL:EXT:saltedpasswords/locallang.xlf:ext.saltedpasswords.tasks.bulkupdate.label.additionalinformation.numberofrecords') . $this->getNumberOfRecords();
 		return $information;
 	}
 
diff --git a/typo3/sysext/saltedpasswords/Classes/Utility/ExtensionManagerConfigurationUtility.php b/typo3/sysext/saltedpasswords/Classes/Utility/ExtensionManagerConfigurationUtility.php
index 52984624af085d9fa646e8252ed42f299ef11615..a372189d5ae8efbd2c62274a17d1e0a79488acb3 100644
--- a/typo3/sysext/saltedpasswords/Classes/Utility/ExtensionManagerConfigurationUtility.php
+++ b/typo3/sysext/saltedpasswords/Classes/Utility/ExtensionManagerConfigurationUtility.php
@@ -131,7 +131,7 @@ your TYPO3 installation and the usability of the backend.';
 		$extConf = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['saltedpasswords']);
 		$this->extConf['BE'] = array_merge((array) $extConf['BE.'], (array) $requestSetup['BE.']);
 		$this->extConf['FE'] = array_merge((array) $extConf['FE.'], (array) $requestSetup['FE.']);
-		$GLOBALS['LANG']->includeLLFile('EXT:saltedpasswords/locallang.xml');
+		$GLOBALS['LANG']->includeLLFile('EXT:saltedpasswords/locallang.xlf');
 	}
 
 	/**
diff --git a/typo3/sysext/saltedpasswords/ext_localconf.php b/typo3/sysext/saltedpasswords/ext_localconf.php
index 6028053464b4a427c7b3ffc8f7aa927145163835..673ed004b28ba98d1226d7d1dbd009f7c054326b 100644
--- a/typo3/sysext/saltedpasswords/ext_localconf.php
+++ b/typo3/sysext/saltedpasswords/ext_localconf.php
@@ -36,8 +36,8 @@ $TYPO3_CONF_VARS['BE']['showRefreshLoginPopup'] = 1;
 // Register bulk update task
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks']['TYPO3\\CMS\\Saltedpasswords\\Task\\BulkUpdateTask'] = array(
 	'extension' => $_EXTKEY,
-	'title' => 'LLL:EXT:' . $_EXTKEY . '/locallang.xml:ext.saltedpasswords.tasks.bulkupdate.name',
-	'description' => 'LLL:EXT:' . $_EXTKEY . '/locallang.xml:ext.saltedpasswords.tasks.bulkupdate.description',
+	'title' => 'LLL:EXT:' . $_EXTKEY . '/locallang.xlf:ext.saltedpasswords.tasks.bulkupdate.name',
+	'description' => 'LLL:EXT:' . $_EXTKEY . '/locallang.xlf:ext.saltedpasswords.tasks.bulkupdate.description',
 	'additionalFields' => 'TYPO3\\CMS\\Saltedpasswords\\Task\\BulkUpdateFieldProvider'
 );
 ?>
\ No newline at end of file
diff --git a/typo3/sysext/saltedpasswords/ext_tables.php b/typo3/sysext/saltedpasswords/ext_tables.php
index 4e909de0369fcf32791db9d545a83c55886f4778..5d6044a70c9371e53a167cfbdc22eb3696337bfb 100644
--- a/typo3/sysext/saltedpasswords/ext_tables.php
+++ b/typo3/sysext/saltedpasswords/ext_tables.php
@@ -30,5 +30,5 @@ if (\TYPO3\CMS\Saltedpasswords\Utility\SaltedPasswordsUtility::isUsageEnabled('B
 	$GLOBALS['TYPO3_USER_SETTINGS']['columns']['password2']['eval'] = '';
 }
 // Add context sensitive help (csh) for scheduler task
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('_txsaltedpasswords', 'EXT:' . $_EXTKEY . '/locallang_csh_saltedpasswords.xml');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('_txsaltedpasswords', 'EXT:' . $_EXTKEY . '/locallang_csh_saltedpasswords.xlf');
 ?>
\ No newline at end of file
diff --git a/typo3/sysext/scheduler/Classes/Example/SleepTask.php b/typo3/sysext/scheduler/Classes/Example/SleepTask.php
index 634d0d4dab9db455411dd0703e21cd19d1585afb..f30dd265c2b7e93568b0259b99802f96835049ff 100644
--- a/typo3/sysext/scheduler/Classes/Example/SleepTask.php
+++ b/typo3/sysext/scheduler/Classes/Example/SleepTask.php
@@ -60,7 +60,7 @@ class SleepTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
 	 * @return string Information to display
 	 */
 	public function getAdditionalInformation() {
-		return $GLOBALS['LANG']->sL('LLL:EXT:scheduler/mod1/locallang.xml:label.sleepTime') . ': ' . $this->sleepTime;
+		return $GLOBALS['LANG']->sL('LLL:EXT:scheduler/mod1/locallang.xlf:label.sleepTime') . ': ' . $this->sleepTime;
 	}
 
 }
diff --git a/typo3/sysext/scheduler/Classes/Example/SleepTaskAdditionalFieldProvider.php b/typo3/sysext/scheduler/Classes/Example/SleepTaskAdditionalFieldProvider.php
index 47ff895a03f8ee3334b0907890bd4dcd34a144c5..29d7ea3ec0ea1e45c89c948dcb3405b21084295a 100644
--- a/typo3/sysext/scheduler/Classes/Example/SleepTaskAdditionalFieldProvider.php
+++ b/typo3/sysext/scheduler/Classes/Example/SleepTaskAdditionalFieldProvider.php
@@ -59,7 +59,7 @@ class SleepTaskAdditionalFieldProvider implements \TYPO3\CMS\Scheduler\Additiona
 		$additionalFields = array();
 		$additionalFields[$fieldID] = array(
 			'code' => $fieldCode,
-			'label' => 'LLL:EXT:scheduler/mod1/locallang.xml:label.sleepTime',
+			'label' => 'LLL:EXT:scheduler/mod1/locallang.xlf:label.sleepTime',
 			'cshKey' => '_MOD_system_txschedulerM1',
 			'cshLabel' => $fieldID
 		);
@@ -77,7 +77,7 @@ class SleepTaskAdditionalFieldProvider implements \TYPO3\CMS\Scheduler\Additiona
 	public function validateAdditionalFields(array &$submittedData, \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $parentObject) {
 		$submittedData['sleepTime'] = intval($submittedData['sleepTime']);
 		if ($submittedData['sleepTime'] < 0) {
-			$parentObject->addMessage($GLOBALS['LANG']->sL('LLL:EXT:scheduler/mod1/locallang.xml:msg.invalidSleepTime'), \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR);
+			$parentObject->addMessage($GLOBALS['LANG']->sL('LLL:EXT:scheduler/mod1/locallang.xlf:msg.invalidSleepTime'), \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR);
 			$result = FALSE;
 		} else {
 			$result = TRUE;
diff --git a/typo3/sysext/scheduler/Classes/Example/TestTask.php b/typo3/sysext/scheduler/Classes/Example/TestTask.php
index 29e5494b38a00b07b4b2ea7f8621d653fb2ab668..32b2398bd3343fb6773ff1e400be56a3942a23f3 100644
--- a/typo3/sysext/scheduler/Classes/Example/TestTask.php
+++ b/typo3/sysext/scheduler/Classes/Example/TestTask.php
@@ -94,7 +94,7 @@ class TestTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
 	 * @return string Information to display
 	 */
 	public function getAdditionalInformation() {
-		return $GLOBALS['LANG']->sL('LLL:EXT:scheduler/mod1/locallang.xml:label.email') . ': ' . $this->email;
+		return $GLOBALS['LANG']->sL('LLL:EXT:scheduler/mod1/locallang.xlf:label.email') . ': ' . $this->email;
 	}
 
 }
diff --git a/typo3/sysext/scheduler/Classes/Example/TestTaskAdditionalFieldProvider.php b/typo3/sysext/scheduler/Classes/Example/TestTaskAdditionalFieldProvider.php
index 69b221a31cf1acadd6b6dfdacad70d796ab0c6a2..3c77f4c1a774af52b3d5046503a768490629ea22 100644
--- a/typo3/sysext/scheduler/Classes/Example/TestTaskAdditionalFieldProvider.php
+++ b/typo3/sysext/scheduler/Classes/Example/TestTaskAdditionalFieldProvider.php
@@ -59,7 +59,7 @@ class TestTaskAdditionalFieldProvider implements \TYPO3\CMS\Scheduler\Additional
 		$additionalFields = array();
 		$additionalFields[$fieldID] = array(
 			'code' => $fieldCode,
-			'label' => 'LLL:EXT:scheduler/mod1/locallang.xml:label.email',
+			'label' => 'LLL:EXT:scheduler/mod1/locallang.xlf:label.email',
 			'cshKey' => '_MOD_system_txschedulerM1',
 			'cshLabel' => $fieldID
 		);
@@ -77,7 +77,7 @@ class TestTaskAdditionalFieldProvider implements \TYPO3\CMS\Scheduler\Additional
 	public function validateAdditionalFields(array &$submittedData, \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $parentObject) {
 		$submittedData['email'] = trim($submittedData['email']);
 		if (empty($submittedData['email'])) {
-			$parentObject->addMessage($GLOBALS['LANG']->sL('LLL:EXT:scheduler/mod1/locallang.xml:msg.noEmail'), \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR);
+			$parentObject->addMessage($GLOBALS['LANG']->sL('LLL:EXT:scheduler/mod1/locallang.xlf:msg.noEmail'), \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR);
 			$result = FALSE;
 		} else {
 			$result = TRUE;
diff --git a/typo3/sysext/scheduler/Classes/Task/CachingFrameworkGarbageCollectionAdditionalFieldProvider.php b/typo3/sysext/scheduler/Classes/Task/CachingFrameworkGarbageCollectionAdditionalFieldProvider.php
index b219d3e1c9493285ca40e2f1a53489e07fcea11e..cb968bb0f13b85e9f8688f63e5e609c0e0ca6393 100644
--- a/typo3/sysext/scheduler/Classes/Task/CachingFrameworkGarbageCollectionAdditionalFieldProvider.php
+++ b/typo3/sysext/scheduler/Classes/Task/CachingFrameworkGarbageCollectionAdditionalFieldProvider.php
@@ -59,7 +59,7 @@ class CachingFrameworkGarbageCollectionAdditionalFieldProvider implements \TYPO3
 		$fieldHtml = '<select name="' . $fieldName . '" id="' . $fieldId . '" class="wide" size="10" multiple="multiple">' . $fieldOptions . '</select>';
 		$additionalFields[$fieldId] = array(
 			'code' => $fieldHtml,
-			'label' => 'LLL:EXT:scheduler/mod1/locallang.xml:label.cachingFrameworkGarbageCollection.selectBackends',
+			'label' => 'LLL:EXT:scheduler/mod1/locallang.xlf:label.cachingFrameworkGarbageCollection.selectBackends',
 			'cshKey' => '_MOD_system_txschedulerM1',
 			'cshLabel' => $fieldId
 		);
@@ -79,11 +79,11 @@ class CachingFrameworkGarbageCollectionAdditionalFieldProvider implements \TYPO3
 		if (is_array($submittedData['scheduler_cachingFrameworkGarbageCollection_selectedBackends'])) {
 			$invalidBackends = array_diff($submittedData['scheduler_cachingFrameworkGarbageCollection_selectedBackends'], $availableBackends);
 			if (!empty($invalidBackends)) {
-				$parentObject->addMessage($GLOBALS['LANG']->sL('LLL:EXT:scheduler/mod1/locallang.xml:msg.selectionOfNonExistingCacheBackends'), \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR);
+				$parentObject->addMessage($GLOBALS['LANG']->sL('LLL:EXT:scheduler/mod1/locallang.xlf:msg.selectionOfNonExistingCacheBackends'), \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR);
 				$validData = FALSE;
 			}
 		} else {
-			$parentObject->addMessage($GLOBALS['LANG']->sL('LLL:EXT:scheduler/mod1/locallang.xml:msg.noCacheBackendSelected'), \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR);
+			$parentObject->addMessage($GLOBALS['LANG']->sL('LLL:EXT:scheduler/mod1/locallang.xlf:msg.noCacheBackendSelected'), \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR);
 			$validData = FALSE;
 		}
 		return $validData;
diff --git a/typo3/sysext/scheduler/Classes/Task/RecyclerGarbageCollectionAdditionalFieldProvider.php b/typo3/sysext/scheduler/Classes/Task/RecyclerGarbageCollectionAdditionalFieldProvider.php
index 01e86108480af1239a69addbf2042247bafd0308..d688579178dea76bd2440ad8190a5fad7663f5cc 100644
--- a/typo3/sysext/scheduler/Classes/Task/RecyclerGarbageCollectionAdditionalFieldProvider.php
+++ b/typo3/sysext/scheduler/Classes/Task/RecyclerGarbageCollectionAdditionalFieldProvider.php
@@ -63,7 +63,7 @@ class RecyclerGarbageCollectionAdditionalFieldProvider implements \TYPO3\CMS\Sch
 		$fieldHtml = '<input type="text" name="' . $fieldName . '" id="' . $fieldId . '" value="' . htmlspecialchars($fieldValue) . '" />';
 		$additionalFields[$fieldId] = array(
 			'code' => $fieldHtml,
-			'label' => 'LLL:EXT:scheduler/mod1/locallang.xml:label.recyclerGarbageCollection.numberOfDays',
+			'label' => 'LLL:EXT:scheduler/mod1/locallang.xlf:label.recyclerGarbageCollection.numberOfDays',
 			'cshKey' => '_MOD_system_txschedulerM1',
 			'cshLabel' => $fieldId
 		);
@@ -83,7 +83,7 @@ class RecyclerGarbageCollectionAdditionalFieldProvider implements \TYPO3\CMS\Sch
 		// If not, fail validation and issue error message
 		if (!is_numeric($submittedData['scheduler_recyclerGarbageCollection_numberOfDays']) || intval($submittedData['scheduler_recyclerGarbageCollection_numberOfDays']) < 0) {
 			$result = FALSE;
-			$parentObject->addMessage($GLOBALS['LANG']->sL('LLL:EXT:scheduler/mod1/locallang.xml:msg.invalidNumberOfDays'), \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR);
+			$parentObject->addMessage($GLOBALS['LANG']->sL('LLL:EXT:scheduler/mod1/locallang.xlf:msg.invalidNumberOfDays'), \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR);
 		}
 		return $result;
 	}
diff --git a/typo3/sysext/scheduler/Classes/Task/TableGarbageCollectionAdditionalFieldProvider.php b/typo3/sysext/scheduler/Classes/Task/TableGarbageCollectionAdditionalFieldProvider.php
index 05b25cb856a640ffb9ffa9de20e8e5e83355381b..0975ec96d850c19053916de6b712190bbcb4ef57 100644
--- a/typo3/sysext/scheduler/Classes/Task/TableGarbageCollectionAdditionalFieldProvider.php
+++ b/typo3/sysext/scheduler/Classes/Task/TableGarbageCollectionAdditionalFieldProvider.php
@@ -84,7 +84,7 @@ class TableGarbageCollectionAdditionalFieldProvider implements \TYPO3\CMS\Schedu
 		$fieldHtml = '<input type="checkbox" ' . $checked . 'onChange="actOnChangeSchedulerTableGarbageCollectionAllTables(this)" ' . 'name="' . $fieldName . '" ' . 'id="' . $fieldId . '" />';
 		$fieldConfiguration = array(
 			'code' => $fieldHtml,
-			'label' => 'LLL:EXT:scheduler/mod1/locallang.xml:label.tableGarbageCollection.allTables',
+			'label' => 'LLL:EXT:scheduler/mod1/locallang.xlf:label.tableGarbageCollection.allTables',
 			'cshKey' => '_MOD_system_txschedulerM1',
 			'cshLabel' => $fieldId
 		);
@@ -130,7 +130,7 @@ class TableGarbageCollectionAdditionalFieldProvider implements \TYPO3\CMS\Schedu
 		$fieldHtml[] = '// -->/*]]>*/</script>';
 		$fieldConfiguration = array(
 			'code' => implode(LF, $fieldHtml),
-			'label' => 'LLL:EXT:scheduler/mod1/locallang.xml:label.tableGarbageCollection.table',
+			'label' => 'LLL:EXT:scheduler/mod1/locallang.xlf:label.tableGarbageCollection.table',
 			'cshKey' => '_MOD_system_txschedulerM1',
 			'cshLabel' => $fieldId
 		);
@@ -168,7 +168,7 @@ class TableGarbageCollectionAdditionalFieldProvider implements \TYPO3\CMS\Schedu
 		$fieldHtml = '<input type="text" ' . 'name="' . $fieldName . '" ' . 'id="' . $fieldId . '" ' . $disabled . 'value="' . intval($taskInfo['scheduler_tableGarbageCollection_numberOfDays']) . '" ' . 'size="4" />';
 		$fieldConfiguration = array(
 			'code' => $fieldHtml,
-			'label' => 'LLL:EXT:scheduler/mod1/locallang.xml:label.tableGarbageCollection.numberOfDays',
+			'label' => 'LLL:EXT:scheduler/mod1/locallang.xlf:label.tableGarbageCollection.numberOfDays',
 			'cshKey' => '_MOD_system_txschedulerM1',
 			'cshLabel' => $fieldId
 		);
@@ -239,7 +239,7 @@ class TableGarbageCollectionAdditionalFieldProvider implements \TYPO3\CMS\Schedu
 			$validData = TRUE;
 		} else {
 			// Issue error message
-			$parentObject->addMessage($GLOBALS['LANG']->sL('LLL:EXT:scheduler/mod1/locallang.xml:msg.invalidNumberOfDays'), \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR);
+			$parentObject->addMessage($GLOBALS['LANG']->sL('LLL:EXT:scheduler/mod1/locallang.xlf:msg.invalidNumberOfDays'), \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR);
 		}
 		return $validData;
 	}
diff --git a/typo3/sysext/scheduler/Classes/Task/TableGarbageCollectionTask.php b/typo3/sysext/scheduler/Classes/Task/TableGarbageCollectionTask.php
index 32eba97f0b3a89c8ac6e6f80597747fdfc95f87c..f1ea40f62865fe935a9cbade46797ba294466da5 100644
--- a/typo3/sysext/scheduler/Classes/Task/TableGarbageCollectionTask.php
+++ b/typo3/sysext/scheduler/Classes/Task/TableGarbageCollectionTask.php
@@ -117,9 +117,9 @@ class TableGarbageCollectionTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask
 	 */
 	public function getAdditionalInformation() {
 		if ($this->allTables) {
-			$message = $GLOBALS['LANG']->sL('LLL:EXT:scheduler/mod1/locallang.xml:label.tableGarbageCollection.additionalInformationAllTables');
+			$message = $GLOBALS['LANG']->sL('LLL:EXT:scheduler/mod1/locallang.xlf:label.tableGarbageCollection.additionalInformationAllTables');
 		} else {
-			$message = sprintf($GLOBALS['LANG']->sL('LLL:EXT:scheduler/mod1/locallang.xml:label.tableGarbageCollection.additionalInformationTable'), $this->table);
+			$message = sprintf($GLOBALS['LANG']->sL('LLL:EXT:scheduler/mod1/locallang.xlf:label.tableGarbageCollection.additionalInformationTable'), $this->table);
 		}
 		return $message;
 	}
diff --git a/typo3/sysext/scheduler/ext_localconf.php b/typo3/sysext/scheduler/ext_localconf.php
index 1808198349bd19726377ed170a9e324af386803b..efb1b8729151dff422f715dcc171f43bff412778 100644
--- a/typo3/sysext/scheduler/ext_localconf.php
+++ b/typo3/sysext/scheduler/ext_localconf.php
@@ -14,45 +14,45 @@ $extConf = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['scheduler'
 if (!empty($extConf['showSampleTasks'])) {
 	$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks']['TYPO3\\CMS\\Scheduler\\Example\\TestTask'] = array(
 		'extension' => $_EXTKEY,
-		'title' => 'LLL:EXT:' . $_EXTKEY . '/locallang.xml:testTask.name',
-		'description' => 'LLL:EXT:' . $_EXTKEY . '/locallang.xml:testTask.description',
+		'title' => 'LLL:EXT:' . $_EXTKEY . '/locallang.xlf:testTask.name',
+		'description' => 'LLL:EXT:' . $_EXTKEY . '/locallang.xlf:testTask.description',
 		'additionalFields' => 'TYPO3\\CMS\\Scheduler\\Example\\TestTaskAdditionalFieldProvider'
 	);
 	$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks']['TYPO3\\CMS\\Scheduler\\Example\\SleepTask'] = array(
 		'extension' => $_EXTKEY,
-		'title' => 'LLL:EXT:' . $_EXTKEY . '/locallang.xml:sleepTask.name',
-		'description' => 'LLL:EXT:' . $_EXTKEY . '/locallang.xml:sleepTask.description',
+		'title' => 'LLL:EXT:' . $_EXTKEY . '/locallang.xlf:sleepTask.name',
+		'description' => 'LLL:EXT:' . $_EXTKEY . '/locallang.xlf:sleepTask.description',
 		'additionalFields' => 'TYPO3\\CMS\\Scheduler\\Example\\SleepTaskAdditionalFieldProvider'
 	);
 }
 // Add caching framework garbage collection task
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks']['TYPO3\\CMS\\Scheduler\\Task\\CachingFrameworkGarbageCollectionTask'] = array(
 	'extension' => $_EXTKEY,
-	'title' => 'LLL:EXT:' . $_EXTKEY . '/locallang.xml:cachingFrameworkGarbageCollection.name',
-	'description' => 'LLL:EXT:' . $_EXTKEY . '/locallang.xml:cachingFrameworkGarbageCollection.description',
+	'title' => 'LLL:EXT:' . $_EXTKEY . '/locallang.xlf:cachingFrameworkGarbageCollection.name',
+	'description' => 'LLL:EXT:' . $_EXTKEY . '/locallang.xlf:cachingFrameworkGarbageCollection.description',
 	'additionalFields' => 'TYPO3\\CMS\\Scheduler\\Task\\CachingFrameworkGarbageCollectionAdditionalFieldProvider'
 );
 // Add file indexing task
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks']['TYPO3\\CMS\\Scheduler\\Task\\FileIndexingTask'] = array(
 	'extension' => $_EXTKEY,
-	'title' => 'LLL:EXT:' . $_EXTKEY . '/locallang.xml:fileIndexing.name',
-	'description' => 'LLL:EXT:' . $_EXTKEY . '/locallang.xml:fileIndexing.description'
+	'title' => 'LLL:EXT:' . $_EXTKEY . '/locallang.xlf:fileIndexing.name',
+	'description' => 'LLL:EXT:' . $_EXTKEY . '/locallang.xlf:fileIndexing.description'
 );
 // Add recycler directory cleanup task. Windows is not supported
 // because "filectime" does not change after moving a file
 if (TYPO3_OS != 'WIN') {
 	$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks']['TYPO3\\CMS\\Scheduler\\Task\\RecyclerGarbageCollectionTask'] = array(
 		'extension' => $_EXTKEY,
-		'title' => 'LLL:EXT:' . $_EXTKEY . '/locallang.xml:recyclerGarbageCollection.name',
-		'description' => 'LLL:EXT:' . $_EXTKEY . '/locallang.xml:recyclerGarbageCollection.description',
+		'title' => 'LLL:EXT:' . $_EXTKEY . '/locallang.xlf:recyclerGarbageCollection.name',
+		'description' => 'LLL:EXT:' . $_EXTKEY . '/locallang.xlf:recyclerGarbageCollection.description',
 		'additionalFields' => 'TYPO3\\CMS\\Scheduler\\Task\\RecyclerGarbageCollectionAdditionalFieldProvider'
 	);
 }
 // Add table garbage collection task
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks']['TYPO3\\CMS\\Scheduler\\Task\\TableGarbageCollectionTask'] = array(
 	'extension' => $_EXTKEY,
-	'title' => 'LLL:EXT:' . $_EXTKEY . '/locallang.xml:tableGarbageCollection.name',
-	'description' => 'LLL:EXT:' . $_EXTKEY . '/locallang.xml:tableGarbageCollection.description',
+	'title' => 'LLL:EXT:' . $_EXTKEY . '/locallang.xlf:tableGarbageCollection.name',
+	'description' => 'LLL:EXT:' . $_EXTKEY . '/locallang.xlf:tableGarbageCollection.description',
 	'additionalFields' => 'TYPO3\\CMS\\Scheduler\\Task\\TableGarbageCollectionAdditionalFieldProvider'
 );
 // Initialize option array of table garbage collection task if not already done by some other extension or localconf.php
diff --git a/typo3/sysext/scheduler/ext_tables.php b/typo3/sysext/scheduler/ext_tables.php
index 65fe8e632a67fbfd0971e273c709aafa2ad64a19..a443dc000671c1b4f9478f7721c87e9b379d58fe 100755
--- a/typo3/sysext/scheduler/ext_tables.php
+++ b/typo3/sysext/scheduler/ext_tables.php
@@ -9,7 +9,7 @@ if (TYPO3_MODE == 'BE') {
 	// Add context sensitive help (csh) to the backend module
 	\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr(
 		'_MOD_system_txschedulerM1',
-		'EXT:' . $_EXTKEY . '/mod1/locallang_csh_scheduler.xml'
+		'EXT:' . $_EXTKEY . '/mod1/locallang_csh_scheduler.xlf'
 	);
 
 	// Register specific icon for run task button
diff --git a/typo3/sysext/scheduler/mod1/conf.php b/typo3/sysext/scheduler/mod1/conf.php
index 7cc7d2c29b26ae871de7d3f9cefddc217c9d119a..5326b7033c2feddc01a3141cda0621f54d2c3133 100755
--- a/typo3/sysext/scheduler/mod1/conf.php
+++ b/typo3/sysext/scheduler/mod1/conf.php
@@ -1,6 +1,6 @@
 <?php
 $MLANG['default']['tabs_images']['tab'] = 'moduleicon.gif';
-$MLANG['default']['ll_ref'] = 'LLL:EXT:scheduler/mod1/locallang_mod.xml';
+$MLANG['default']['ll_ref'] = 'LLL:EXT:scheduler/mod1/locallang_mod.xlf';
 $MCONF['access'] = 'admin';
 $MCONF['script'] = '_DISPATCH';
 $MCONF['name'] = 'system_txschedulerM1';
diff --git a/typo3/sysext/scheduler/mod1/index.php b/typo3/sysext/scheduler/mod1/index.php
index e5fed9f397647e11cd0876a3b4377eb8ca2f2bd8..4e313007448db286eb75b843344669cc5832395a 100755
--- a/typo3/sysext/scheduler/mod1/index.php
+++ b/typo3/sysext/scheduler/mod1/index.php
@@ -23,7 +23,7 @@
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
 
-$LANG->includeLLFile('EXT:scheduler/mod1/locallang.xml');
+$LANG->includeLLFile('EXT:scheduler/mod1/locallang.xlf');
 $BE_USER->modAccess($MCONF, 1);
 // This checks permissions and exits if the users has no permission for entry.
 // Make instance:
diff --git a/typo3/sysext/setup/Classes/Controller/SetupModuleController.php b/typo3/sysext/setup/Classes/Controller/SetupModuleController.php
index f9e984283bc6c7004d112a12aa6419f3657b8348..e1f8c4919ef07a077923cbfd6188302b0a616f77 100644
--- a/typo3/sysext/setup/Classes/Controller/SetupModuleController.php
+++ b/typo3/sysext/setup/Classes/Controller/SetupModuleController.php
@@ -271,7 +271,7 @@ class SetupModuleController {
 	 * @todo Define visibility
 	 */
 	public function init() {
-		$GLOBALS['LANG']->includeLLFile('EXT:setup/mod/locallang.xml');
+		$GLOBALS['LANG']->includeLLFile('EXT:setup/mod/locallang.xlf');
 		$this->MCONF = $GLOBALS['MCONF'];
 		// Returns the script user - that is the REAL logged in user! ($GLOBALS[BE_USER] might be another user due to simulation!)
 		$scriptUser = $this->getRealScriptUserObj();
diff --git a/typo3/sysext/setup/ext_tables.php b/typo3/sysext/setup/ext_tables.php
index 928602232aedab013ea0b8ad9d714dc11f9cfa78..2bdd65bafde57aa175492b5b942f31bd202ecf33 100755
--- a/typo3/sysext/setup/ext_tables.php
+++ b/typo3/sysext/setup/ext_tables.php
@@ -11,7 +11,7 @@ if (TYPO3_MODE === 'BE') {
 	);
 	\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr(
 		'_MOD_user_setup',
-		'EXT:setup/locallang_csh_mod.xml'
+		'EXT:setup/locallang_csh_mod.xlf'
 	);
 }
 $GLOBALS['TYPO3_USER_SETTINGS'] = array(
@@ -21,31 +21,31 @@ $GLOBALS['TYPO3_USER_SETTINGS'] = array(
 	'columns' => array(
 		'realName' => array(
 			'type' => 'text',
-			'label' => 'LLL:EXT:setup/mod/locallang.xml:beUser_realName',
+			'label' => 'LLL:EXT:setup/mod/locallang.xlf:beUser_realName',
 			'table' => 'be_users',
 			'csh' => 'beUser_realName'
 		),
 		'email' => array(
 			'type' => 'text',
-			'label' => 'LLL:EXT:setup/mod/locallang.xml:beUser_email',
+			'label' => 'LLL:EXT:setup/mod/locallang.xlf:beUser_email',
 			'table' => 'be_users',
 			'csh' => 'beUser_email'
 		),
 		'emailMeAtLogin' => array(
 			'type' => 'check',
-			'label' => 'LLL:EXT:setup/mod/locallang.xml:emailMeAtLogin',
+			'label' => 'LLL:EXT:setup/mod/locallang.xlf:emailMeAtLogin',
 			'csh' => 'emailMeAtLogin'
 		),
 		'password' => array(
 			'type' => 'password',
-			'label' => 'LLL:EXT:setup/mod/locallang.xml:newPassword',
+			'label' => 'LLL:EXT:setup/mod/locallang.xlf:newPassword',
 			'table' => 'be_users',
 			'csh' => 'newPassword',
 			'eval' => 'md5'
 		),
 		'password2' => array(
 			'type' => 'password',
-			'label' => 'LLL:EXT:setup/mod/locallang.xml:newPasswordAgain',
+			'label' => 'LLL:EXT:setup/mod/locallang.xlf:newPasswordAgain',
 			'table' => 'be_users',
 			'csh' => 'newPasswordAgain',
 			'eval' => 'md5'
@@ -53,106 +53,106 @@ $GLOBALS['TYPO3_USER_SETTINGS'] = array(
 		'lang' => array(
 			'type' => 'select',
 			'itemsProcFunc' => 'TYPO3\\CMS\\Setup\\Controller\\SetupModuleController->renderLanguageSelect',
-			'label' => 'LLL:EXT:setup/mod/locallang.xml:language',
+			'label' => 'LLL:EXT:setup/mod/locallang.xlf:language',
 			'csh' => 'language'
 		),
 		'startModule' => array(
 			'type' => 'select',
 			'itemsProcFunc' => 'TYPO3\\CMS\\Setup\\Controller\\SetupModuleController->renderStartModuleSelect',
-			'label' => 'LLL:EXT:setup/mod/locallang.xml:startModule',
+			'label' => 'LLL:EXT:setup/mod/locallang.xlf:startModule',
 			'csh' => 'startModule'
 		),
 		'thumbnailsByDefault' => array(
 			'type' => 'check',
-			'label' => 'LLL:EXT:setup/mod/locallang.xml:showThumbs',
+			'label' => 'LLL:EXT:setup/mod/locallang.xlf:showThumbs',
 			'csh' => 'showThumbs'
 		),
 		'edit_wideDocument' => array(
 			'type' => 'check',
-			'label' => 'LLL:EXT:setup/mod/locallang.xml:edit_wideDocument',
+			'label' => 'LLL:EXT:setup/mod/locallang.xlf:edit_wideDocument',
 			'csh' => 'edit_wideDocument'
 		),
 		'titleLen' => array(
 			'type' => 'text',
-			'label' => 'LLL:EXT:setup/mod/locallang.xml:maxTitleLen',
+			'label' => 'LLL:EXT:setup/mod/locallang.xlf:maxTitleLen',
 			'csh' => 'maxTitleLen'
 		),
 		'edit_RTE' => array(
 			'type' => 'check',
-			'label' => 'LLL:EXT:setup/mod/locallang.xml:edit_RTE',
+			'label' => 'LLL:EXT:setup/mod/locallang.xlf:edit_RTE',
 			'csh' => 'edit_RTE'
 		),
 		'edit_docModuleUpload' => array(
 			'type' => 'check',
-			'label' => 'LLL:EXT:setup/mod/locallang.xml:edit_docModuleUpload',
+			'label' => 'LLL:EXT:setup/mod/locallang.xlf:edit_docModuleUpload',
 			'csh' => 'edit_docModuleUpload'
 		),
 		'showHiddenFilesAndFolders' => array(
 			'type' => 'check',
-			'label' => 'LLL:EXT:setup/mod/locallang.xml:showHiddenFilesAndFolders',
+			'label' => 'LLL:EXT:setup/mod/locallang.xlf:showHiddenFilesAndFolders',
 			'csh' => 'showHiddenFilesAndFolders'
 		),
 		'copyLevels' => array(
 			'type' => 'text',
-			'label' => 'LLL:EXT:setup/mod/locallang.xml:copyLevels',
+			'label' => 'LLL:EXT:setup/mod/locallang.xlf:copyLevels',
 			'csh' => 'copyLevels'
 		),
 		'recursiveDelete' => array(
 			'type' => 'check',
-			'label' => 'LLL:EXT:setup/mod/locallang.xml:recursiveDelete',
+			'label' => 'LLL:EXT:setup/mod/locallang.xlf:recursiveDelete',
 			'csh' => 'recursiveDelete'
 		),
 		'simulate' => array(
 			'type' => 'select',
 			'itemsProcFunc' => 'TYPO3\\CMS\\Setup\\Controller\\SetupModuleController->renderSimulateUserSelect',
-			'label' => 'LLL:EXT:setup/mod/locallang.xml:simulate',
+			'label' => 'LLL:EXT:setup/mod/locallang.xlf:simulate',
 			'csh' => 'simuser'
 		),
 		'resetConfiguration' => array(
 			'type' => 'button',
-			'label' => 'LLL:EXT:setup/mod/locallang.xml:resetConfiguration',
-			'buttonlabel' => 'LLL:EXT:setup/mod/locallang.xml:resetConfigurationShort',
+			'label' => 'LLL:EXT:setup/mod/locallang.xlf:resetConfiguration',
+			'buttonlabel' => 'LLL:EXT:setup/mod/locallang.xlf:resetConfigurationShort',
 			'csh' => 'reset',
 			'onClick' => 'if (confirm(\'%s\')) { document.getElementById(\'setValuesToDefault\').value = 1; this.form.submit(); }',
 			'onClickLabels' => array(
-				'LLL:EXT:setup/mod/locallang.xml:setToStandardQuestion'
+				'LLL:EXT:setup/mod/locallang.xlf:setToStandardQuestion'
 			)
 		),
 		'clearSessionVars' => array(
 			'type' => 'button',
 			'access' => 'admin',
-			'label' => 'LLL:EXT:setup/mod/locallang.xml:clearSessionVars',
-			'buttonlabel' => 'LLL:EXT:setup/mod/locallang.xml:clearSessionVarsShort',
+			'label' => 'LLL:EXT:setup/mod/locallang.xlf:clearSessionVars',
+			'buttonlabel' => 'LLL:EXT:setup/mod/locallang.xlf:clearSessionVarsShort',
 			'csh' => 'reset',
 			'onClick' => 'if (confirm(\'%s\')) { document.getElementById(\'clearSessionVars\').value = 1; this.form.submit(); }',
 			'onClickLabels' => array(
-				'LLL:EXT:setup/mod/locallang.xml:clearSessionVarsQuestion'
+				'LLL:EXT:setup/mod/locallang.xlf:clearSessionVarsQuestion'
 			)
 		),
 		'resizeTextareas' => array(
 			'type' => 'check',
-			'label' => 'LLL:EXT:setup/mod/locallang.xml:resizeTextareas',
+			'label' => 'LLL:EXT:setup/mod/locallang.xlf:resizeTextareas',
 			'csh' => 'resizeTextareas'
 		),
 		'resizeTextareas_Flexible' => array(
 			'type' => 'check',
-			'label' => 'LLL:EXT:setup/mod/locallang.xml:resizeTextareas_Flexible',
+			'label' => 'LLL:EXT:setup/mod/locallang.xlf:resizeTextareas_Flexible',
 			'csh' => 'resizeTextareas_Flexible'
 		),
 		'resizeTextareas_MaxHeight' => array(
 			'type' => 'text',
-			'label' => 'LLL:EXT:setup/mod/locallang.xml:flexibleTextareas_MaxHeight',
+			'label' => 'LLL:EXT:setup/mod/locallang.xlf:flexibleTextareas_MaxHeight',
 			'csh' => 'flexibleTextareas_MaxHeight'
 		),
 		'debugInWindow' => array(
 			'type' => 'check',
-			'label' => 'LLL:EXT:setup/mod/locallang.xml:debugInWindow',
+			'label' => 'LLL:EXT:setup/mod/locallang.xlf:debugInWindow',
 			'access' => 'admin'
 		)
 	),
-	'showitem' => '--div--;LLL:EXT:setup/mod/locallang.xml:personal_data,realName,email,emailMeAtLogin,password,password2,lang,
-			--div--;LLL:EXT:setup/mod/locallang.xml:opening,startModule,thumbnailsByDefault,titleLen,
-			--div--;LLL:EXT:setup/mod/locallang.xml:editFunctionsTab,edit_RTE,edit_wideDocument,edit_docModuleUpload,showHiddenFilesAndFolders,resizeTextareas,resizeTextareas_Flexible,resizeTextareas_MaxHeight,copyLevels,recursiveDelete,resetConfiguration,clearSessionVars,
-			--div--;LLL:EXT:setup/mod/locallang.xml:adminFunctions,simulate,debugInWindow'
+	'showitem' => '--div--;LLL:EXT:setup/mod/locallang.xlf:personal_data,realName,email,emailMeAtLogin,password,password2,lang,
+			--div--;LLL:EXT:setup/mod/locallang.xlf:opening,startModule,thumbnailsByDefault,titleLen,
+			--div--;LLL:EXT:setup/mod/locallang.xlf:editFunctionsTab,edit_RTE,edit_wideDocument,edit_docModuleUpload,showHiddenFilesAndFolders,resizeTextareas,resizeTextareas_Flexible,resizeTextareas_MaxHeight,copyLevels,recursiveDelete,resetConfiguration,clearSessionVars,
+			--div--;LLL:EXT:setup/mod/locallang.xlf:adminFunctions,simulate,debugInWindow'
 );
 ?>
\ No newline at end of file
diff --git a/typo3/sysext/setup/mod/conf.php b/typo3/sysext/setup/mod/conf.php
index 8370516d10167a5c5f0ff154ab6b4ce90c59a194..8941dc0d9bd45c771d2ca5f4f48bfcd821e98fbc 100755
--- a/typo3/sysext/setup/mod/conf.php
+++ b/typo3/sysext/setup/mod/conf.php
@@ -1,7 +1,7 @@
 <?php
 $MCONF['script'] = '_DISPATCH';
 $MLANG['default']['tabs_images']['tab'] = 'setup.gif';
-$MLANG['default']['ll_ref'] = 'LLL:EXT:setup/mod/locallang_mod.xml';
+$MLANG['default']['ll_ref'] = 'LLL:EXT:setup/mod/locallang_mod.xlf';
 $MCONF['access'] = 'group,user';
 $MCONF['name'] = 'user_setup';
 ?>
\ No newline at end of file
diff --git a/typo3/sysext/sv/Classes/Report/ServicesListReport.php b/typo3/sysext/sv/Classes/Report/ServicesListReport.php
index 000668de652b872fc393b23c0fbd66af94637003..ff22e61956ab16562154f2b82bd28a8b89e2c76c 100644
--- a/typo3/sysext/sv/Classes/Report/ServicesListReport.php
+++ b/typo3/sysext/sv/Classes/Report/ServicesListReport.php
@@ -45,7 +45,7 @@ class ServicesListReport implements \TYPO3\CMS\Reports\ReportInterface {
 	 */
 	public function __construct(\TYPO3\CMS\Reports\Controller\ReportController $reportsModule) {
 		$this->reportsModule = $reportsModule;
-		$GLOBALS['LANG']->includeLLFile('EXT:sv/reports/locallang.xml');
+		$GLOBALS['LANG']->includeLLFile('EXT:sv/reports/locallang.xlf');
 	}
 
 	/**
diff --git a/typo3/sysext/sv/ext_tables.php b/typo3/sysext/sv/ext_tables.php
index 72c7c5e878af4b4465a51dd669ac8b41dfc80ae9..16030adb8cc4e6c08045afc0ca6cfebc1a8b8582 100644
--- a/typo3/sysext/sv/ext_tables.php
+++ b/typo3/sysext/sv/ext_tables.php
@@ -4,8 +4,8 @@ if (!defined('TYPO3_MODE')) {
 }
 if (TYPO3_MODE == 'BE') {
 	$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['reports']['sv']['services'] = array(
-		'title' => 'LLL:EXT:sv/reports/locallang.xml:report_title',
-		'description' => 'LLL:EXT:sv/reports/locallang.xml:report_description',
+		'title' => 'LLL:EXT:sv/reports/locallang.xlf:report_title',
+		'description' => 'LLL:EXT:sv/reports/locallang.xlf:report_description',
 		'icon' => 'EXT:sv/reports/tx_sv_report.png',
 		'report' => 'TYPO3\\CMS\\Sv\\Report\\ServicesListReport'
 	);
diff --git a/typo3/sysext/sys_action/Classes/ActionTask.php b/typo3/sysext/sys_action/Classes/ActionTask.php
index 0744cb8787796cd40df15e324d53eacf3e0668e6..f47ac814ba0beb48fddad00216c58d5f64d9c03e 100644
--- a/typo3/sysext/sys_action/Classes/ActionTask.php
+++ b/typo3/sysext/sys_action/Classes/ActionTask.php
@@ -59,7 +59,7 @@ class ActionTask implements \TYPO3\CMS\Taskcenter\TaskInterface {
 	 */
 	public function __construct(\TYPO3\CMS\Taskcenter\Controller\TaskModuleController $taskObject) {
 		$this->taskObject = $taskObject;
-		$GLOBALS['LANG']->includeLLFile('EXT:sys_action/locallang.xml');
+		$GLOBALS['LANG']->includeLLFile('EXT:sys_action/locallang.xlf');
 		if (is_array($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['sys_action']['tx_sysaction_task'])) {
 			foreach ($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['sys_action']['tx_sysaction_task'] as $classRef) {
 				$this->hookObjects[] = GeneralUtility::getUserObj($classRef);
diff --git a/typo3/sysext/sys_action/toolbarmenu/class.tx_sysaction_toolbarmenu.php b/typo3/sysext/sys_action/toolbarmenu/class.tx_sysaction_toolbarmenu.php
index 20ef1cd2370593b40d4f0fae26252d5563720ac5..3cbc8f9cf52fa60fa355ad3694932b94f65d679f 100644
--- a/typo3/sysext/sys_action/toolbarmenu/class.tx_sysaction_toolbarmenu.php
+++ b/typo3/sysext/sys_action/toolbarmenu/class.tx_sysaction_toolbarmenu.php
@@ -25,7 +25,7 @@
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
 // Load the language file
-$GLOBALS['LANG']->includeLLFile('EXT:sys_action/locallang.xml');
+$GLOBALS['LANG']->includeLLFile('EXT:sys_action/locallang.xlf');
 /*
  * @deprecated since 6.0, the classname tx_sysactionToolbarMenu and this file is obsolete
  * and will be removed with 6.2. The class was renamed and is now located at:
diff --git a/typo3/sysext/t3editor/Classes/class.tx_t3editor.php b/typo3/sysext/t3editor/Classes/class.tx_t3editor.php
index 6c01001833b61128b9ce61db74a759dd39e3ace7..828cdcdd4243c6ca115385bd5f931b7a5362ac4f 100644
--- a/typo3/sysext/t3editor/Classes/class.tx_t3editor.php
+++ b/typo3/sysext/t3editor/Classes/class.tx_t3editor.php
@@ -24,7 +24,7 @@
  *
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
-$GLOBALS['LANG']->includeLLFile('EXT:t3editor/locallang.xml');
+$GLOBALS['LANG']->includeLLFile('EXT:t3editor/locallang.xlf');
 /*
  * @deprecated since 6.0, the classname tx_t3editor and this file is obsolete
  * and will be removed with 6.2. The class was renamed and is now located at:
diff --git a/typo3/sysext/t3editor/Classes/ts_codecompletion/class.tx_t3editor_codecompletion.php b/typo3/sysext/t3editor/Classes/ts_codecompletion/class.tx_t3editor_codecompletion.php
index 224430b0f042cc6965b175b3db3d0ec361cf6d48..279976bb1bc357039d090348156ce7ada68967c5 100644
--- a/typo3/sysext/t3editor/Classes/ts_codecompletion/class.tx_t3editor_codecompletion.php
+++ b/typo3/sysext/t3editor/Classes/ts_codecompletion/class.tx_t3editor_codecompletion.php
@@ -24,7 +24,7 @@
  *
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
-$GLOBALS['LANG']->includeLLFile('EXT:t3editor/locallang.xml');
+$GLOBALS['LANG']->includeLLFile('EXT:t3editor/locallang.xlf');
 /*
  * @deprecated since 6.0, the classname tx_t3editor_codecompletion and this file is obsolete
  * and will be removed with 6.2. The class was renamed and is now located at:
diff --git a/typo3/sysext/t3editor/Classes/ts_codecompletion/class.tx_t3editor_tsrefloader.php b/typo3/sysext/t3editor/Classes/ts_codecompletion/class.tx_t3editor_tsrefloader.php
index aa55b2588cf8e16d0923891aac5a6b2fdc05159c..54a7fdb85842dba4161d5f066a8fa9a19eb7fd85 100644
--- a/typo3/sysext/t3editor/Classes/ts_codecompletion/class.tx_t3editor_tsrefloader.php
+++ b/typo3/sysext/t3editor/Classes/ts_codecompletion/class.tx_t3editor_tsrefloader.php
@@ -24,7 +24,7 @@
  *
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
-$GLOBALS['LANG']->includeLLFile('EXT:t3editor/locallang.xml');
+$GLOBALS['LANG']->includeLLFile('EXT:t3editor/locallang.xlf');
 /*
  * @deprecated since 6.0, the classname tx_t3editor_TSrefLoader and this file is obsolete
  * and will be removed with 6.2. The class was renamed and is now located at:
diff --git a/typo3/sysext/t3editor/ext_tables.php b/typo3/sysext/t3editor/ext_tables.php
index cc04e1c26f21ca7fff6eacd90f26b0cb22a787ff..f166e04c54287db2b13c3d0d266e55dd3f2f41e5 100644
--- a/typo3/sysext/t3editor/ext_tables.php
+++ b/typo3/sysext/t3editor/ext_tables.php
@@ -23,6 +23,6 @@ if (TYPO3_MODE === 'BE') {
 		)
 	);
 	// Activate the t3editor only for type html
-	$TCA['tt_content']['types']['html']['showitem'] = str_replace('bodytext,', 'bodytext;LLL:EXT:cms/locallang_ttc.xml:bodytext.ALT.html_formlabel;;nowrap:wizards[t3editor],', $TCA['tt_content']['types']['html']['showitem']);
+	$TCA['tt_content']['types']['html']['showitem'] = str_replace('bodytext,', 'bodytext;LLL:EXT:cms/locallang_ttc.xlf:bodytext.ALT.html_formlabel;;nowrap:wizards[t3editor],', $TCA['tt_content']['types']['html']['showitem']);
 }
 ?>
\ No newline at end of file
diff --git a/typo3/sysext/taskcenter/Classes/Controller/TaskModuleController.php b/typo3/sysext/taskcenter/Classes/Controller/TaskModuleController.php
index e78e7916e18ad564ddcc124d01d7d0a50b69c63f..97ca09864e378082f34affb70a8b629d42ae2c85 100644
--- a/typo3/sysext/taskcenter/Classes/Controller/TaskModuleController.php
+++ b/typo3/sysext/taskcenter/Classes/Controller/TaskModuleController.php
@@ -57,7 +57,7 @@ class TaskModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
 	 */
 	public function menuConfig() {
 		$this->MOD_MENU = array('mode' => array());
-		$this->MOD_MENU['mode']['information'] = $GLOBALS['LANG']->sL('LLL:EXT:taskcenter/locallang.xml:task_overview');
+		$this->MOD_MENU['mode']['information'] = $GLOBALS['LANG']->sL('LLL:EXT:taskcenter/locallang.xlf:task_overview');
 		$this->MOD_MENU['mode']['tasks'] = 'Tasks';
 		parent::menuConfig();
 	}
@@ -141,7 +141,7 @@ class TaskModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
 				$actionContent .= $flashMessage->render();
 			}
 		} else {
-			$flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage', $GLOBALS['LANG']->sL('LLL:EXT:taskcenter/task/locallang_mod.xml:mlang_labels_tabdescr'), $GLOBALS['LANG']->sL('LLL:EXT:taskcenter/task/locallang_mod.xml:mlang_tabs_tab'), \TYPO3\CMS\Core\Messaging\FlashMessage::INFO);
+			$flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage', $GLOBALS['LANG']->sL('LLL:EXT:taskcenter/task/locallang_mod.xlf:mlang_labels_tabdescr'), $GLOBALS['LANG']->sL('LLL:EXT:taskcenter/task/locallang_mod.xlf:mlang_tabs_tab'), \TYPO3\CMS\Core\Messaging\FlashMessage::INFO);
 			$actionContent .= $flashMessage->render();
 		}
 		$content = '<div id="taskcenter-main">
@@ -158,7 +158,7 @@ class TaskModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
 	 * @return void
 	 */
 	protected function renderInformationContent() {
-		$content = $this->description($GLOBALS['LANG']->getLL('mlang_tabs_tab'), $GLOBALS['LANG']->sL('LLL:EXT:taskcenter/task/locallang_mod.xml:mlang_labels_tabdescr'));
+		$content = $this->description($GLOBALS['LANG']->getLL('mlang_tabs_tab'), $GLOBALS['LANG']->sL('LLL:EXT:taskcenter/task/locallang_mod.xlf:mlang_labels_tabdescr'));
 		$content .= $GLOBALS['LANG']->getLL('taskcenter-about');
 		if ($GLOBALS['BE_USER']->isAdmin()) {
 			$content .= '<br /><br />' . $this->description($GLOBALS['LANG']->getLL('taskcenter-adminheader'), $GLOBALS['LANG']->getLL('taskcenter-admin'));
diff --git a/typo3/sysext/version/Classes/ClickMenu/VersionClickMenu.php b/typo3/sysext/version/Classes/ClickMenu/VersionClickMenu.php
index 7f19c6472dd9ab160caba6cb9a709790800daebd..330896ec45e6f96c2dd0adb40ced9946c7cc3657 100644
--- a/typo3/sysext/version/Classes/ClickMenu/VersionClickMenu.php
+++ b/typo3/sysext/version/Classes/ClickMenu/VersionClickMenu.php
@@ -75,7 +75,7 @@ class VersionClickMenu {
 	 * @todo Define visibility
 	 */
 	public function includeLL() {
-		return $GLOBALS['LANG']->includeLLFile('EXT:version/locallang.xml', FALSE);
+		return $GLOBALS['LANG']->includeLLFile('EXT:version/locallang.xlf', FALSE);
 	}
 
 }
diff --git a/typo3/sysext/version/Classes/Controller/VersionModuleController.php b/typo3/sysext/version/Classes/Controller/VersionModuleController.php
index 975167fd5e2d6873723885bef5f80b21b49ed85d..4c396d67e052bc7d3665c4c06ebe73b5739f11a1 100644
--- a/typo3/sysext/version/Classes/Controller/VersionModuleController.php
+++ b/typo3/sysext/version/Classes/Controller/VersionModuleController.php
@@ -270,7 +270,7 @@ class VersionModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass
 		// CSH
 		if ($this->recordFound && $GLOBALS['TCA'][$this->table]['ctrl']['versioningWS']) {
 			// View page
-			$buttons['view'] = '<a href="#" onclick="' . htmlspecialchars(BackendUtility::viewOnClick($this->pageinfo['uid'], $GLOBALS['BACK_PATH'], BackendUtility::BEgetRootLine($this->pageinfo['uid']))) . '" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.showPage', TRUE) . '">' . IconUtility::getSpriteIcon('actions-document-view') . '</a>';
+			$buttons['view'] = '<a href="#" onclick="' . htmlspecialchars(BackendUtility::viewOnClick($this->pageinfo['uid'], $GLOBALS['BACK_PATH'], BackendUtility::BEgetRootLine($this->pageinfo['uid']))) . '" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.showPage', TRUE) . '">' . IconUtility::getSpriteIcon('actions-document-view') . '</a>';
 			// Shortcut
 			if ($GLOBALS['BE_USER']->mayMakeShortcut()) {
 				$buttons['shortcut'] = $this->doc->makeShortcutIcon('id, edit_record, pointer, new_unique_uid, search_field, search_levels, showLimit', implode(',', array_keys($this->MOD_MENU)), $this->MCONF['name']);
@@ -279,7 +279,7 @@ class VersionModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass
 			$buttons['record_list'] = BackendUtility::getListViewLink(array(
 				'id' => $this->pageinfo['uid'],
 				'returnUrl' => GeneralUtility::getIndpEnv('REQUEST_URI')
-			), '', $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.showList'));
+			), '', $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.showList'));
 		}
 		return $buttons;
 	}
@@ -382,7 +382,7 @@ class VersionModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass
 					<td>' . $row['t3ver_stage'] . '</td>
 					<td>' . $row['t3ver_count'] . '</td>
 					<td>' . $row['pid'] . '</td>
-					<td nowrap="nowrap"><a href="#" onclick="' . htmlspecialchars(BackendUtility::editOnClick(('&edit[' . $this->table . '][' . $row['uid'] . ']=edit&columnsOnly=t3ver_label'), $this->doc->backPath)) . '" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:cm.edit', TRUE) . '">' . IconUtility::getSpriteIcon('actions-document-open') . '</a>' . htmlspecialchars($row['t3ver_label']) . '</td>
+					<td nowrap="nowrap"><a href="#" onclick="' . htmlspecialchars(BackendUtility::editOnClick(('&edit[' . $this->table . '][' . $row['uid'] . ']=edit&columnsOnly=t3ver_label'), $this->doc->backPath)) . '" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:cm.edit', TRUE) . '">' . IconUtility::getSpriteIcon('actions-document-open') . '</a>' . htmlspecialchars($row['t3ver_label']) . '</td>
 					<td class="version-diff-1"><input type="radio" name="diff_1" value="' . $row['uid'] . '"' . ($diff_1 == $row['uid'] ? ' checked="checked"' : '') . '/></td>
 					<td class="version-diff-2"><input type="radio" name="diff_2" value="' . $row['uid'] . '"' . ($diff_2 == $row['uid'] ? ' checked="checked"' : '') . '/></td>
 				</tr>';
@@ -491,9 +491,9 @@ class VersionModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass
 	 */
 	public function adminLinks($table, $row) {
 		// Edit link:
-		$adminLink = '<a href="#" onclick="' . htmlspecialchars(BackendUtility::editOnClick(('&edit[' . $table . '][' . $row['uid'] . ']=edit'), $this->doc->backPath)) . '" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:cm.edit', TRUE) . '">' . IconUtility::getSpriteIcon('actions-document-open') . '</a>';
+		$adminLink = '<a href="#" onclick="' . htmlspecialchars(BackendUtility::editOnClick(('&edit[' . $table . '][' . $row['uid'] . ']=edit'), $this->doc->backPath)) . '" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:cm.edit', TRUE) . '">' . IconUtility::getSpriteIcon('actions-document-open') . '</a>';
 		// Delete link:
-		$adminLink .= '<a href="' . htmlspecialchars($this->doc->issueCommand(('&cmd[' . $table . '][' . $row['uid'] . '][delete]=1'))) . '" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:cm.delete', TRUE) . '">' . IconUtility::getSpriteIcon('actions-edit-delete') . '</a>';
+		$adminLink .= '<a href="' . htmlspecialchars($this->doc->issueCommand(('&cmd[' . $table . '][' . $row['uid'] . '][delete]=1'))) . '" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:cm.delete', TRUE) . '">' . IconUtility::getSpriteIcon('actions-edit-delete') . '</a>';
 		if ($table == 'pages') {
 			// If another page module was specified, replace the default Page module with the new one
 			$newPageModule = trim($GLOBALS['BE_USER']->getTSConfigVal('options.overridePageModule'));
diff --git a/typo3/sysext/version/Classes/Hook/DataHandlerHook.php b/typo3/sysext/version/Classes/Hook/DataHandlerHook.php
index 3f7c92f558f56db8ea47568b3dd12fbb341f7536..35a0f937abba0238a0022f359b4905856947b5de 100644
--- a/typo3/sysext/version/Classes/Hook/DataHandlerHook.php
+++ b/typo3/sysext/version/Classes/Hook/DataHandlerHook.php
@@ -850,9 +850,9 @@ class DataHandlerHook {
 											// Set log entry for live record:
 											$propArr = $tcemainObj->getRecordPropertiesFromRow($table, $swapVersion);
 											if ($propArr['_ORIG_pid'] == -1) {
-												$label = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_tcemain.xml:version_swap.offline_record_updated');
+												$label = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_tcemain.xlf:version_swap.offline_record_updated');
 											} else {
-												$label = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_tcemain.xml:version_swap.online_record_updated');
+												$label = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_tcemain.xlf:version_swap.online_record_updated');
 											}
 											$theLogId = $tcemainObj->log($table, $id, 2, $propArr['pid'], 0, $label, 10, array($propArr['header'], $table . ':' . $id), $propArr['event_pid']);
 											$tcemainObj->setHistory($table, $id, $theLogId);
@@ -861,9 +861,9 @@ class DataHandlerHook {
 											// Set log entry for offline record:
 											$propArr = $tcemainObj->getRecordPropertiesFromRow($table, $curVersion);
 											if ($propArr['_ORIG_pid'] == -1) {
-												$label = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_tcemain.xml:version_swap.offline_record_updated');
+												$label = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_tcemain.xlf:version_swap.offline_record_updated');
 											} else {
-												$label = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_tcemain.xml:version_swap.online_record_updated');
+												$label = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_tcemain.xlf:version_swap.online_record_updated');
 											}
 											$theLogId = $tcemainObj->log($table, $swapWith, 2, $propArr['pid'], 0, $label, 10, array($propArr['header'], $table . ':' . $swapWith), $propArr['event_pid']);
 											$tcemainObj->setHistory($table, $swapWith, $theLogId);
diff --git a/typo3/sysext/version/Classes/View/VersionView.php b/typo3/sysext/version/Classes/View/VersionView.php
index 01a5512c5fda79704f472049df889cdfc73316b2..0436b034d666b10e24ef065742cef1a6bc23d64c 100644
--- a/typo3/sysext/version/Classes/View/VersionView.php
+++ b/typo3/sysext/version/Classes/View/VersionView.php
@@ -56,30 +56,30 @@ class VersionView {
 			$versions = \TYPO3\CMS\Backend\Utility\BackendUtility::selectVersionsOfRecord('pages', $onlineId, 'uid,pid,t3ver_label,t3ver_oid,t3ver_wsid,t3ver_id');
 			// If more than one was found...:
 			if (count($versions) > 1) {
-				$selectorLabel = '<strong>' . $GLOBALS['LANG']->sL('LLL:EXT:version/locallang.xml:versionSelect.label', TRUE) . '</strong>';
+				$selectorLabel = '<strong>' . $GLOBALS['LANG']->sL('LLL:EXT:version/locallang.xlf:versionSelect.label', TRUE) . '</strong>';
 				// Create selector box entries:
 				$opt = array();
 				foreach ($versions as $vRow) {
 					if ($vRow['uid'] == $onlineId) {
 						// Live version
-						$label = '[' . $GLOBALS['LANG']->sL('LLL:EXT:version/locallang.xml:versionSelect.live', TRUE) . ']';
+						$label = '[' . $GLOBALS['LANG']->sL('LLL:EXT:version/locallang.xlf:versionSelect.live', TRUE) . ']';
 					} else {
-						$label = $vRow['t3ver_label'] . ' (' . $GLOBALS['LANG']->sL('LLL:EXT:version/locallang.xml:versionId', TRUE) . ' ' . $vRow['t3ver_id'] . ($vRow['t3ver_wsid'] != 0 ? ' ' . $GLOBALS['LANG']->sL('LLL:EXT:version/locallang.xml:workspaceId', TRUE) . ' ' . $vRow['t3ver_wsid'] : '') . ')';
+						$label = $vRow['t3ver_label'] . ' (' . $GLOBALS['LANG']->sL('LLL:EXT:version/locallang.xlf:versionId', TRUE) . ' ' . $vRow['t3ver_id'] . ($vRow['t3ver_wsid'] != 0 ? ' ' . $GLOBALS['LANG']->sL('LLL:EXT:version/locallang.xlf:workspaceId', TRUE) . ' ' . $vRow['t3ver_wsid'] : '') . ')';
 					}
 					$opt[] = '<option value="' . htmlspecialchars(\TYPO3\CMS\Core\Utility\GeneralUtility::linkThisScript(array('id' => $vRow['uid']))) . '"' . ($id == $vRow['uid'] ? ' selected="selected"' : '') . '>' . htmlspecialchars($label) . '</option>';
 				}
 				// Add management link:
-				$management = '<input type="button" value="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:ver.mgm', TRUE) . '" onclick="window.location.href=\'' . htmlspecialchars(($GLOBALS['BACK_PATH'] . \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('version') . 'cm1/index.php?table=pages&uid=' . $onlineId)) . '\';" />';
+				$management = '<input type="button" value="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:ver.mgm', TRUE) . '" onclick="window.location.href=\'' . htmlspecialchars(($GLOBALS['BACK_PATH'] . \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('version') . 'cm1/index.php?table=pages&uid=' . $onlineId)) . '\';" />';
 				// Create onchange handler:
 				$onChange = 'window.location.href=this.options[this.selectedIndex].value;';
 				// Controls:
 				if ($id == $onlineId) {
-					$controls .= '<img' . \TYPO3\CMS\Backend\Utility\IconUtility::skinImg($GLOBALS['BACK_PATH'], 'gfx/blinkarrow_left.gif', 'width="5" height="9"') . ' class="absmiddle" alt="" /> <strong>' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:ver.online', TRUE) . '</strong>';
+					$controls .= '<img' . \TYPO3\CMS\Backend\Utility\IconUtility::skinImg($GLOBALS['BACK_PATH'], 'gfx/blinkarrow_left.gif', 'width="5" height="9"') . ' class="absmiddle" alt="" /> <strong>' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:ver.online', TRUE) . '</strong>';
 				} elseif (!$noAction) {
 					$controls .= '<a href="' . $GLOBALS['TBE_TEMPLATE']->issueCommand(('&cmd[pages][' . $onlineId . '][version][swapWith]=' . $id . '&cmd[pages][' . $onlineId . '][version][action]=swap'), \TYPO3\CMS\Core\Utility\GeneralUtility::linkThisScript(array('id' => $onlineId))) . '" class="nobr">' . \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIcon('actions-version-swap-version', array(
-						'title' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:ver.swapPage', TRUE),
+						'title' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:ver.swapPage', TRUE),
 						'style' => 'margin-left:5px;vertical-align:bottom;'
-					)) . '<strong>' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:ver.swap', TRUE) . '</strong></a>';
+					)) . '<strong>' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:ver.swap', TRUE) . '</strong></a>';
 				}
 				// Write out HTML code:
 				return '
diff --git a/typo3/sysext/version/cm1/conf.php b/typo3/sysext/version/cm1/conf.php
index 9d47ed9132a51d2889ab5618b3994f00e66cf45e..b74d6ae71322dbbd0dceec1b2bf4998e756275fb 100755
--- a/typo3/sysext/version/cm1/conf.php
+++ b/typo3/sysext/version/cm1/conf.php
@@ -4,7 +4,7 @@ define('TYPO3_MOD_PATH', 'sysext/version/cm1/');
 $BACK_PATH = '../../../';
 $MCONF['name'] = 'web_txversionM1';
 $MLANG['default']['tabs_images']['tab'] = 'cm_icon.gif';
-$MLANG['default']['ll_ref'] = 'LLL:EXT:version/locallang.xml';
+$MLANG['default']['ll_ref'] = 'LLL:EXT:version/locallang.xlf';
 $MCONF['script'] = 'index.php';
 $MCONF['access'] = 'user,group';
 ?>
\ No newline at end of file
diff --git a/typo3/sysext/version/cm1/index.php b/typo3/sysext/version/cm1/index.php
index 5ebf7ec3ebf0f23db34228a5b88cedf5eab724de..768437dc283b4df635cface46367566c4c23327e 100755
--- a/typo3/sysext/version/cm1/index.php
+++ b/typo3/sysext/version/cm1/index.php
@@ -25,7 +25,7 @@
 unset($MCONF);
 require 'conf.php';
 require $BACK_PATH . 'init.php';
-$GLOBALS['LANG']->includeLLFile('EXT:version/locallang.xml');
+$GLOBALS['LANG']->includeLLFile('EXT:version/locallang.xlf');
 $SOBE = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Version\\Controller\\VersionModuleController');
 $SOBE->init();
 $SOBE->main();
diff --git a/typo3/sysext/version/ext_localconf.php b/typo3/sysext/version/ext_localconf.php
index 8702362fb5254c97437941bf265d33204d396180..2ef42398c520d4167cabc62e04c026142bcf80aa 100644
--- a/typo3/sysext/version/ext_localconf.php
+++ b/typo3/sysext/version/ext_localconf.php
@@ -17,8 +17,8 @@ $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/index_ts.php']['postBeUser']['v
 if (TYPO3_MODE == 'BE') {
 	// add default notification options to every page
 	\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPageTSconfig('
-	tx_version.workspaces.stageNotificationEmail.subject = LLL:EXT:version/Resources/Private/Language/locallang_emails.xml:subject
-	tx_version.workspaces.stageNotificationEmail.message = LLL:EXT:version/Resources/Private/Language/locallang_emails.xml:message
+	tx_version.workspaces.stageNotificationEmail.subject = LLL:EXT:version/Resources/Private/Language/locallang_emails.xlf:subject
+	tx_version.workspaces.stageNotificationEmail.message = LLL:EXT:version/Resources/Private/Language/locallang_emails.xlf:message
 	# tx_version.workspaces.stageNotificationEmail.additionalHeaders =
 ');
 }
diff --git a/typo3/sysext/wizard_sortpages/ext_tables.php b/typo3/sysext/wizard_sortpages/ext_tables.php
index 9c07c4984179f3615f787efe292b41ff0fa707c5..e13e34398f396827822a89f8f1942f86f441fc22 100755
--- a/typo3/sysext/wizard_sortpages/ext_tables.php
+++ b/typo3/sysext/wizard_sortpages/ext_tables.php
@@ -7,7 +7,7 @@ if (TYPO3_MODE === 'BE') {
 		'web_func',
 		'TYPO3\\CMS\\WizardSortPages\\View\\SortPagesWizardModuleFunction',
 		\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'Classes/View/SortPagesWizardModuleFunction.php',
-		'LLL:EXT:wizard_sortpages/locallang.php:wiz_sort',
+		'LLL:EXT:wizard_sortpages/locallang.xlf:wiz_sort',
 		'wiz'
 	);
 	\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr(
diff --git a/typo3/sysext/workspaces/Classes/Controller/AbstractController.php b/typo3/sysext/workspaces/Classes/Controller/AbstractController.php
index 6e5ac75ac81bde9ca38f68d59633bbc82f4a2a44..500ea8155c8562114dc5297dec1af9d47c68b549 100644
--- a/typo3/sysext/workspaces/Classes/Controller/AbstractController.php
+++ b/typo3/sysext/workspaces/Classes/Controller/AbstractController.php
@@ -72,17 +72,17 @@ class AbstractController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionControl
 		$this->pageRenderer->addCssFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('workspaces') . 'Resources/Public/StyleSheet/module.css');
 		$this->pageRenderer->addInlineLanguageLabelArray(array(
 			'title' => $GLOBALS['LANG']->getLL('title'),
-			'path' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:labels.path'),
-			'table' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:labels.table'),
-			'depth' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_web_perm.xml:Depth'),
-			'depth_0' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:labels.depth_0'),
-			'depth_1' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:labels.depth_1'),
-			'depth_2' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:labels.depth_2'),
-			'depth_3' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:labels.depth_3'),
-			'depth_4' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:labels.depth_4'),
-			'depth_infi' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:labels.depth_infi')
+			'path' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.path'),
+			'table' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.table'),
+			'depth' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_web_perm.xlf:Depth'),
+			'depth_0' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_0'),
+			'depth_1' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_1'),
+			'depth_2' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_2'),
+			'depth_3' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_3'),
+			'depth_4' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_4'),
+			'depth_infi' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_infi')
 		));
-		$this->pageRenderer->addInlineLanguageLabelFile('EXT:workspaces/Resources/Private/Language/locallang.xml');
+		$this->pageRenderer->addInlineLanguageLabelFile('EXT:workspaces/Resources/Private/Language/locallang.xlf');
 	}
 
 	/**
@@ -99,7 +99,7 @@ class AbstractController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionControl
 		$GLOBALS['SOBE'] = new \stdClass();
 		$GLOBALS['SOBE']->doc = $this->template;
 		parent::processRequest($request, $response);
-		$pageHeader = $this->template->startpage($GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang.xml:module.title'));
+		$pageHeader = $this->template->startpage($GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang.xlf:module.title'));
 		$pageEnd = $this->template->endPage();
 		$response->setContent($pageHeader . $response->getContent() . $pageEnd);
 	}
diff --git a/typo3/sysext/workspaces/Classes/Controller/PreviewController.php b/typo3/sysext/workspaces/Classes/Controller/PreviewController.php
index 8af0fcc3bbf941ffcfef38158eaad8d9455acf2e..6ce6641bc9366a0813a220f39e489e885d982639 100644
--- a/typo3/sysext/workspaces/Classes/Controller/PreviewController.php
+++ b/typo3/sysext/workspaces/Classes/Controller/PreviewController.php
@@ -147,16 +147,16 @@ class PreviewController extends \TYPO3\CMS\Workspaces\Controller\AbstractControl
 		$this->pageRenderer->addJsFile($resourcePath . 'Typo3Lang.js');
 		$this->pageRenderer->addJsInlineCode('workspaces.preview.lll', '
 		TYPO3.lang = {
-			visualPreview: ' . Utility\GeneralUtility::quoteJSvalue($GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang.xml:preview.visualPreview', TRUE)) . ',
-			listView: ' . Utility\GeneralUtility::quoteJSvalue($GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang.xml:preview.listView', TRUE)) . ',
-			livePreview: ' . Utility\GeneralUtility::quoteJSvalue($GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang.xml:preview.livePreview', TRUE)) . ',
-			livePreviewDetail: ' . Utility\GeneralUtility::quoteJSvalue($GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang.xml:preview.livePreviewDetail', TRUE)) . ',
-			workspacePreview: ' . Utility\GeneralUtility::quoteJSvalue($GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang.xml:preview.workspacePreview', TRUE)) . ',
-			workspacePreviewDetail: ' . Utility\GeneralUtility::quoteJSvalue($GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang.xml:preview.workspacePreviewDetail', TRUE)) . ',
-			modeSlider: ' . Utility\GeneralUtility::quoteJSvalue($GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang.xml:preview.modeSlider', TRUE)) . ',
-			modeVbox: ' . Utility\GeneralUtility::quoteJSvalue($GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang.xml:preview.modeVbox', TRUE)) . ',
-			modeHbox: ' . Utility\GeneralUtility::quoteJSvalue($GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang.xml:preview.modeHbox', TRUE)) . ',
-			discard: ' . Utility\GeneralUtility::quoteJSvalue($GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang.xml:label_doaction_discard', TRUE)) . ',
+			visualPreview: ' . Utility\GeneralUtility::quoteJSvalue($GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang.xlf:preview.visualPreview', TRUE)) . ',
+			listView: ' . Utility\GeneralUtility::quoteJSvalue($GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang.xlf:preview.listView', TRUE)) . ',
+			livePreview: ' . Utility\GeneralUtility::quoteJSvalue($GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang.xlf:preview.livePreview', TRUE)) . ',
+			livePreviewDetail: ' . Utility\GeneralUtility::quoteJSvalue($GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang.xlf:preview.livePreviewDetail', TRUE)) . ',
+			workspacePreview: ' . Utility\GeneralUtility::quoteJSvalue($GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang.xlf:preview.workspacePreview', TRUE)) . ',
+			workspacePreviewDetail: ' . Utility\GeneralUtility::quoteJSvalue($GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang.xlf:preview.workspacePreviewDetail', TRUE)) . ',
+			modeSlider: ' . Utility\GeneralUtility::quoteJSvalue($GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang.xlf:preview.modeSlider', TRUE)) . ',
+			modeVbox: ' . Utility\GeneralUtility::quoteJSvalue($GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang.xlf:preview.modeVbox', TRUE)) . ',
+			modeHbox: ' . Utility\GeneralUtility::quoteJSvalue($GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang.xlf:preview.modeHbox', TRUE)) . ',
+			discard: ' . Utility\GeneralUtility::quoteJSvalue($GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang.xlf:label_doaction_discard', TRUE)) . ',
 			nextStage: ' . Utility\GeneralUtility::quoteJSvalue($nextStage['title']) . ',
 			previousStage: ' . Utility\GeneralUtility::quoteJSvalue($previousStage['title']) . '
 		};TYPO3.l10n.initialize();
@@ -180,7 +180,7 @@ class PreviewController extends \TYPO3\CMS\Workspaces\Controller\AbstractControl
 	 * @return void
 	 */
 	public function newPageAction() {
-		$flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage', $GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang.xml:info.newpage.detail'), $GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang.xml:info.newpage'), \TYPO3\CMS\Core\Messaging\FlashMessage::INFO);
+		$flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage', $GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang.xlf:info.newpage.detail'), $GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang.xlf:info.newpage'), \TYPO3\CMS\Core\Messaging\FlashMessage::INFO);
 		/** @var $flashMessageService \TYPO3\CMS\Core\Messaging\FlashMessageService */
 		$flashMessageService = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessageService');
 		/** @var $defaultFlashMessageQueue \TYPO3\CMS\Core\Messaging\FlashMessageQueue */
@@ -238,34 +238,34 @@ class PreviewController extends \TYPO3\CMS\Workspaces\Controller\AbstractControl
 			)
 		);
 		$t3LLLcore = array(
-			'waitTitle' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:mess.refresh_login_logging_in'),
-			'refresh_login_failed' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:mess.refresh_login_failed'),
-			'refresh_login_failed_message' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:mess.refresh_login_failed_message'),
-			'refresh_login_title' => sprintf($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:mess.refresh_login_title'), htmlspecialchars($GLOBALS['BE_USER']->user['username'])),
-			'login_expired' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:mess.login_expired'),
-			'refresh_login_username' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:mess.refresh_login_username'),
-			'refresh_login_password' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:mess.refresh_login_password'),
-			'refresh_login_emptyPassword' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:mess.refresh_login_emptyPassword'),
-			'refresh_login_button' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:mess.refresh_login_button'),
-			'refresh_logout_button' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:mess.refresh_logout_button'),
-			'please_wait' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:mess.please_wait'),
-			'loadingIndicator' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:loadingIndicator'),
-			'be_locked' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:mess.be_locked'),
-			'refresh_login_countdown_singular' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:mess.refresh_login_countdown_singular'),
-			'refresh_login_countdown' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:mess.refresh_login_countdown'),
-			'login_about_to_expire' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:mess.login_about_to_expire'),
-			'login_about_to_expire_title' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:mess.login_about_to_expire_title'),
-			'refresh_login_refresh_button' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:mess.refresh_login_refresh_button'),
-			'refresh_direct_logout_button' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:mess.refresh_direct_logout_button'),
-			'tabs_closeAll' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:tabs.closeAll'),
-			'tabs_closeOther' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:tabs.closeOther'),
-			'tabs_close' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:tabs.close'),
-			'tabs_openInBrowserWindow' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:tabs.openInBrowserWindow'),
-			'donateWindow_title' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:donateWindow.title'),
-			'donateWindow_message' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:donateWindow.message'),
-			'donateWindow_button_donate' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:donateWindow.button_donate'),
-			'donateWindow_button_disable' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:donateWindow.button_disable'),
-			'donateWindow_button_postpone' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:donateWindow.button_postpone')
+			'waitTitle' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:mess.refresh_login_logging_in'),
+			'refresh_login_failed' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:mess.refresh_login_failed'),
+			'refresh_login_failed_message' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:mess.refresh_login_failed_message'),
+			'refresh_login_title' => sprintf($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:mess.refresh_login_title'), htmlspecialchars($GLOBALS['BE_USER']->user['username'])),
+			'login_expired' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:mess.login_expired'),
+			'refresh_login_username' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:mess.refresh_login_username'),
+			'refresh_login_password' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:mess.refresh_login_password'),
+			'refresh_login_emptyPassword' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:mess.refresh_login_emptyPassword'),
+			'refresh_login_button' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:mess.refresh_login_button'),
+			'refresh_logout_button' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:mess.refresh_logout_button'),
+			'please_wait' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:mess.please_wait'),
+			'loadingIndicator' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:loadingIndicator'),
+			'be_locked' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:mess.be_locked'),
+			'refresh_login_countdown_singular' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:mess.refresh_login_countdown_singular'),
+			'refresh_login_countdown' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:mess.refresh_login_countdown'),
+			'login_about_to_expire' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:mess.login_about_to_expire'),
+			'login_about_to_expire_title' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:mess.login_about_to_expire_title'),
+			'refresh_login_refresh_button' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:mess.refresh_login_refresh_button'),
+			'refresh_direct_logout_button' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:mess.refresh_direct_logout_button'),
+			'tabs_closeAll' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:tabs.closeAll'),
+			'tabs_closeOther' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:tabs.closeOther'),
+			'tabs_close' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:tabs.close'),
+			'tabs_openInBrowserWindow' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:tabs.openInBrowserWindow'),
+			'donateWindow_title' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:donateWindow.title'),
+			'donateWindow_message' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:donateWindow.message'),
+			'donateWindow_button_donate' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:donateWindow.button_donate'),
+			'donateWindow_button_disable' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:donateWindow.button_disable'),
+			'donateWindow_button_postpone' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:donateWindow.button_postpone')
 		);
 		$js = '
 		TYPO3.configuration = ' . json_encode($t3Configuration) . ';
diff --git a/typo3/sysext/workspaces/Classes/Controller/ReviewController.php b/typo3/sysext/workspaces/Classes/Controller/ReviewController.php
index 8d5613e39d5ce450ea976c4f4cb9ed8f06594c86..328f737653fff16db9e625d3bad6d212e356d0e6 100644
--- a/typo3/sysext/workspaces/Classes/Controller/ReviewController.php
+++ b/typo3/sysext/workspaces/Classes/Controller/ReviewController.php
@@ -132,7 +132,7 @@ class ReviewController extends \TYPO3\CMS\Workspaces\Controller\AbstractControll
 		parent::initializeAction();
 		$this->template->setExtDirectStateProvider();
 		if (\TYPO3\CMS\Workspaces\Service\WorkspaceService::isOldStyleWorkspaceUsed()) {
-			$flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage', $GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang.xml:warning.oldStyleWorkspaceInUser'), '', \TYPO3\CMS\Core\Messaging\FlashMessage::WARNING);
+			$flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage', $GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang.xlf:warning.oldStyleWorkspaceInUser'), '', \TYPO3\CMS\Core\Messaging\FlashMessage::WARNING);
 			/** @var $flashMessageService \TYPO3\CMS\Core\Messaging\FlashMessageService */
 			$flashMessageService = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessageService');
 			/** @var $defaultFlashMessageQueue \TYPO3\CMS\Core\Messaging\FlashMessageQueue */
diff --git a/typo3/sysext/workspaces/Classes/ExtDirect/AbstractHandler.php b/typo3/sysext/workspaces/Classes/ExtDirect/AbstractHandler.php
index 4e9c122b9f2508c6fd93928b2e89b4ed8f4abbf9..959589b4dc68982785858d8c05f1cb8e6536ca03 100644
--- a/typo3/sysext/workspaces/Classes/ExtDirect/AbstractHandler.php
+++ b/typo3/sysext/workspaces/Classes/ExtDirect/AbstractHandler.php
@@ -45,13 +45,13 @@ abstract class AbstractHandler {
 	/**
 	 * Gets an error response to be shown in the grid component.
 	 *
-	 * @param string $errorLabel Name of the label in the locallang.xml file
+	 * @param string $errorLabel Name of the label in the locallang.xlf file
 	 * @param integer $errorCode The error code to be used
 	 * @param boolean $successFlagValue Value of the success flag to be delivered back (might be FALSE in most cases)
 	 * @return array
 	 */
 	protected function getErrorResponse($errorLabel, $errorCode = 0, $successFlagValue = FALSE) {
-		$localLangFile = 'LLL:EXT:workspaces/Resources/Private/Language/locallang.xml';
+		$localLangFile = 'LLL:EXT:workspaces/Resources/Private/Language/locallang.xlf';
 		$response = array(
 			'error' => array(
 				'code' => $errorCode,
diff --git a/typo3/sysext/workspaces/Classes/ExtDirect/ActionHandler.php b/typo3/sysext/workspaces/Classes/ExtDirect/ActionHandler.php
index b2e9abbb4068e0f7d5ab672bb19fa9910922ae25..28cb8584008ce0ac83522b213a14c8c169723703 100644
--- a/typo3/sysext/workspaces/Classes/ExtDirect/ActionHandler.php
+++ b/typo3/sysext/workspaces/Classes/ExtDirect/ActionHandler.php
@@ -230,7 +230,7 @@ class ActionHandler extends \TYPO3\CMS\Workspaces\ExtDirect\AbstractHandler {
 	public function getRecipientList(array $uidOfRecipients, $additionalRecipients, $stageId) {
 		$finalRecipients = array();
 		if (!$this->getStageService()->isValid($stageId)) {
-			throw new \InvalidArgumentException($GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang.xml:error.stageId.integer'));
+			throw new \InvalidArgumentException($GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang.xlf:error.stageId.integer'));
 		} else {
 			$stageId = (int) $stageId;
 		}
@@ -691,7 +691,7 @@ class ActionHandler extends \TYPO3\CMS\Workspaces\ExtDirect\AbstractHandler {
 			),
 			'feToolbarButtonDiscardStage' => array(
 				'visible' => is_array($nextStage) && count($nextStage) > 0 || is_array($previousStage) && count($previousStage) > 0,
-				'text' => $GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang.xml:label_doaction_discard', TRUE)
+				'text' => $GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang.xlf:label_doaction_discard', TRUE)
 			)
 		);
 		return $toolbarButtons;
diff --git a/typo3/sysext/workspaces/Classes/ExtDirect/MassActionHandler.php b/typo3/sysext/workspaces/Classes/ExtDirect/MassActionHandler.php
index 0d2b40348de512579207f0b4b53948d6bfb6026a..886a34336d4195c48b0a39b2771ccb0c56d74766 100644
--- a/typo3/sysext/workspaces/Classes/ExtDirect/MassActionHandler.php
+++ b/typo3/sysext/workspaces/Classes/ExtDirect/MassActionHandler.php
@@ -41,7 +41,7 @@ class MassActionHandler extends \TYPO3\CMS\Workspaces\ExtDirect\AbstractHandler
 	 *
 	 * @var string
 	 */
-	private $pathToLocallang = 'LLL:EXT:workspaces/Resources/Private/Language/locallang.xml';
+	private $pathToLocallang = 'LLL:EXT:workspaces/Resources/Private/Language/locallang.xlf';
 
 	/**
 	 * Get list of available mass workspace actions.
diff --git a/typo3/sysext/workspaces/Classes/ExtDirect/WorkspaceSelectorToolbarItem.php b/typo3/sysext/workspaces/Classes/ExtDirect/WorkspaceSelectorToolbarItem.php
index a8c3badf10b95653223356a1b15076953698ce5e..88fc3311a88e8a2bb5eedbcdcbf2043289fe6ceb 100644
--- a/typo3/sysext/workspaces/Classes/ExtDirect/WorkspaceSelectorToolbarItem.php
+++ b/typo3/sysext/workspaces/Classes/ExtDirect/WorkspaceSelectorToolbarItem.php
@@ -93,7 +93,7 @@ class WorkspaceSelectorToolbarItem implements \TYPO3\CMS\Backend\Toolbar\Toolbar
 	 * @return 	string		workspace selector as HTML select
 	 */
 	public function render() {
-		$title = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:toolbarItems.workspace', TRUE);
+		$title = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.workspace', TRUE);
 		$this->addJavascriptToBackend();
 		$availableWorkspaces = \TYPO3\CMS\Workspaces\Service\WorkspaceService::getAvailableWorkspaces();
 		$workspaceMenu = array();
diff --git a/typo3/sysext/workspaces/Classes/Service/StagesService.php b/typo3/sysext/workspaces/Classes/Service/StagesService.php
index 371b5fc817b00c29ed18b20bd2fb4a02ca1dadf3..164df364cb2bd9afd56c86e92ecd4325764b250d 100644
--- a/typo3/sysext/workspaces/Classes/Service/StagesService.php
+++ b/typo3/sysext/workspaces/Classes/Service/StagesService.php
@@ -57,7 +57,7 @@ class StagesService {
 	 *
 	 * @var string
 	 */
-	private $pathToLocallang = 'LLL:EXT:workspaces/Resources/Private/Language/locallang.xml';
+	private $pathToLocallang = 'LLL:EXT:workspaces/Resources/Private/Language/locallang.xlf';
 
 	/**
 	 * Local cache to reduce number of database queries for stages, groups, etc.
@@ -219,7 +219,7 @@ class StagesService {
 		} else {
 			$stages[] = array(
 				'uid' => self::STAGE_EDIT_ID,
-				'title' => $GLOBALS['LANG']->sL(($this->pathToLocallang . ':actionSendToStage')) . ' "' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_user_ws.xml:stage_editing') . '"'
+				'title' => $GLOBALS['LANG']->sL(($this->pathToLocallang . ':actionSendToStage')) . ' "' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_user_ws.xlf:stage_editing') . '"'
 			);
 			$workspaceRec = BackendUtility::getRecord('sys_workspace', $this->getWorkspaceId());
 			if ($workspaceRec['custom_stages'] > 0) {
@@ -232,7 +232,7 @@ class StagesService {
 			}
 			$stages[] = array(
 				'uid' => self::STAGE_PUBLISH_ID,
-				'title' => $GLOBALS['LANG']->sL(($this->pathToLocallang . ':actionSendToStage')) . ' "' . $GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang_mod.xml:stage_ready_to_publish') . '"'
+				'title' => $GLOBALS['LANG']->sL(($this->pathToLocallang . ':actionSendToStage')) . ' "' . $GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang_mod.xlf:stage_ready_to_publish') . '"'
 			);
 			$stages[] = array(
 				'uid' => self::STAGE_PUBLISH_EXECUTE_ID,
@@ -305,18 +305,18 @@ class StagesService {
 		$stageTitle = '';
 		switch ($ver_stage) {
 			case self::STAGE_PUBLISH_EXECUTE_ID:
-				$stageTitle = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_user_ws.xml:stage_publish');
+				$stageTitle = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_user_ws.xlf:stage_publish');
 				break;
 			case self::STAGE_PUBLISH_ID:
-				$stageTitle = $GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang_mod.xml:stage_ready_to_publish');
+				$stageTitle = $GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang_mod.xlf:stage_ready_to_publish');
 				break;
 			case self::STAGE_EDIT_ID:
-				$stageTitle = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_user_ws.xml:stage_editing');
+				$stageTitle = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_user_ws.xlf:stage_editing');
 				break;
 			default:
 				$stageTitle = $this->getPropertyOfCurrentWorkspaceStage($ver_stage, 'title');
 				if ($stageTitle == NULL) {
-					$stageTitle = $GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang.xml:error.getStageTitle.stageNotFound');
+					$stageTitle = $GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang.xlf:error.getStageTitle.stageNotFound');
 				}
 		}
 		return $stageTitle;
@@ -340,7 +340,7 @@ class StagesService {
 	 */
 	public function getNextStage($stageId) {
 		if (!\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($stageId)) {
-			throw new \InvalidArgumentException($GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang.xml:error.stageId.integer'), 1291109987);
+			throw new \InvalidArgumentException($GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang.xlf:error.stageId.integer'), 1291109987);
 		}
 		$nextStage = FALSE;
 		$workspaceStageRecs = $this->getStagesForWS();
@@ -360,7 +360,7 @@ class StagesService {
 		if ($nextStage === FALSE) {
 			$nextStage[] = array(
 				'uid' => self::STAGE_EDIT_ID,
-				'title' => $GLOBALS['LANG']->sL(($this->pathToLocallang . ':actionSendToStage')) . ' "' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_user_ws.xml:stage_editing') . '"'
+				'title' => $GLOBALS['LANG']->sL(($this->pathToLocallang . ':actionSendToStage')) . ' "' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_user_ws.xlf:stage_editing') . '"'
 			);
 		}
 		return $nextStage;
@@ -405,7 +405,7 @@ class StagesService {
 	 */
 	public function getPrevStage($stageid) {
 		if (!\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($stageid)) {
-			throw new \InvalidArgumentException($GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang.xml:error.stageId.integer'));
+			throw new \InvalidArgumentException($GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang.xlf:error.stageId.integer'));
 		}
 		$prevStage = FALSE;
 		$workspaceStageRecs = $this->getStagesForWS();
@@ -621,7 +621,7 @@ class StagesService {
 	public function getPropertyOfCurrentWorkspaceStage($stageId, $property) {
 		$result = NULL;
 		if (!\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($stageId)) {
-			throw new \InvalidArgumentException($GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang.xml:error.stageId.integer'));
+			throw new \InvalidArgumentException($GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang.xlf:error.stageId.integer'));
 		}
 		$workspaceStage = BackendUtility::getRecord(self::TABLE_STAGE, $stageId);
 		if (is_array($workspaceStage) && isset($workspaceStage[$property])) {
@@ -749,7 +749,7 @@ class StagesService {
 	 */
 	public function getNotificationMode($stageId) {
 		if (!\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($stageId)) {
-			throw new \InvalidArgumentException($GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang.xml:error.stageId.integer'));
+			throw new \InvalidArgumentException($GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang.xlf:error.stageId.integer'));
 		}
 		switch ($stageId) {
 			case self::STAGE_PUBLISH_EXECUTE_ID:
diff --git a/typo3/sysext/workspaces/Classes/Service/WorkspaceService.php b/typo3/sysext/workspaces/Classes/Service/WorkspaceService.php
index 69fbb283558cf042ff258084b45430639bfe2efb..6a5fb29752193d4fbccde0d567667b8ee6325579 100644
--- a/typo3/sysext/workspaces/Classes/Service/WorkspaceService.php
+++ b/typo3/sysext/workspaces/Classes/Service/WorkspaceService.php
@@ -92,7 +92,7 @@ class WorkspaceService implements \TYPO3\CMS\Core\SingletonInterface {
 		$title = FALSE;
 		switch ($wsId) {
 			case self::LIVE_WORKSPACE_ID:
-				$title = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_misc.xml:shortcut_onlineWS');
+				$title = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_misc.xlf:shortcut_onlineWS');
 				break;
 			default:
 				$labelField = $GLOBALS['TCA']['sys_workspace']['ctrl']['label'];
diff --git a/typo3/sysext/workspaces/Configuration/TCA/sys_workspace.php b/typo3/sysext/workspaces/Configuration/TCA/sys_workspace.php
index 5aa6df3a76526a48ec33e759664e22c7fce56717..e92f28f1de049a312ab4ed213ea2a7c680858d1f 100644
--- a/typo3/sysext/workspaces/Configuration/TCA/sys_workspace.php
+++ b/typo3/sysext/workspaces/Configuration/TCA/sys_workspace.php
@@ -3,7 +3,7 @@ return array(
 	'ctrl' => array(
 		'label' => 'title',
 		'tstamp' => 'tstamp',
-		'title' => 'LLL:EXT:lang/locallang_tca.xml:sys_workspace',
+		'title' => 'LLL:EXT:lang/locallang_tca.xlf:sys_workspace',
 		'adminOnly' => 1,
 		'rootLevel' => 1,
 		'delete' => 'deleted',
@@ -16,7 +16,7 @@ return array(
 	),
 	'columns' => array(
 		'title' => array(
-			'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.title',
+			'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.title',
 			'config' => array(
 				'type' => 'input',
 				'size' => '20',
@@ -25,7 +25,7 @@ return array(
 			)
 		),
 		'description' => array(
-			'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.description',
+			'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.description',
 			'config' => array(
 				'type' => 'text',
 				'rows' => 5,
@@ -33,7 +33,7 @@ return array(
 			)
 		),
 		'adminusers' => array(
-			'label' => 'LLL:EXT:lang/locallang_tca.xml:sys_workspace.adminusers',
+			'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_workspace.adminusers',
 			'config' => array(
 				'type' => 'group',
 				'internal_type' => 'db',
@@ -51,7 +51,7 @@ return array(
 			)
 		),
 		'members' => array(
-			'label' => 'LLL:EXT:lang/locallang_tca.xml:sys_workspace.members',
+			'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_workspace.members',
 			'config' => array(
 				'type' => 'group',
 				'internal_type' => 'db',
@@ -69,7 +69,7 @@ return array(
 			)
 		),
 		'db_mountpoints' => array(
-			'label' => 'LLL:EXT:lang/locallang_tca.xml:db_mountpoints',
+			'label' => 'LLL:EXT:lang/locallang_tca.xlf:db_mountpoints',
 			'config' => array(
 				'type' => 'group',
 				'internal_type' => 'db',
@@ -86,7 +86,7 @@ return array(
 			)
 		),
 		'file_mountpoints' => array(
-			'label' => 'LLL:EXT:lang/locallang_tca.xml:file_mountpoints',
+			'label' => 'LLL:EXT:lang/locallang_tca.xlf:file_mountpoints',
 			'config' => array(
 				'type' => 'select',
 				'foreign_table' => 'sys_filemounts',
@@ -99,7 +99,7 @@ return array(
 			)
 		),
 		'publish_time' => array(
-			'label' => 'LLL:EXT:lang/locallang_tca.xml:sys_workspace.publish_time',
+			'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_workspace.publish_time',
 			'config' => array(
 				'type' => 'input',
 				'size' => '8',
@@ -110,7 +110,7 @@ return array(
 			)
 		),
 		'unpublish_time' => array(
-			'label' => 'LLL:EXT:lang/locallang_tca.xml:sys_workspace.unpublish_time',
+			'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_workspace.unpublish_time',
 			'config' => array(
 				'type' => 'input',
 				'size' => '8',
@@ -125,28 +125,28 @@ return array(
 			'displayCond' => 'FALSE'
 		),
 		'freeze' => array(
-			'label' => 'LLL:EXT:lang/locallang_tca.xml:sys_workspace.freeze',
+			'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_workspace.freeze',
 			'config' => array(
 				'type' => 'check',
 				'default' => '0'
 			)
 		),
 		'live_edit' => array(
-			'label' => 'LLL:EXT:lang/locallang_tca.xml:sys_workspace.live_edit',
+			'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_workspace.live_edit',
 			'config' => array(
 				'type' => 'check',
 				'default' => '0'
 			)
 		),
 		'disable_autocreate' => array(
-			'label' => 'LLL:EXT:lang/locallang_tca.xml:sys_workspace.disable_autocreate',
+			'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_workspace.disable_autocreate',
 			'config' => array(
 				'type' => 'check',
 				'default' => '0'
 			)
 		),
 		'swap_modes' => array(
-			'label' => 'LLL:EXT:lang/locallang_tca.xml:sys_workspace.swap_modes',
+			'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_workspace.swap_modes',
 			'config' => array(
 				'type' => 'select',
 				'items' => array(
@@ -157,7 +157,7 @@ return array(
 			)
 		),
 		'publish_access' => array(
-			'label' => 'LLL:EXT:lang/locallang_tca.xml:sys_workspace.publish_access',
+			'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_workspace.publish_access',
 			'config' => array(
 				'type' => 'check',
 				'items' => array(
@@ -167,7 +167,7 @@ return array(
 			)
 		),
 		'stagechg_notification' => array(
-			'label' => 'LLL:EXT:lang/locallang_tca.xml:sys_workspace.stagechg_notification',
+			'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_workspace.stagechg_notification',
 			'config' => array(
 				'type' => 'select',
 				'items' => array(
@@ -179,7 +179,7 @@ return array(
 		),
 		'custom_stages' => array(
 			'exclude' => 1,
-			'label' => 'LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xml:sys_workspace.custom_stages',
+			'label' => 'LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace.custom_stages',
 			'config' => array(
 				'type' => 'inline',
 				'foreign_table' => 'sys_workspace_stage',
@@ -191,18 +191,18 @@ return array(
 			'default' => 0
 		),
 		'edit_notification_mode' => array(
-			'label' => 'LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xml:sys_workspace.edit_notification_mode',
+			'label' => 'LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace.edit_notification_mode',
 			'config' => array(
 				'type' => 'select',
 				'items' => array(
-					array('LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xml:sys_workspace.notification_mode.0', 0),
-					array('LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xml:sys_workspace.notification_mode.1', 1),
-					array('LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xml:sys_workspace.notification_mode.2', 2)
+					array('LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace.notification_mode.0', 0),
+					array('LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace.notification_mode.1', 1),
+					array('LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace.notification_mode.2', 2)
 				)
 			)
 		),
 		'edit_notification_defaults' => array(
-			'label' => 'LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xml:sys_workspace.edit_notification_defaults',
+			'label' => 'LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace.edit_notification_defaults',
 			'displayCond' => 'FIELD:edit_notification_mode:IN:0,1',
 			'config' => array(
 				'type' => 'group',
@@ -221,25 +221,25 @@ return array(
 			)
 		),
 		'edit_allow_notificaton_settings' => array(
-			'label' => 'LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xml:sys_workspace.edit_allow_notificaton_settings',
+			'label' => 'LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace.edit_allow_notificaton_settings',
 			'config' => array(
 				'type' => 'check',
 				'default' => 1
 			)
 		),
 		'publish_notification_mode' => array(
-			'label' => 'LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xml:sys_workspace.publish_notification_mode',
+			'label' => 'LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace.publish_notification_mode',
 			'config' => array(
 				'type' => 'select',
 				'items' => array(
-					array('LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xml:sys_workspace.notification_mode.0', 0),
-					array('LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xml:sys_workspace.notification_mode.1', 1),
-					array('LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xml:sys_workspace.notification_mode.2', 2)
+					array('LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace.notification_mode.0', 0),
+					array('LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace.notification_mode.1', 1),
+					array('LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace.notification_mode.2', 2)
 				)
 			)
 		),
 		'publish_notification_defaults' => array(
-			'label' => 'LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xml:sys_workspace.publish_notification_defaults',
+			'label' => 'LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace.publish_notification_defaults',
 			'displayCond' => 'FIELD:publish_notification_mode:IN:0,1',
 			'config' => array(
 				'type' => 'group',
@@ -258,7 +258,7 @@ return array(
 			)
 		),
 		'publish_allow_notificaton_settings' => array(
-			'label' => 'LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xml:sys_workspace.publish_allow_notificaton_settings',
+			'label' => 'LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace.publish_allow_notificaton_settings',
 			'config' => array(
 				'type' => 'check',
 				'default' => 1
@@ -267,12 +267,12 @@ return array(
 	),
 	'types' => array(
 		'0' => array('showitem' => 'title,description,
-			--div--;LLL:EXT:lang/locallang_tca.xml:sys_filemounts.tabs.users,adminusers,members,
-			--div--;LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xml:tabs.notification_settings,stagechg_notification,edit_notification_mode,edit_notification_defaults,edit_allow_notificaton_settings,publish_notification_mode,publish_notification_defaults,publish_allow_notificaton_settings,
-			--div--;LLL:EXT:lang/locallang_tca.xml:sys_filemounts.tabs.mountpoints,db_mountpoints,file_mountpoints,
-			--div--;LLL:EXT:lang/locallang_tca.xml:sys_filemounts.tabs.publishing,publish_time,unpublish_time,
-			--div--;LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xml:sys_filemounts.tabs.staging,custom_stages,
-			--div--;LLL:EXT:lang/locallang_tca.xml:sys_filemounts.tabs.other,freeze,live_edit,disable_autocreate,swap_modes,publish_access')
+			--div--;LLL:EXT:lang/locallang_tca.xlf:sys_filemounts.tabs.users,adminusers,members,
+			--div--;LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:tabs.notification_settings,stagechg_notification,edit_notification_mode,edit_notification_defaults,edit_allow_notificaton_settings,publish_notification_mode,publish_notification_defaults,publish_allow_notificaton_settings,
+			--div--;LLL:EXT:lang/locallang_tca.xlf:sys_filemounts.tabs.mountpoints,db_mountpoints,file_mountpoints,
+			--div--;LLL:EXT:lang/locallang_tca.xlf:sys_filemounts.tabs.publishing,publish_time,unpublish_time,
+			--div--;LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_filemounts.tabs.staging,custom_stages,
+			--div--;LLL:EXT:lang/locallang_tca.xlf:sys_filemounts.tabs.other,freeze,live_edit,disable_autocreate,swap_modes,publish_access')
 	)
 );
 ?>
\ No newline at end of file
diff --git a/typo3/sysext/workspaces/Configuration/TCA/sys_workspace_stage.php b/typo3/sysext/workspaces/Configuration/TCA/sys_workspace_stage.php
index eec955383c79d2144d031f8c33baca63544189c0..59066afa745e3383bb8117a7a5cd8a9926b59502 100644
--- a/typo3/sysext/workspaces/Configuration/TCA/sys_workspace_stage.php
+++ b/typo3/sysext/workspaces/Configuration/TCA/sys_workspace_stage.php
@@ -4,7 +4,7 @@ return array(
 		'label' => 'title',
 		'tstamp' => 'tstamp',
 		'sortby' => 'sorting',
-		'title' => 'LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xml:sys_workspace_stage',
+		'title' => 'LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace_stage',
 		'adminOnly' => 1,
 		'rootLevel' => 1,
 		'hideTable' => TRUE,
@@ -18,7 +18,7 @@ return array(
 	),
 	'columns' => array(
 		'title' => array(
-			'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.title',
+			'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.title',
 			'config' => array(
 				'type' => 'input',
 				'size' => '20',
@@ -27,7 +27,7 @@ return array(
 			)
 		),
 		'responsible_persons' => array(
-			'label' => 'LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xml:sys_workspace_stage.responsible_persons',
+			'label' => 'LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace_stage.responsible_persons',
 			'config' => array(
 				'type' => 'group',
 				'internal_type' => 'db',
@@ -45,7 +45,7 @@ return array(
 			)
 		),
 		'default_mailcomment' => array(
-			'label' => 'LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xml:sys_workspace_stage.default_mailcomment',
+			'label' => 'LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace_stage.default_mailcomment',
 			'config' => array(
 				'type' => 'text',
 				'rows' => 5,
@@ -54,31 +54,31 @@ return array(
 		),
 		'parentid' => array(
 			'exclude' => 0,
-			'label' => 'LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xml:sys_workspace_stage.parentid',
+			'label' => 'LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace_stage.parentid',
 			'config' => array(
 				'type' => 'passthrough'
 			)
 		),
 		'parenttable' => array(
 			'exclude' => 0,
-			'label' => 'LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xml:sys_workspace_stage.parenttable',
+			'label' => 'LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace_stage.parenttable',
 			'config' => array(
 				'type' => 'passthrough'
 			)
 		),
 		'notification_mode' => array(
-			'label' => 'LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xml:sys_workspace_stage.notification_mode',
+			'label' => 'LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace_stage.notification_mode',
 			'config' => array(
 				'type' => 'select',
 				'items' => array(
-					array('LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xml:sys_workspace.notification_mode.0', 0),
-					array('LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xml:sys_workspace.notification_mode.1', 1),
-					array('LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xml:sys_workspace.notification_mode.2', 2)
+					array('LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace.notification_mode.0', 0),
+					array('LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace.notification_mode.1', 1),
+					array('LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace.notification_mode.2', 2)
 				)
 			)
 		),
 		'notification_defaults' => array(
-			'label' => 'LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xml:sys_workspace_stage.notification_defaults',
+			'label' => 'LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace_stage.notification_defaults',
 			'displayCond' => 'FIELD:notification_mode:IN:0,1',
 			'config' => array(
 				'type' => 'group',
@@ -97,7 +97,7 @@ return array(
 			)
 		),
 		'allow_notificaton_settings' => array(
-			'label' => 'LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xml:sys_workspace_stage.allow_notificaton_settings',
+			'label' => 'LLL:EXT:workspaces/Resources/Private/Language/locallang_db.xlf:sys_workspace_stage.allow_notificaton_settings',
 			'config' => array(
 				'type' => 'check',
 				'default' => 1
diff --git a/typo3/sysext/workspaces/ext_localconf.php b/typo3/sysext/workspaces/ext_localconf.php
index e34c893c1571be9120621364f037bd7b708f2cb5..562799b7d6e52e6a1ea9355a77a401ee23c04058 100644
--- a/typo3/sysext/workspaces/ext_localconf.php
+++ b/typo3/sysext/workspaces/ext_localconf.php
@@ -11,15 +11,15 @@ if (TYPO3_MODE == 'BE') {
 // Register the autopublishing task
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks']['TYPO3\\CMS\\Workspaces\\Task\\AutoPublishTask'] = array(
 	'extension' => $_EXTKEY,
-	'title' => 'LLL:EXT:' . $_EXTKEY . '/Resources/Private/Language/locallang_mod.xml:autopublishTask.name',
-	'description' => 'LLL:EXT:' . $_EXTKEY . '/Resources/Private/Language/locallang_mod.xml:autopublishTask.description'
+	'title' => 'LLL:EXT:' . $_EXTKEY . '/Resources/Private/Language/locallang_mod.xlf:autopublishTask.name',
+	'description' => 'LLL:EXT:' . $_EXTKEY . '/Resources/Private/Language/locallang_mod.xlf:autopublishTask.description'
 );
 
 // Register the cleanup preview links task
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks']['TYPO3\\CMS\\Workspaces\\Task\\CleanupPreviewLinkTask'] = array(
 	'extension' => $_EXTKEY,
-	'title' => 'LLL:EXT:' . $_EXTKEY . '/Resources/Private/Language/locallang_mod.xml:cleanupPreviewLinkTask.name',
-	'description' => 'LLL:EXT:' . $_EXTKEY . '/Resources/Private/Language/locallang_mod.xml:cleanupPreviewLinkTask.description'
+	'title' => 'LLL:EXT:' . $_EXTKEY . '/Resources/Private/Language/locallang_mod.xlf:cleanupPreviewLinkTask.name',
+	'description' => 'LLL:EXT:' . $_EXTKEY . '/Resources/Private/Language/locallang_mod.xlf:cleanupPreviewLinkTask.description'
 );
 
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processCmdmapClass']['workspaces'] = 'TYPO3\\CMS\\Workspaces\\Hook\\DataHandlerHook';
diff --git a/typo3/sysext/workspaces/ext_tables.php b/typo3/sysext/workspaces/ext_tables.php
index d81893cd4756708254804607fde864b7868f96b2..64a4aad04fa9a4e727fcd392430c8ee26cff0c98 100644
--- a/typo3/sysext/workspaces/ext_tables.php
+++ b/typo3/sysext/workspaces/ext_tables.php
@@ -18,7 +18,7 @@ if (TYPO3_MODE == 'BE' && !(TYPO3_REQUESTTYPE & TYPO3_REQUESTTYPE_INSTALL)) {
 		array(
 			'access' => 'user,group',
 			'icon' => 'EXT:workspaces/Resources/Public/Images/moduleicon.gif',
-			'labels' => 'LLL:EXT:' . $_EXTKEY . '/Resources/Private/Language/locallang_mod.xml',
+			'labels' => 'LLL:EXT:' . $_EXTKEY . '/Resources/Private/Language/locallang_mod.xlf',
 			'navigationComponentId' => 'typo3-pagetree'
 		)
 	);
@@ -55,5 +55,5 @@ $icons = array(
 	'generatepreviewlink' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath($_EXTKEY) . 'Resources/Public/Images/generate-ws-preview-link.png'
 );
 \TYPO3\CMS\Backend\Sprite\SpriteManager::addSingleIcons($icons, $_EXTKEY);
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('sys_workspace_stage', 'EXT:workspaces/Resources/Private/Language/locallang_csh_sysws_stage.xml');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('sys_workspace_stage', 'EXT:workspaces/Resources/Private/Language/locallang_csh_sysws_stage.xlf');
 ?>
\ No newline at end of file