diff --git a/dlf/ext_conf_template.txt b/dlf/ext_conf_template.txt
index 020a094f..8087855d 100644
--- a/dlf/ext_conf_template.txt
+++ b/dlf/ext_conf_template.txt
@@ -1,26 +1,26 @@
-# cat=Basic; type=string; label=DLF User-Agent: (default is "Goobi.Presentation")
+# cat=Basic; type=string; label=LLL:EXT:dlf/locallang.xml:config.useragent
 useragent = Goobi.Presentation
 
-# cat=Basic; type=string; label=Additional METS fileGrps: comma-separated list of @USE attribute values (default is "DEFAULT,MIN,MAX,THUMBS")
+# cat=Basic; type=string; label=LLL:EXT:dlf/locallang.xml:config.fileGrps
 fileGrps = DEFAULT,MIN,MAX,THUMBS
 
-# cat=Basic; type=boolean; label=Cache parsed METS files: caching improves performance a little bit but can result in a very large "fe_session_data" table (default is "false")
+# cat=Basic; type=boolean; label=LLL:EXT:dlf/locallang.xml:config.caching
 caching = 0
 
-# cat=Solr; type=user[EXT:dlf/hooks/class.tx_dlf_em.php:tx_dlf_em->checkSolrConnection]; label=Solr Connection
+# cat=Solr; type=user[EXT:dlf/hooks/class.tx_dlf_em.php:tx_dlf_em->checkSolrConnection]; label=LLL:EXT:dlf/locallang.xml:config.solrConnect
 solrConnect = 0
 
-# cat=Solr; type=string; label=Solr Server Host: (default is "localhost")
+# cat=Solr; type=string; label=LLL:EXT:dlf/locallang.xml:config.solrHost
 solrHost = localhost
 
-# cat=Solr; type=int[0-65535]; label=Solr Server Port: (default is "8180")
+# cat=Solr; type=int[0-65535]; label=LLL:EXT:dlf/locallang.xml:config.solrPort
 solrPort = 8180
 
-# cat=Solr; type=string; label=Solr Server Path: (default is "/solr/")
+# cat=Solr; type=string; label=LLL:EXT:dlf/locallang.xml:config.solrPath
 solrPath = /solr/
 
-# cat=Solr; type=string; label=Solr Server User: (default is "")
+# cat=Solr; type=string; label=LLL:EXT:dlf/locallang.xml:config.solrUser
 solrUser =
 
-# cat=Solr; type=string; label=Solr Server Password: (default is "")
+# cat=Solr; type=string; label=LLL:EXT:dlf/locallang.xml:config.solrPass
 solrPass =
diff --git a/dlf/ext_localconf.php b/dlf/ext_localconf.php
index f843f390..f0146cd7 100644
--- a/dlf/ext_localconf.php
+++ b/dlf/ext_localconf.php
@@ -50,11 +50,11 @@ t3lib_extMgm::addPItoST43($_EXTKEY, 'plugins/toolbox/class.tx_dlf_toolbox.php',
 // Register tools for toolbox plugin.
 t3lib_extMgm::addPItoST43($_EXTKEY, 'plugins/toolbox/tools/dfgviewer/class.tx_dlf_toolsDfgviewer.php', '_toolsDfgviewer', 'includeLib', FALSE);
 
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/plugins/toolbox/tools'][t3lib_extMgm::getCN($_EXTKEY).'_toolsDfgviewer'] = 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_toolbox.toolsDfgviewer';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/plugins/toolbox/tools'][t3lib_extMgm::getCN($_EXTKEY).'_toolsDfgviewer'] = 'LLL:EXT:dlf/locallang.xml:tx_dlf_toolbox.toolsDfgviewer';
 
 t3lib_extMgm::addPItoST43($_EXTKEY, 'plugins/toolbox/tools/pdf/class.tx_dlf_toolsPdf.php', '_toolsPdf', 'includeLib', FALSE);
 
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/plugins/toolbox/tools'][t3lib_extMgm::getCN($_EXTKEY).'_toolsPdf'] = 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_toolbox.toolsPdf';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/plugins/toolbox/tools'][t3lib_extMgm::getCN($_EXTKEY).'_toolsPdf'] = 'LLL:EXT:dlf/locallang.xml:tx_dlf_toolbox.toolsPdf';
 
 // Register hooks.
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processDatamapClass'][] = 'EXT:'.$_EXTKEY.'/hooks/class.tx_dlf_tcemain.php:tx_dlf_tcemain';
diff --git a/dlf/ext_tables.php b/dlf/ext_tables.php
index 18f7a1bd..7638014b 100644
--- a/dlf/ext_tables.php
+++ b/dlf/ext_tables.php
@@ -27,7 +27,7 @@ if (!defined ('TYPO3_MODE')) 	die ('Access denied.');
 // Register database tables.
 $TCA['tx_dlf_documents'] = array (
 	'ctrl' => array (
-		'title'     => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_documents',
+		'title'     => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents',
 		'label'     => 'title',
 		'tstamp'    => 'tstamp',
 		'crdate'    => 'crdate',
@@ -50,7 +50,7 @@ $TCA['tx_dlf_documents'] = array (
 
 $TCA['tx_dlf_structures'] = array (
 	'ctrl' => array (
-		'title'     => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_structures',
+		'title'     => 'LLL:EXT:dlf/locallang.xml:tx_dlf_structures',
 		'label'     => 'label',
 		'tstamp'    => 'tstamp',
 		'crdate'    => 'crdate',
@@ -75,7 +75,7 @@ $TCA['tx_dlf_structures'] = array (
 
 $TCA['tx_dlf_metadata'] = array (
 	'ctrl' => array (
-		'title'     => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_metadata',
+		'title'     => 'LLL:EXT:dlf/locallang.xml:tx_dlf_metadata',
 		'label'     => 'label',
 		'tstamp'    => 'tstamp',
 		'crdate'    => 'crdate',
@@ -100,7 +100,7 @@ $TCA['tx_dlf_metadata'] = array (
 
 $TCA['tx_dlf_formats'] = array (
 	'ctrl' => array (
-		'title'     => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_formats',
+		'title'     => 'LLL:EXT:dlf/locallang.xml:tx_dlf_formats',
 		'label'     => 'type',
 		'tstamp'    => 'tstamp',
 		'crdate'    => 'crdate',
@@ -119,7 +119,7 @@ $TCA['tx_dlf_formats'] = array (
 
 $TCA['tx_dlf_solrcores'] = array (
 	'ctrl' => array (
-		'title'     => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_solrcores',
+		'title'     => 'LLL:EXT:dlf/locallang.xml:tx_dlf_solrcores',
 		'label'     => 'label',
 		'tstamp'    => 'tstamp',
 		'crdate'    => 'crdate',
@@ -138,7 +138,7 @@ $TCA['tx_dlf_solrcores'] = array (
 
 $TCA['tx_dlf_collections'] = array (
 	'ctrl' => array (
-		'title'     => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_collections',
+		'title'     => 'LLL:EXT:dlf/locallang.xml:tx_dlf_collections',
 		'label'     => 'label',
 		'tstamp'    => 'tstamp',
 		'crdate'    => 'crdate',
@@ -166,7 +166,7 @@ $TCA['tx_dlf_collections'] = array (
 
 $TCA['tx_dlf_libraries'] = array (
 	'ctrl' => array (
-		'title'     => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_libraries',
+		'title'     => 'LLL:EXT:dlf/locallang.xml:tx_dlf_libraries',
 		'label'     => 'label',
 		'tstamp'    => 'tstamp',
 		'crdate'    => 'crdate',
@@ -197,7 +197,7 @@ $TCA['tt_content']['types']['list']['subtypes_excludelist'][$_EXTKEY.'_collectio
 
 $TCA['tt_content']['types']['list']['subtypes_addlist'][$_EXTKEY.'_collection'] = 'pi_flexform';
 
-t3lib_extMgm::addPlugin(array('LLL:EXT:dlf/locallang_db.xml:tt_content.dlf_collection', $_EXTKEY.'_collection'), 'list_type');
+t3lib_extMgm::addPlugin(array('LLL:EXT:dlf/locallang.xml:tt_content.dlf_collection', $_EXTKEY.'_collection'), 'list_type');
 
 t3lib_extMgm::addPiFlexFormValue($_EXTKEY.'_collection', 'FILE:EXT:'.$_EXTKEY.'/plugins/collection/flexform.xml');
 
@@ -206,7 +206,7 @@ $TCA['tt_content']['types']['list']['subtypes_excludelist'][$_EXTKEY.'_feeds'] =
 
 $TCA['tt_content']['types']['list']['subtypes_addlist'][$_EXTKEY.'_feeds'] = 'pi_flexform';
 
-t3lib_extMgm::addPlugin(array('LLL:EXT:dlf/locallang_db.xml:tt_content.dlf_feeds', $_EXTKEY.'_feeds'), 'list_type');
+t3lib_extMgm::addPlugin(array('LLL:EXT:dlf/locallang.xml:tt_content.dlf_feeds', $_EXTKEY.'_feeds'), 'list_type');
 
 t3lib_extMgm::addPiFlexFormValue($_EXTKEY.'_feeds', 'FILE:EXT:'.$_EXTKEY.'/plugins/feeds/flexform.xml');
 
@@ -215,7 +215,7 @@ $TCA['tt_content']['types']['list']['subtypes_excludelist'][$_EXTKEY.'_listview'
 
 $TCA['tt_content']['types']['list']['subtypes_addlist'][$_EXTKEY.'_listview'] = 'pi_flexform';
 
-t3lib_extMgm::addPlugin(array('LLL:EXT:dlf/locallang_db.xml:tt_content.dlf_listview', $_EXTKEY.'_listview'), 'list_type');
+t3lib_extMgm::addPlugin(array('LLL:EXT:dlf/locallang.xml:tt_content.dlf_listview', $_EXTKEY.'_listview'), 'list_type');
 
 t3lib_extMgm::addPiFlexFormValue($_EXTKEY.'_listview', 'FILE:EXT:'.$_EXTKEY.'/plugins/listview/flexform.xml');
 
@@ -224,7 +224,7 @@ $TCA['tt_content']['types']['list']['subtypes_excludelist'][$_EXTKEY.'_metadata'
 
 $TCA['tt_content']['types']['list']['subtypes_addlist'][$_EXTKEY.'_metadata'] = 'pi_flexform';
 
-t3lib_extMgm::addPlugin(array('LLL:EXT:dlf/locallang_db.xml:tt_content.dlf_metadata', $_EXTKEY.'_metadata'), 'list_type');
+t3lib_extMgm::addPlugin(array('LLL:EXT:dlf/locallang.xml:tt_content.dlf_metadata', $_EXTKEY.'_metadata'), 'list_type');
 
 t3lib_extMgm::addPiFlexFormValue($_EXTKEY.'_metadata', 'FILE:EXT:'.$_EXTKEY.'/plugins/metadata/flexform.xml');
 
@@ -233,7 +233,7 @@ $TCA['tt_content']['types']['list']['subtypes_excludelist'][$_EXTKEY.'_navigatio
 
 $TCA['tt_content']['types']['list']['subtypes_addlist'][$_EXTKEY.'_navigation'] = 'pi_flexform';
 
-t3lib_extMgm::addPlugin(array('LLL:EXT:dlf/locallang_db.xml:tt_content.dlf_navigation', $_EXTKEY.'_navigation'), 'list_type');
+t3lib_extMgm::addPlugin(array('LLL:EXT:dlf/locallang.xml:tt_content.dlf_navigation', $_EXTKEY.'_navigation'), 'list_type');
 
 t3lib_extMgm::addPiFlexFormValue($_EXTKEY.'_navigation', 'FILE:EXT:'.$_EXTKEY.'/plugins/navigation/flexform.xml');
 
@@ -242,7 +242,7 @@ $TCA['tt_content']['types']['list']['subtypes_excludelist'][$_EXTKEY.'_oai'] = '
 
 $TCA['tt_content']['types']['list']['subtypes_addlist'][$_EXTKEY.'_oai'] = 'pi_flexform';
 
-t3lib_extMgm::addPlugin(array('LLL:EXT:dlf/locallang_db.xml:tt_content.dlf_oai', $_EXTKEY.'_oai'), 'list_type');
+t3lib_extMgm::addPlugin(array('LLL:EXT:dlf/locallang.xml:tt_content.dlf_oai', $_EXTKEY.'_oai'), 'list_type');
 
 t3lib_extMgm::addPiFlexFormValue($_EXTKEY.'_oai', 'FILE:EXT:'.$_EXTKEY.'/plugins/oai/flexform.xml');
 
@@ -251,7 +251,7 @@ $TCA['tt_content']['types']['list']['subtypes_excludelist'][$_EXTKEY.'_pageview'
 
 $TCA['tt_content']['types']['list']['subtypes_addlist'][$_EXTKEY.'_pageview'] = 'pi_flexform';
 
-t3lib_extMgm::addPlugin(array('LLL:EXT:dlf/locallang_db.xml:tt_content.dlf_pageview', $_EXTKEY.'_pageview'), 'list_type');
+t3lib_extMgm::addPlugin(array('LLL:EXT:dlf/locallang.xml:tt_content.dlf_pageview', $_EXTKEY.'_pageview'), 'list_type');
 
 t3lib_extMgm::addPiFlexFormValue($_EXTKEY.'_pageview', 'FILE:EXT:'.$_EXTKEY.'/plugins/pageview/flexform.xml');
 
@@ -260,7 +260,7 @@ $TCA['tt_content']['types']['list']['subtypes_excludelist'][$_EXTKEY.'_search']
 
 $TCA['tt_content']['types']['list']['subtypes_addlist'][$_EXTKEY.'_search'] = 'pi_flexform';
 
-t3lib_extMgm::addPlugin(array('LLL:EXT:dlf/locallang_db.xml:tt_content.dlf_search', $_EXTKEY.'_search'), 'list_type');
+t3lib_extMgm::addPlugin(array('LLL:EXT:dlf/locallang.xml:tt_content.dlf_search', $_EXTKEY.'_search'), 'list_type');
 
 t3lib_extMgm::addPiFlexFormValue($_EXTKEY.'_search', 'FILE:EXT:'.$_EXTKEY.'/plugins/search/flexform.xml');
 
@@ -269,7 +269,7 @@ $TCA['tt_content']['types']['list']['subtypes_excludelist'][$_EXTKEY.'_statistic
 
 $TCA['tt_content']['types']['list']['subtypes_addlist'][$_EXTKEY.'_statistics'] = 'pi_flexform';
 
-t3lib_extMgm::addPlugin(array('LLL:EXT:dlf/locallang_db.xml:tt_content.dlf_statistics', $_EXTKEY.'_statistics'), 'list_type');
+t3lib_extMgm::addPlugin(array('LLL:EXT:dlf/locallang.xml:tt_content.dlf_statistics', $_EXTKEY.'_statistics'), 'list_type');
 
 t3lib_extMgm::addPiFlexFormValue($_EXTKEY.'_statistics', 'FILE:EXT:'.$_EXTKEY.'/plugins/statistics/flexform.xml');
 
@@ -278,7 +278,7 @@ $TCA['tt_content']['types']['list']['subtypes_excludelist'][$_EXTKEY.'_toc'] = '
 
 $TCA['tt_content']['types']['list']['subtypes_addlist'][$_EXTKEY.'_toc'] = 'pi_flexform';
 
-t3lib_extMgm::addPlugin(array('LLL:EXT:dlf/locallang_db.xml:tt_content.dlf_toc', $_EXTKEY.'_toc'), 'list_type');
+t3lib_extMgm::addPlugin(array('LLL:EXT:dlf/locallang.xml:tt_content.dlf_toc', $_EXTKEY.'_toc'), 'list_type');
 
 t3lib_extMgm::addStaticFile($_EXTKEY, 'plugins/toc/', 'Table of Contents');
 
@@ -289,7 +289,7 @@ $TCA['tt_content']['types']['list']['subtypes_excludelist'][$_EXTKEY.'_toolbox']
 
 $TCA['tt_content']['types']['list']['subtypes_addlist'][$_EXTKEY.'_toolbox'] = 'pi_flexform';
 
-t3lib_extMgm::addPlugin(array('LLL:EXT:dlf/locallang_db.xml:tt_content.dlf_toolbox', $_EXTKEY.'_toolbox'), 'list_type');
+t3lib_extMgm::addPlugin(array('LLL:EXT:dlf/locallang.xml:tt_content.dlf_toolbox', $_EXTKEY.'_toolbox'), 'list_type');
 
 t3lib_extMgm::addPiFlexFormValue($_EXTKEY.'_toolbox', 'FILE:EXT:'.$_EXTKEY.'/plugins/toolbox/flexform.xml');
 
diff --git a/dlf/hooks/class.tx_dlf_em.php b/dlf/hooks/class.tx_dlf_em.php
index ac3d48c4..a870951b 100644
--- a/dlf/hooks/class.tx_dlf_em.php
+++ b/dlf/hooks/class.tx_dlf_em.php
@@ -49,6 +49,9 @@ class tx_dlf_em {
 	 */
 	public function checkSolrConnection(&$params, &$pObj) {
 
+		// Load localization file.
+		$GLOBALS['LANG']->includeLLFile('EXT:dlf/locallang.xml');
+
 		// Get Solr credentials.
 		$conf = t3lib_div::_POST('data');
 
@@ -97,8 +100,8 @@ class tx_dlf_em {
 
 				$message = t3lib_div::makeInstance(
 					't3lib_FlashMessage',
-					'The status code returned by Apache Solr is <strong>'.htmlspecialchars((string) $status[0]).'</strong>.',
-					'Connection established!',
+					sprintf($GLOBALS['LANG']->getLL('solr.status'), (string) $status[0]),
+					$GLOBALS['LANG']->getLL('solr.connected'),
 					($status[0] == 0 ? t3lib_FlashMessage::OK : t3lib_FlashMessage::WARNING),
 					FALSE
 				);
@@ -111,8 +114,8 @@ class tx_dlf_em {
 
 		$message = t3lib_div::makeInstance(
 			't3lib_FlashMessage',
-			'Apache Solr was not reachable with the given details.',
-			'Connection failed!',
+			sprintf($GLOBALS['LANG']->getLL('solr.error'), $url),
+			$GLOBALS['LANG']->getLL('solr.notConnected'),
 			t3lib_FlashMessage::ERROR,
 			FALSE
 		);
diff --git a/dlf/locallang_db.xml b/dlf/locallang.xml
similarity index 85%
rename from dlf/locallang_db.xml
rename to dlf/locallang.xml
index 6eae687f..bdbbaef1 100644
--- a/dlf/locallang_db.xml
+++ b/dlf/locallang.xml
@@ -121,6 +121,19 @@
 			<label index="tt_content.dlf_statistics">DLF: Statistics</label>
 			<label index="tt_content.dlf_toc">DLF: Table of Contents</label>
 			<label index="tt_content.dlf_toolbox">DLF: Toolbox</label>
+			<label index="config.useragent">DLF User-Agent: (default is "Goobi.Presentation")</label>
+			<label index="config.fileGrps">Additional METS fileGrps: comma-separated list of @USE attribute values (default is "DEFAULT,MIN,MAX,THUMBS")</label>
+			<label index="config.caching">Cache parsed METS files: caching improves performance a little bit but can result in a very large "fe_session_data" table (default is "FALSE")</label>
+			<label index="config.solrConnect">Solr Connection</label>
+			<label index="config.solrHost">Solr Server Host: (default is "localhost")</label>
+			<label index="config.solrPort">Solr Server Port: (default is "8180")</label>
+			<label index="config.solrPath">Solr Server Path: (default is "/solr/")</label>
+			<label index="config.solrUser">Solr Server User: (default is "")</label>
+			<label index="config.solrPass">Solr Server Password: (default is "")</label>
+			<label index="solr.connected">Connection established!</label>
+			<label index="solr.status">The status code returned by Apache Solr is &lt;strong&gt;%s&lt;/strong&gt;.</label>
+			<label index="solr.notConnected">Connection failed!</label>
+			<label index="solr.error">Apache Solr was not reachable under &lt;strong&gt;%s&lt;/strong&gt;.</label>
 		</languageKey>
 		<languageKey index="de" type="array">
 			<label index="tx_dlf_documents">Dokumente</label>
@@ -238,6 +251,19 @@
 			<label index="tt_content.dlf_statistics">DLF: Statistik</label>
 			<label index="tt_content.dlf_toc">DLF: Inhaltsverzeichnis</label>
 			<label index="tt_content.dlf_toolbox">DLF: Werkzeugkasten</label>
+			<label index="config.useragent">DLF User-Agent: (Standard ist "Goobi.Presentation")</label>
+			<label index="config.fileGrps">Zusätzliche METS fileGrps: Komma-getrennte Liste von @USE Attributwerten (Standard ist "DEFAULT,MIN,MAX,THUMBS")</label>
+			<label index="config.caching">Eingelesene METS Dateien zwischenspeichern: Dies kann die Geschwindigkeit geringfügig verbessern, führt aber zu einer sehr großen "fe_session_data" Tabelle (Standard ist "FALSE")</label>
+			<label index="config.solrConnect">Solr Verbindung</label>
+			<label index="config.solrHost">Solr Server Host: (Standard ist "localhost")</label>
+			<label index="config.solrPort">Solr Server Port: (Standard ist "8180")</label>
+			<label index="config.solrPath">Solr Server Pfad: (Standard ist "/solr/")</label>
+			<label index="config.solrUser">Solr Server Benutzername: (Standard ist "")</label>
+			<label index="config.solrPass">Solr Server Kennwort: (Standard ist "")</label>
+			<label index="solr.connected">Verbindung hergestellt!</label>
+			<label index="solr.status">Apache Solr gibt den Statuscode &lt;strong&gt;%s&lt;/strong&gt; zurück.</label>
+			<label index="solr.notConnected">Verbindung fehlgeschlagen!</label>
+			<label index="solr.error">Apache Solr ist unter &lt;strong&gt;%s&lt;/strong&gt; nicht erreichbar.</label>
 		</languageKey>
 	</data>
 </T3locallang>
\ No newline at end of file
diff --git a/dlf/tca.php b/dlf/tca.php
index 6248cd12..64542925 100644
--- a/dlf/tca.php
+++ b/dlf/tca.php
@@ -61,7 +61,7 @@ $TCA['tx_dlf_documents'] = array (
 		),
 		'prod_id' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_documents.prod_id',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.prod_id',
 			'config' => array (
 				'type' => 'input',
 				'size' => 30,
@@ -71,7 +71,7 @@ $TCA['tx_dlf_documents'] = array (
 		),
 		'location' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_documents.location',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.location',
 			'config' => array (
 				'type' => 'input',
 				'size' => 30,
@@ -81,7 +81,7 @@ $TCA['tx_dlf_documents'] = array (
 		),
 		'record_id' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_documents.record_id',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.record_id',
 			'config' => array (
 				'type' => 'input',
 				'size' => 30,
@@ -91,7 +91,7 @@ $TCA['tx_dlf_documents'] = array (
 		),
 		'opac_id' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_documents.opac_id',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.opac_id',
 			'config' => array (
 				'type' => 'input',
 				'size' => 30,
@@ -101,7 +101,7 @@ $TCA['tx_dlf_documents'] = array (
 		),
 		'union_id' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_documents.union_id',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.union_id',
 			'config' => array (
 				'type' => 'input',
 				'size' => 30,
@@ -111,7 +111,7 @@ $TCA['tx_dlf_documents'] = array (
 		),
 		'urn' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_documents.urn',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.urn',
 			'config' => array (
 				'type' => 'input',
 				'size' => 30,
@@ -121,7 +121,7 @@ $TCA['tx_dlf_documents'] = array (
 		),
 		'purl' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_documents.purl',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.purl',
 			'config' => array (
 				'type' => 'input',
 				'size' => 30,
@@ -131,7 +131,7 @@ $TCA['tx_dlf_documents'] = array (
 		),
 		'title' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_documents.title',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.title',
 			'config' => array (
 				'type' => 'input',
 				'size' => 30,
@@ -141,7 +141,7 @@ $TCA['tx_dlf_documents'] = array (
 		),
 		'title_sorting' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_documents.title_sorting',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.title_sorting',
 			'config' => array (
 				'type' => 'input',
 				'size' => 30,
@@ -151,7 +151,7 @@ $TCA['tx_dlf_documents'] = array (
 		),
 		'author' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_documents.author',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.author',
 			'config' => array (
 				'type' => 'input',
 				'size' => 30,
@@ -161,7 +161,7 @@ $TCA['tx_dlf_documents'] = array (
 		),
 		'author_sorting' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_documents.author_sorting',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.author_sorting',
 			'config' => array (
 				'type' => 'input',
 				'size' => 30,
@@ -171,7 +171,7 @@ $TCA['tx_dlf_documents'] = array (
 		),
 		'year' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_documents.year',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.year',
 			'config' => array (
 				'type' => 'input',
 				'size' => 30,
@@ -181,7 +181,7 @@ $TCA['tx_dlf_documents'] = array (
 		),
 		'year_sorting' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_documents.year_sorting',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.year_sorting',
 			'config' => array (
 				'type' => 'input',
 				'size' => 30,
@@ -191,7 +191,7 @@ $TCA['tx_dlf_documents'] = array (
 		),
 		'place' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_documents.place',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.place',
 			'config' => array (
 				'type' => 'input',
 				'size' => 30,
@@ -201,7 +201,7 @@ $TCA['tx_dlf_documents'] = array (
 		),
 		'place_sorting' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_documents.place_sorting',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.place_sorting',
 			'config' => array (
 				'type' => 'input',
 				'size' => 30,
@@ -216,7 +216,7 @@ $TCA['tx_dlf_documents'] = array (
 		),
 		'structure' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_documents.structure',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.structure',
 			'config' => array (
 				'type' => 'select',
 				'foreign_table' => 'tx_dlf_structures',
@@ -228,11 +228,11 @@ $TCA['tx_dlf_documents'] = array (
 		),
 		'partof' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_documents.partof',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.partof',
 			'config' => array (
 				'type' => 'select',
 				'items' => array (
-					array ('LLL:EXT:dlf/locallang_db.xml:tx_dlf_documents.partof.none', 0),
+					array ('LLL:EXT:dlf/locallang.xml:tx_dlf_documents.partof.none', 0),
 				),
 				'foreign_table' => 'tx_dlf_documents',
 				'foreign_table_where' => 'AND tx_dlf_documents.pid=###CURRENT_PID### ORDER BY tx_dlf_documents.title_sorting',
@@ -244,7 +244,7 @@ $TCA['tx_dlf_documents'] = array (
 		),
 		'volume' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_documents.volume',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.volume',
 			'config' => array (
 				'type' => 'input',
 				'size' => 30,
@@ -254,7 +254,7 @@ $TCA['tx_dlf_documents'] = array (
 		),
 		'volume_sorting' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_documents.volume_sorting',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.volume_sorting',
 			'config' => array (
 				'type' => 'input',
 				'size' => 30,
@@ -264,7 +264,7 @@ $TCA['tx_dlf_documents'] = array (
 		),
 		'collections' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_documents.collections',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.collections',
 			'config' => array (
 				'type' => 'select',
 				'foreign_table' => 'tx_dlf_collections',
@@ -281,7 +281,7 @@ $TCA['tx_dlf_documents'] = array (
 		),
 		'owner' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_documents.owner',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.owner',
 			'config' => array (
 				'type' => 'select',
 				'foreign_table' => 'tx_dlf_libraries',
@@ -293,11 +293,11 @@ $TCA['tx_dlf_documents'] = array (
 		),
 		'solrcore' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_documents.solrcore',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.solrcore',
 			'config' => array (
 				'type' => 'select',
 				'items' => array (
-					array ('LLL:EXT:dlf/locallang_db.xml:tx_dlf_documents.solrcore.none', 0),
+					array ('LLL:EXT:dlf/locallang.xml:tx_dlf_documents.solrcore.none', 0),
 				),
 				'foreign_table' => 'tx_dlf_solrcores',
 				'foreign_table_where' => 'AND tx_dlf_solrcores.pid=0 ORDER BY tx_dlf_solrcores.label',
@@ -308,11 +308,11 @@ $TCA['tx_dlf_documents'] = array (
 		),
 		'status' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_documents.status',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.status',
 			'config' => array (
 				'type' => 'select',
 				'items' => array (
-					array ('LLL:EXT:dlf/locallang_db.xml:tx_dlf_documents.status.default', 0),
+					array ('LLL:EXT:dlf/locallang.xml:tx_dlf_documents.status.default', 0),
 				),
 				'size' => 1,
 				'minitems' => 1,
@@ -322,7 +322,7 @@ $TCA['tx_dlf_documents'] = array (
 		),
 	),
 	'types' => array (
-		'0' => array ('showitem' => '--div--;LLL:EXT:dlf/locallang_db.xml:tx_dlf_documents.tab1, title;;1;;1-1-1, author;;2, year;;3, place;;4, structure;;5;;2-2-2, collections;;;;3-3-3, metadata, --div--;LLL:EXT:dlf/locallang_db.xml:tx_dlf_documents.tab2, location;;;;1-1-1, record_id, prod_id;;;;2-2-2, oai_id;;;;3-3-3, opac_id, union_id, urn, purl;;;;4-4-4, --div--;LLL:EXT:dlf/locallang_db.xml:tx_dlf_documents.tab3, hidden;;;;1-1-1, fe_group;;;;2-2-2, status;;;;3-3-3, owner;;;;4-4-4'),
+		'0' => array ('showitem' => '--div--;LLL:EXT:dlf/locallang.xml:tx_dlf_documents.tab1, title;;1;;1-1-1, author;;2, year;;3, place;;4, structure;;5;;2-2-2, collections;;;;3-3-3, metadata, --div--;LLL:EXT:dlf/locallang.xml:tx_dlf_documents.tab2, location;;;;1-1-1, record_id, prod_id;;;;2-2-2, oai_id;;;;3-3-3, opac_id, union_id, urn, purl;;;;4-4-4, --div--;LLL:EXT:dlf/locallang.xml:tx_dlf_documents.tab3, hidden;;;;1-1-1, fe_group;;;;2-2-2, status;;;;3-3-3, owner;;;;4-4-4'),
 	),
 	'palettes' => array (
 		'1' => array ('showitem' => 'title_sorting', 'canNotCollapse' => 1),
@@ -381,7 +381,7 @@ $TCA['tx_dlf_structures'] = array (
 		),
 		'toplevel' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_structures.toplevel',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_structures.toplevel',
 			'config' => array (
 				'type' => 'check',
 				'default' => 0,
@@ -389,7 +389,7 @@ $TCA['tx_dlf_structures'] = array (
 		),
 		'label' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_structures.label',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_structures.label',
 			'config' => array (
 				'type' => 'input',
 				'size' => 30,
@@ -399,7 +399,7 @@ $TCA['tx_dlf_structures'] = array (
 		),
 		'index_name' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_structures.index_name',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_structures.index_name',
 			'config' => array (
 				'type' => 'input',
 				'size' => 30,
@@ -409,7 +409,7 @@ $TCA['tx_dlf_structures'] = array (
 		),
 		'oai_name' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_structures.oai_name',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_structures.oai_name',
 			'config' => array (
 				'type' => 'input',
 				'size' => 30,
@@ -419,11 +419,11 @@ $TCA['tx_dlf_structures'] = array (
 		),
 		'status' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_structures.status',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_structures.status',
 			'config' => array (
 				'type' => 'select',
 				'items' => array (
-					array ('LLL:EXT:dlf/locallang_db.xml:tx_dlf_structures.status.default', 0),
+					array ('LLL:EXT:dlf/locallang.xml:tx_dlf_structures.status.default', 0),
 				),
 				'size' => 1,
 				'minitems' => 1,
@@ -433,7 +433,7 @@ $TCA['tx_dlf_structures'] = array (
 		),
 	),
 	'types' => array (
-		'0' => array ('showitem' => '--div--;LLL:EXT:dlf/locallang_db.xml:tx_dlf_structures.tab1, toplevel;;;;1-1-1, label;;1, --div--;LLL:EXT:dlf/locallang_db.xml:tx_dlf_structures.tab2, sys_language_uid;;;;1-1-1, l18n_parent, l18n_diffsource, --div--;LLL:EXT:dlf/locallang_db.xml:tx_dlf_structures.tab3, hidden;;;;1-1-1, status;;;;2-2-2'),
+		'0' => array ('showitem' => '--div--;LLL:EXT:dlf/locallang.xml:tx_dlf_structures.tab1, toplevel;;;;1-1-1, label;;1, --div--;LLL:EXT:dlf/locallang.xml:tx_dlf_structures.tab2, sys_language_uid;;;;1-1-1, l18n_parent, l18n_diffsource, --div--;LLL:EXT:dlf/locallang.xml:tx_dlf_structures.tab3, hidden;;;;1-1-1, status;;;;2-2-2'),
 	),
 	'palettes' => array (
 		'1' => array ('showitem' => 'index_name, --linebreak--, oai_name', 'canNotCollapse' => 1),
@@ -488,7 +488,7 @@ $TCA['tx_dlf_metadata'] = array (
 		),
 		'label' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_metadata.label',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_metadata.label',
 			'config' => array (
 				'type' => 'input',
 				'size' => 30,
@@ -498,7 +498,7 @@ $TCA['tx_dlf_metadata'] = array (
 		),
 		'index_name' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_metadata.index_name',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_metadata.index_name',
 			'config' => array (
 				'type' => 'input',
 				'size' => 30,
@@ -508,11 +508,11 @@ $TCA['tx_dlf_metadata'] = array (
 		),
 		'encoded' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_metadata.encoded',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_metadata.encoded',
 			'config' => array (
 				'type' => 'select',
 				'items' => array (
-					array ('LLL:EXT:dlf/locallang_db.xml:tx_dlf_metadata.encoded.none', 0),
+					array ('LLL:EXT:dlf/locallang.xml:tx_dlf_metadata.encoded.none', 0),
 				),
 				'foreign_table' => 'tx_dlf_formats',
 				'foreign_table_where' => 'ORDER BY tx_dlf_formats.type',
@@ -524,7 +524,7 @@ $TCA['tx_dlf_metadata'] = array (
 		),
 		'xpath' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_metadata.xpath',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_metadata.xpath',
 			'config' => array (
 				'type' => 'input',
 				'size' => 30,
@@ -534,7 +534,7 @@ $TCA['tx_dlf_metadata'] = array (
 		),
 		'default_value' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_metadata.default_value',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_metadata.default_value',
 			'config' => array (
 				'type' => 'input',
 				'size' => 30,
@@ -544,7 +544,7 @@ $TCA['tx_dlf_metadata'] = array (
 		),
 		'wrap' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_metadata.wrap',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_metadata.wrap',
 			'config' => array (
 				'type' => 'text',
 				'cols' => 48,
@@ -556,7 +556,7 @@ $TCA['tx_dlf_metadata'] = array (
 		),
 		'tokenized' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_metadata.tokenized',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_metadata.tokenized',
 			'config' => array (
 				'type' => 'check',
 				'default' => 0,
@@ -564,7 +564,7 @@ $TCA['tx_dlf_metadata'] = array (
 		),
 		'stored' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_metadata.stored',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_metadata.stored',
 			'config' => array (
 				'type' => 'check',
 				'default' => 0,
@@ -572,7 +572,7 @@ $TCA['tx_dlf_metadata'] = array (
 		),
 		'indexed' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_metadata.indexed',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_metadata.indexed',
 			'config' => array (
 				'type' => 'check',
 				'default' => 1,
@@ -580,7 +580,7 @@ $TCA['tx_dlf_metadata'] = array (
 		),
 		'boost' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_metadata.boost',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_metadata.boost',
 			'config' => array (
 				'type' => 'input',
 				'size' => 5,
@@ -591,7 +591,7 @@ $TCA['tx_dlf_metadata'] = array (
 		),
 		'is_sortable' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_metadata.is_sortable',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_metadata.is_sortable',
 			'config' => array (
 				'type' => 'check',
 				'default' => 0,
@@ -599,7 +599,7 @@ $TCA['tx_dlf_metadata'] = array (
 		),
 		'is_facet' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_metadata.is_facet',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_metadata.is_facet',
 			'config' => array (
 				'type' => 'check',
 				'default' => 0,
@@ -607,7 +607,7 @@ $TCA['tx_dlf_metadata'] = array (
 		),
 		'is_listed' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_metadata.is_listed',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_metadata.is_listed',
 			'config' => array (
 				'type' => 'check',
 				'default' => 0,
@@ -615,11 +615,11 @@ $TCA['tx_dlf_metadata'] = array (
 		),
 		'status' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_metadata.status',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_metadata.status',
 			'config' => array (
 				'type' => 'select',
 				'items' => array (
-					array ('LLL:EXT:dlf/locallang_db.xml:tx_dlf_metadata.status.default', 0),
+					array ('LLL:EXT:dlf/locallang.xml:tx_dlf_metadata.status.default', 0),
 				),
 				'size' => 1,
 				'minitems' => 1,
@@ -629,7 +629,7 @@ $TCA['tx_dlf_metadata'] = array (
 		),
 	),
 	'types' => array (
-		'0' => array ('showitem' => '--div--;LLL:EXT:dlf/locallang_db.xml:tx_dlf_metadata.tab1, label;;1;;1-1-1, encoded;;;;2-2-2, xpath, default_value;;;;3-3-3, wrap, --div--;LLL:EXT:dlf/locallang_db.xml:tx_dlf_metadata.tab2, sys_language_uid;;;;1-1-1, l18n_parent, l18n_diffsource, --div--;LLL:EXT:dlf/locallang_db.xml:tx_dlf_metadata.tab3, hidden;;;;1-1-1, status;;;;2-2-2'),
+		'0' => array ('showitem' => '--div--;LLL:EXT:dlf/locallang.xml:tx_dlf_metadata.tab1, label;;1;;1-1-1, encoded;;;;2-2-2, xpath, default_value;;;;3-3-3, wrap, --div--;LLL:EXT:dlf/locallang.xml:tx_dlf_metadata.tab2, sys_language_uid;;;;1-1-1, l18n_parent, l18n_diffsource, --div--;LLL:EXT:dlf/locallang.xml:tx_dlf_metadata.tab3, hidden;;;;1-1-1, status;;;;2-2-2'),
 	),
 	'palettes' => array (
 		'1' => array ('showitem' => 'index_name, --linebreak--, tokenized, stored, indexed, boost, --linebreak--, is_sortable, is_facet, is_listed', 'canNotCollapse' => 1),
@@ -644,7 +644,7 @@ $TCA['tx_dlf_formats'] = array (
 	'feInterface' => $TCA['tx_dlf_formats']['feInterface'],
 	'columns' => array (
 		'type' => array (
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_formats.type',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_formats.type',
 			'config' => array (
 				'type' => 'input',
 				'size' => 30,
@@ -653,14 +653,14 @@ $TCA['tx_dlf_formats'] = array (
 			),
 		),
 		'other_type' => array (
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_formats.other_type',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_formats.other_type',
 			'config' => array (
 				'type' => 'check',
 				'default' => 0,
 			),
 		),
 		'root' => array (
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_formats.root',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_formats.root',
 			'config' => array (
 				'type' => 'input',
 				'size' => 30,
@@ -669,7 +669,7 @@ $TCA['tx_dlf_formats'] = array (
 			),
 		),
 		'namespace' => array (
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_formats.namespace',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_formats.namespace',
 			'config' => array (
 				'type' => 'input',
 				'size' => 30,
@@ -678,7 +678,7 @@ $TCA['tx_dlf_formats'] = array (
 			),
 		),
 		'class' => array (
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_formats.class',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_formats.class',
 			'config' => array (
 				'type' => 'input',
 				'size' => 30,
@@ -688,7 +688,7 @@ $TCA['tx_dlf_formats'] = array (
 		),
 	),
 	'types' => array (
-		'0' => array ('showitem' => '--div--;LLL:EXT:dlf/locallang_db.xml:tx_dlf_formats.tab1, type;;;;1-1-1, other, root;;;;2-2-2, namespace, class;;;;3-3-3'),
+		'0' => array ('showitem' => '--div--;LLL:EXT:dlf/locallang.xml:tx_dlf_formats.tab1, type;;;;1-1-1, other, root;;;;2-2-2, namespace, class;;;;3-3-3'),
 	),
 	'palettes' => array (
 		'1' => array ('showitem' => ''),
@@ -703,7 +703,7 @@ $TCA['tx_dlf_solrcores'] = array (
 	'feInterface' => $TCA['tx_dlf_solrcores']['feInterface'],
 	'columns' => array (
 		'label' => array (
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_solrcores.label',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_solrcores.label',
 			'config' => array (
 				'type' => 'input',
 				'size' => 30,
@@ -712,7 +712,7 @@ $TCA['tx_dlf_solrcores'] = array (
 			),
 		),
 		'index_name' => array (
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_solrcores.index_name',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_solrcores.index_name',
 			'config' => array (
 				'type' => 'input',
 				'form_type' => 'none',
@@ -723,7 +723,7 @@ $TCA['tx_dlf_solrcores'] = array (
 		),
 	),
 	'types' => array (
-		'0' => array ('showitem' => '--div--;LLL:EXT:dlf/locallang_db.xml:tx_dlf_solrcores.tab1, label;;;;1-1-1, index_name;;;;2-2-2'),
+		'0' => array ('showitem' => '--div--;LLL:EXT:dlf/locallang.xml:tx_dlf_solrcores.tab1, label;;;;1-1-1, index_name;;;;2-2-2'),
 	),
 	'palettes' => array (
 		'1' => array ('showitem' => ''),
@@ -796,7 +796,7 @@ $TCA['tx_dlf_collections'] = array (
 		),
 		'label' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_collections.label',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_collections.label',
 			'config' => array (
 				'type' => 'input',
 				'size' => 30,
@@ -806,7 +806,7 @@ $TCA['tx_dlf_collections'] = array (
 		),
 		'index_name' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_collections.index_name',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_collections.index_name',
 			'config' => array (
 				'type' => 'input',
 				'form_type' => 'none',
@@ -817,7 +817,7 @@ $TCA['tx_dlf_collections'] = array (
 		),
 		'oai_name' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_collections.oai_name',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_collections.oai_name',
 			'config' => array (
 				'type' => 'input',
 				'size' => 30,
@@ -827,7 +827,7 @@ $TCA['tx_dlf_collections'] = array (
 		),
 		'description' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_collections.description',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_collections.description',
 			'config' => array (
 				'type' => 'text',
 				'cols' => 30,
@@ -838,7 +838,7 @@ $TCA['tx_dlf_collections'] = array (
 		),
 		'documents' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_collections.documents',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_collections.documents',
 			'config' => array (
 				'type' => 'select',
 				'foreign_table' => 'tx_dlf_documents',
@@ -856,11 +856,11 @@ $TCA['tx_dlf_collections'] = array (
 		),
 		'owner' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_collections.owner',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_collections.owner',
 			'config' => array (
 				'type' => 'select',
 				'items' => array (
-					array ('LLL:EXT:dlf/locallang_db.xml:tx_dlf_collections.owner.none', 0),
+					array ('LLL:EXT:dlf/locallang.xml:tx_dlf_collections.owner.none', 0),
 				),
 				'foreign_table' => 'tx_dlf_libraries',
 				'foreign_table_where' => 'AND tx_dlf_libraries.sys_language_uid IN (-1,0) ORDER BY tx_dlf_libraries.label',
@@ -871,11 +871,11 @@ $TCA['tx_dlf_collections'] = array (
 		),
 		'fe_cruser_id' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_collections.fe_cruser_id',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_collections.fe_cruser_id',
 			'config' => array (
 				'type' => 'select',
 				'items' => array (
-					array ('LLL:EXT:dlf/locallang_db.xml:tx_dlf_collections.fe_cruser_id.none', 0),
+					array ('LLL:EXT:dlf/locallang.xml:tx_dlf_collections.fe_cruser_id.none', 0),
 				),
 				'foreign_table' => 'fe_users',
 				'foreign_table_where' => 'ORDER BY fe_users.username',
@@ -886,7 +886,7 @@ $TCA['tx_dlf_collections'] = array (
 		),
 		'fe_admin_lock' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_collections.fe_admin_lock',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_collections.fe_admin_lock',
 			'config' => array (
 				'type' => 'check',
 				'default' => 0,
@@ -894,11 +894,11 @@ $TCA['tx_dlf_collections'] = array (
 		),
 		'status' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_collections.status',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_collections.status',
 			'config' => array (
 				'type' => 'select',
 				'items' => array (
-					array ('LLL:EXT:dlf/locallang_db.xml:tx_dlf_collections.status.default', 0),
+					array ('LLL:EXT:dlf/locallang.xml:tx_dlf_collections.status.default', 0),
 				),
 				'size' => 1,
 				'minitems' => 1,
@@ -908,7 +908,7 @@ $TCA['tx_dlf_collections'] = array (
 		),
 	),
 	'types' => array (
-		'0' => array ('showitem' => '--div--;LLL:EXT:dlf/locallang_db.xml:tx_dlf_collections.tab1, label;;1;;1-1-1, description;;;;2-2-2, --div--;LLL:EXT:dlf/locallang_db.xml:tx_dlf_collections.tab2, sys_language_uid;;;;1-1-1, l18n_parent, l18n_diffsource, --div--;LLL:EXT:dlf/locallang_db.xml:tx_dlf_collections.tab3, hidden;;;;1-1-1, fe_group;;;;2-2-2, status;;;;3-3-3, owner;;;;4-4-4, fe_cruser_id;;2'),
+		'0' => array ('showitem' => '--div--;LLL:EXT:dlf/locallang.xml:tx_dlf_collections.tab1, label;;1;;1-1-1, description;;;;2-2-2, --div--;LLL:EXT:dlf/locallang.xml:tx_dlf_collections.tab2, sys_language_uid;;;;1-1-1, l18n_parent, l18n_diffsource, --div--;LLL:EXT:dlf/locallang.xml:tx_dlf_collections.tab3, hidden;;;;1-1-1, fe_group;;;;2-2-2, status;;;;3-3-3, owner;;;;4-4-4, fe_cruser_id;;2'),
 	),
 	'palettes' => array (
 		'1' => array ('showitem' => 'index_name, --linebreak--, oai_name', 'canNotCollapse' => 1),
@@ -956,7 +956,7 @@ $TCA['tx_dlf_libraries'] = array (
 		),
 		'label' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_libraries.label',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_libraries.label',
 			'config' => array (
 				'type' => 'input',
 				'size' => 30,
@@ -966,7 +966,7 @@ $TCA['tx_dlf_libraries'] = array (
 		),
 		'index_name' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_libraries.index_name',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_libraries.index_name',
 			'config' => array (
 				'type' => 'input',
 				'form_type' => 'none',
@@ -977,7 +977,7 @@ $TCA['tx_dlf_libraries'] = array (
 		),
 		'website' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_libraries.website',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_libraries.website',
 			'config' => array (
 				'type' => 'input',
 				'size' => 30,
@@ -987,7 +987,7 @@ $TCA['tx_dlf_libraries'] = array (
 		),
 		'contact' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_libraries.contact',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_libraries.contact',
 			'config' => array (
 				'type' => 'input',
 				'size' => 30,
@@ -997,7 +997,7 @@ $TCA['tx_dlf_libraries'] = array (
 		),
 		'image' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_libraries.image',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_libraries.image',
 			'config' => array (
 				'type' => 'group',
 				'internal_type' => 'file',
@@ -1012,7 +1012,7 @@ $TCA['tx_dlf_libraries'] = array (
 		),
 		'oai_label' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_libraries.oai_label',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_libraries.oai_label',
 			'config' => array (
 				'type' => 'input',
 				'size' => 30,
@@ -1021,7 +1021,7 @@ $TCA['tx_dlf_libraries'] = array (
 		),
 		'oai_base' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_libraries.oai_base',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_libraries.oai_base',
 			'config' => array (
 				'type' => 'group',
 				'internal_type' => 'db',
@@ -1033,7 +1033,7 @@ $TCA['tx_dlf_libraries'] = array (
 		),
 		'opac_label' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_libraries.opac_label',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_libraries.opac_label',
 			'config' => array (
 				'type' => 'input',
 				'size' => 30,
@@ -1042,7 +1042,7 @@ $TCA['tx_dlf_libraries'] = array (
 		),
 		'opac_base' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_libraries.opac_base',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_libraries.opac_base',
 			'config' => array (
 				'type' => 'input',
 				'size' => 30,
@@ -1052,7 +1052,7 @@ $TCA['tx_dlf_libraries'] = array (
 		),
 		'union_label' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_libraries.union_label',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_libraries.union_label',
 			'config' => array (
 				'type' => 'input',
 				'size' => 30,
@@ -1061,7 +1061,7 @@ $TCA['tx_dlf_libraries'] = array (
 		),
 		'union_base' => array (
 			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang_db.xml:tx_dlf_libraries.union_base',
+			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_libraries.union_base',
 			'config' => array (
 				'type' => 'input',
 				'size' => 30,
@@ -1071,7 +1071,7 @@ $TCA['tx_dlf_libraries'] = array (
 		),
 	),
 	'types' => array (
-		'0' => array ('showitem' => '--div--;LLL:EXT:dlf/locallang_db.xml:tx_dlf_libraries.tab1, label;;1;;1-1-1, website;;;;2-2-2, contact, image;;;;3-3-3, --div--;LLL:EXT:dlf/locallang_db.xml:tx_dlf_libraries.tab2, sys_language_uid;;;;1-1-1, l18n_parent, l18n_diffsource, --div--;LLL:EXT:dlf/locallang_db.xml:tx_dlf_libraries.tab3, oai_label;;2;;1-1-1, opac_label;;3;;2-2-2, union_label;;4;;3-3-3'),
+		'0' => array ('showitem' => '--div--;LLL:EXT:dlf/locallang.xml:tx_dlf_libraries.tab1, label;;1;;1-1-1, website;;;;2-2-2, contact, image;;;;3-3-3, --div--;LLL:EXT:dlf/locallang.xml:tx_dlf_libraries.tab2, sys_language_uid;;;;1-1-1, l18n_parent, l18n_diffsource, --div--;LLL:EXT:dlf/locallang.xml:tx_dlf_libraries.tab3, oai_label;;2;;1-1-1, opac_label;;3;;2-2-2, union_label;;4;;3-3-3'),
 	),
 	'palettes' => array (
 		'1' => array ('showitem' => 'index_name', 'canNotCollapse' => 1),