diff --git a/typo3/sysext/backend/Resources/Private/Partials/ToolbarItems/ToolbarItem.html b/typo3/sysext/backend/Resources/Private/Partials/ToolbarItems/ToolbarItem.html
index 54d3be17fd14cfc04a6895016bf84f62b6b556cd..7731551defffbd15e1eb51e01248c002b631bc1d 100644
--- a/typo3/sysext/backend/Resources/Private/Partials/ToolbarItems/ToolbarItem.html
+++ b/typo3/sysext/backend/Resources/Private/Partials/ToolbarItems/ToolbarItem.html
@@ -1,2 +1,2 @@
-<span class="toolbar-item-icon" title="{f:translate(key: title, htmlEscape: 'TRUE', default: title)}">{icon -> f:format.raw()}</span>
-<span class="toolbar-item-title">{f:translate(key: title, htmlEscape: 'FALSE')}</span>
+<span class="toolbar-item-icon" title="{f:translate(key: title, default: title)}">{icon -> f:format.raw()}</span>
+<span class="toolbar-item-title">{f:translate(key: title) -> f:format.raw()}</span>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/ClearCacheToolbarItemDropDown.html b/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/ClearCacheToolbarItemDropDown.html
index 69d1296f27b3a25e2267e594e4c8723dc1c0d359..8601fdfdbd4ec00b6944f7d4f372df53b0a2390b 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/ClearCacheToolbarItemDropDown.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/ClearCacheToolbarItemDropDown.html
@@ -1,5 +1,5 @@
 <h3 class="dropdown-headline">
-    {f:translate(key: title, htmlEscape: 'FALSE')}
+    {f:translate(key: title) -> f:format.raw()}
 </h3>
 <hr>
 <div class="dropdown-table">
diff --git a/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/HelpToolbarItemDropDown.html b/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/HelpToolbarItemDropDown.html
index 19010d37cac094f56b91158a984314d44ba57691..9ba9da04c6cbfb5dfa5dc617c1435e1f95cfaf69 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/HelpToolbarItemDropDown.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/HelpToolbarItemDropDown.html
@@ -1,5 +1,5 @@
 <h3 class="dropdown-headline">
-    {f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.help', htmlEscape: 'FALSE')}
+    {f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:toolbarItems.help') -> f:format.raw()}
 </h3>
 <hr>
 <div class="dropdown-table">
diff --git a/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/UserToolbarItem.html b/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/UserToolbarItem.html
index 67f9a2af4611a136c676f044b7537b6ce6c2c7d8..357b282601090d86312616e2ffc0e24c4593aba7 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/UserToolbarItem.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/UserToolbarItem.html
@@ -1,8 +1,8 @@
 <span class="toolbar-item-avatar">{icon -> f:format.raw()}</span>
 <f:if condition="{switchUserMode}">
     <f:then>
-        <span class="toolbar-item-name" title="{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_misc.xlf:switchtouser', htmlEscape: 'TRUE')} {username}">
-            {f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_misc.xlf:switchtousershort', htmlEscape: 'FALSE')}
+        <span class="toolbar-item-name" title="{f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_misc.xlf:switchtouser')} {username}">
+            {f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_misc.xlf:switchtousershort') -> f:format.raw()}
             {f:if(condition: '{realName}', then: '{realname} ({username})', else: '{username}')}
         </span>
     </f:then>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/UserToolbarItemDropDown.html b/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/UserToolbarItemDropDown.html
index 8a2f8d9f257b6559f774f9a9430744a9dcd398b6..ccdf8ffc57d543246c71701f0a01cdb49d3112a0 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/UserToolbarItemDropDown.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/UserToolbarItemDropDown.html
@@ -27,10 +27,10 @@
     {icon -> f:format.raw()}
     <f:if condition="{switchUserMode}">
         <f:then>
-            {f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:buttons.exit', htmlEscape: 'FALSE')}
+            {f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:buttons.exit') -> f:format.raw()}
         </f:then>
         <f:else>
-            {f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:buttons.logout', htmlEscape: 'FALSE')}
+            {f:translate(key: 'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:buttons.logout') -> f:format.raw()}
         </f:else>
     </f:if>
 </f:link.typolink>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/Wizards/SuggestWizard.html b/typo3/sysext/backend/Resources/Private/Templates/Wizards/SuggestWizard.html
index 9925ff92ea536b276a1da1edebda037527dd3169..e08102e1264aa4dc3122144c9c84e84323b5617c 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/Wizards/SuggestWizard.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/Wizards/SuggestWizard.html
@@ -5,7 +5,7 @@
             <core:icon identifier="actions-search" size="small" />
         </span>
         <input type="search" class="t3-form-suggest form-control"
-            placeholder="{f:translate(key: placeholder, htmlEscape: 'TRUE')}"
+            placeholder="{f:translate(key: placeholder)}"
             data-fieldname="{fieldName -> f:format.htmlspecialchars()}"
             data-tablename="{tableName -> f:format.htmlspecialchars()}"
             data-field="{field -> f:format.htmlspecialchars()}"
diff --git a/typo3/sysext/belog/Resources/Private/Partials/Content/LogEntries.html b/typo3/sysext/belog/Resources/Private/Partials/Content/LogEntries.html
index 6159f595a9a7a9d0861b41c06a063976daa8a7f6..dfcddec0fee2379fdc9766d47e15b5a6e9b9c357 100644
--- a/typo3/sysext/belog/Resources/Private/Partials/Content/LogEntries.html
+++ b/typo3/sysext/belog/Resources/Private/Partials/Content/LogEntries.html
@@ -65,12 +65,12 @@
 								2. Use this as argument for 'forPage' translate
 								3. Use this as argument for 'logForNonPageRelatedActionsOrRootLevelOrPage' translate
 							</f:comment>
-							<f:translate
-								key="logForNonPageRelatedActionsOrRootLevelOrPage"
-								arguments="{
+							<f:format.raw>
+								<f:translate
+									key="logForNonPageRelatedActionsOrRootLevelOrPage"
+									arguments="{
 									0: '{f:translate(
 										key:\'forPage\',
-										htmlEscape:\'0\',
 										arguments:\'{
 											0:\\\'{belog:be.pagePath(pid:\\\\\\\'{pid}\\\\\\\')}\\\',
 											1:\\\'{pid}\\\'
@@ -79,7 +79,8 @@
 									1: '{f:format.date(format:\'{settings.dateFormat} {settings.timeFormat}\', date:\'@{constraint.startTimestamp}\')}',
 									2: '{f:format.date(format:\'{settings.dateFormat} {settings.timeFormat}\', date:\'@{constraint.endTimestamp}\')}'
 								}"
-							/>
+								/>
+							</f:format.raw>
 						</f:else>
 					</f:if>
 				</f:then>
diff --git a/typo3/sysext/filelist/Resources/Private/Templates/FileList/Search.html b/typo3/sysext/filelist/Resources/Private/Templates/FileList/Search.html
index f64e7bb5af7ed84db1f5fd56f2100df88caa2456..4b7052d9b0abc9572fa0872b1ea6c4af3bd7bf9a 100644
--- a/typo3/sysext/filelist/Resources/Private/Templates/FileList/Search.html
+++ b/typo3/sysext/filelist/Resources/Private/Templates/FileList/Search.html
@@ -17,14 +17,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -42,7 +42,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
+										title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } ) -> f:format.raw()}' )}"
 									>
 										{file.name}
@@ -62,7 +62,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
+											title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } ) -> f:format.raw()}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -76,7 +76,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
+											title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -90,7 +90,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
+											title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } ) -> f:format.raw()}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -104,7 +104,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
+											title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } ) -> f:format.raw()}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -118,7 +118,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
+											title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -131,10 +131,10 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											data-identifier="{file.identifier}"
-											data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
-											data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											data-title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											data-content="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											data-delete-url="{deleteUrl}"
 											data-delete-type="delete_file"
@@ -153,12 +153,12 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
 								<f:then>
-									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( htmlEscape:'true', key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
+									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
 								</f:then>
 								<f:else>
 									-
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/TranslateViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/TranslateViewHelper.php
index bad100339056b89547fbb918f3523ff7a0e37804..1a840c7d6d994d3dbb7654a0e5be28953543bf36 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/TranslateViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/TranslateViewHelper.php
@@ -33,7 +33,7 @@ use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
  * </output>
  *
  * <code title="Keep HTML tags">
- * <f:translate key="htmlKey" htmlEscape="false" />
+ * <f:format.raw><f:translate key="htmlKey" /></f:format.raw>
  * </code>
  * <output>
  * value of key "htmlKey" in the current website language, no htmlspecialchars applied
diff --git a/typo3/sysext/fluid/Tests/Unit/Core/Fixtures/TestNamespaceTemplateBig.html b/typo3/sysext/fluid/Tests/Unit/Core/Fixtures/TestNamespaceTemplateBig.html
index 6c34fce94b2cfe478593f9bc5c62e375209717e7..bf2e9ffccb7a20d75afe147563c16f4b0174723a 100644
--- a/typo3/sysext/fluid/Tests/Unit/Core/Fixtures/TestNamespaceTemplateBig.html
+++ b/typo3/sysext/fluid/Tests/Unit/Core/Fixtures/TestNamespaceTemplateBig.html
@@ -17,14 +17,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -42,7 +42,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -62,7 +62,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -76,7 +76,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -90,7 +90,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -104,7 +104,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -118,7 +118,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -131,10 +131,10 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -153,12 +153,12 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
 								<f:then>
-									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( htmlEscape:'true', key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
+									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
 								</f:then>
 								<f:else>
 									-
@@ -180,14 +180,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -205,7 +205,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -225,7 +225,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -239,7 +239,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -253,7 +253,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -267,7 +267,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -281,7 +281,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -294,10 +294,10 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -316,12 +316,12 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
 								<f:then>
-									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( htmlEscape:'true', key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
+									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
 								</f:then>
 								<f:else>
 									-
@@ -343,14 +343,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -368,7 +368,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -388,7 +388,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -402,7 +402,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -416,7 +416,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -430,7 +430,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -444,7 +444,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -457,10 +457,10 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -479,12 +479,12 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
 								<f:then>
-									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( htmlEscape:'true', key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
+									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
 								</f:then>
 								<f:else>
 									-
@@ -506,14 +506,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -531,7 +531,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -551,7 +551,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -565,7 +565,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -579,7 +579,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -593,7 +593,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -607,7 +607,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -620,10 +620,10 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -642,12 +642,12 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
 								<f:then>
-									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( htmlEscape:'true', key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
+									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
 								</f:then>
 								<f:else>
 									-
@@ -669,14 +669,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -694,7 +694,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -714,7 +714,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -728,7 +728,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -742,7 +742,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -756,7 +756,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -770,7 +770,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -783,10 +783,10 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -805,12 +805,12 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
 								<f:then>
-									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( htmlEscape:'true', key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
+									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
 								</f:then>
 								<f:else>
 									-
@@ -832,14 +832,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -857,7 +857,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -877,7 +877,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -891,7 +891,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -905,7 +905,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -919,7 +919,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -933,7 +933,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -946,10 +946,10 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -968,12 +968,12 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
 								<f:then>
-									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( htmlEscape:'true', key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
+									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
 								</f:then>
 								<f:else>
 									-
@@ -995,14 +995,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -1020,7 +1020,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -1040,7 +1040,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -1054,7 +1054,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -1068,7 +1068,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -1082,7 +1082,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -1096,7 +1096,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -1109,10 +1109,10 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -1131,12 +1131,12 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
 								<f:then>
-									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( htmlEscape:'true', key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
+									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
 								</f:then>
 								<f:else>
 									-
@@ -1158,14 +1158,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -1183,7 +1183,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -1203,7 +1203,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -1217,7 +1217,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -1231,7 +1231,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -1245,7 +1245,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -1259,7 +1259,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -1272,10 +1272,10 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -1294,12 +1294,12 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
 								<f:then>
-									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( htmlEscape:'true', key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
+									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
 								</f:then>
 								<f:else>
 									-
@@ -1321,14 +1321,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -1346,7 +1346,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -1366,7 +1366,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -1380,7 +1380,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -1394,7 +1394,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -1408,7 +1408,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -1422,7 +1422,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -1435,10 +1435,10 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -1457,12 +1457,12 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
 								<f:then>
-									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( htmlEscape:'true', key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
+									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
 								</f:then>
 								<f:else>
 									-
@@ -1484,14 +1484,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -1509,7 +1509,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -1529,7 +1529,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -1543,7 +1543,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -1557,7 +1557,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -1571,7 +1571,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -1585,7 +1585,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -1598,10 +1598,10 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -1620,12 +1620,12 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
 								<f:then>
-									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( htmlEscape:'true', key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
+									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
 								</f:then>
 								<f:else>
 									-
@@ -1647,14 +1647,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -1672,7 +1672,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -1692,7 +1692,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -1706,7 +1706,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -1720,7 +1720,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -1734,7 +1734,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -1748,7 +1748,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -1761,10 +1761,10 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -1783,12 +1783,12 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
 								<f:then>
-									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( htmlEscape:'true', key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
+									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
 								</f:then>
 								<f:else>
 									-
@@ -1810,14 +1810,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -1835,7 +1835,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -1855,7 +1855,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -1869,7 +1869,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -1883,7 +1883,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -1897,7 +1897,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -1911,7 +1911,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -1924,10 +1924,10 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -1946,12 +1946,12 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
 								<f:then>
-									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( htmlEscape:'true', key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
+									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
 								</f:then>
 								<f:else>
 									-
@@ -1973,14 +1973,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -1998,7 +1998,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -2018,7 +2018,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -2032,7 +2032,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -2046,7 +2046,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -2060,7 +2060,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -2074,7 +2074,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -2087,10 +2087,10 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -2109,12 +2109,12 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
 								<f:then>
-									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( htmlEscape:'true', key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
+									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
 								</f:then>
 								<f:else>
 									-
@@ -2136,14 +2136,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -2161,7 +2161,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -2181,7 +2181,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -2195,7 +2195,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -2209,7 +2209,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -2223,7 +2223,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -2237,7 +2237,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -2250,10 +2250,10 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -2272,12 +2272,12 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
 								<f:then>
-									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( htmlEscape:'true', key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
+									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
 								</f:then>
 								<f:else>
 									-
diff --git a/typo3/sysext/fluid/Tests/Unit/Core/Fixtures/TestNamespaceTemplateBigExpectedResult.html b/typo3/sysext/fluid/Tests/Unit/Core/Fixtures/TestNamespaceTemplateBigExpectedResult.html
index b713c6fad7945b94000a1bb942863c7be33b83d9..97d111418d2523542463758779287b56c3744d18 100644
--- a/typo3/sysext/fluid/Tests/Unit/Core/Fixtures/TestNamespaceTemplateBigExpectedResult.html
+++ b/typo3/sysext/fluid/Tests/Unit/Core/Fixtures/TestNamespaceTemplateBigExpectedResult.html
@@ -15,14 +15,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -40,7 +40,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -60,7 +60,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -74,7 +74,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -88,7 +88,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -102,7 +102,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -116,7 +116,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -129,10 +129,10 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -151,12 +151,12 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
 								<f:then>
-									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( htmlEscape:'true', key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
+									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
 								</f:then>
 								<f:else>
 									-
@@ -178,14 +178,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -203,7 +203,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -223,7 +223,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -237,7 +237,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -251,7 +251,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -265,7 +265,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -279,7 +279,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -292,10 +292,10 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -314,12 +314,12 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
 								<f:then>
-									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( htmlEscape:'true', key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
+									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
 								</f:then>
 								<f:else>
 									-
@@ -341,14 +341,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -366,7 +366,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -386,7 +386,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -400,7 +400,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -414,7 +414,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -428,7 +428,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -442,7 +442,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -455,10 +455,10 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -477,12 +477,12 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
 								<f:then>
-									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( htmlEscape:'true', key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
+									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
 								</f:then>
 								<f:else>
 									-
@@ -504,14 +504,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -529,7 +529,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -549,7 +549,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -563,7 +563,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -577,7 +577,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -591,7 +591,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -605,7 +605,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -618,10 +618,10 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -640,12 +640,12 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
 								<f:then>
-									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( htmlEscape:'true', key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
+									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
 								</f:then>
 								<f:else>
 									-
@@ -667,14 +667,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -692,7 +692,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -712,7 +712,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -726,7 +726,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -740,7 +740,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -754,7 +754,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -768,7 +768,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -781,10 +781,10 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -803,12 +803,12 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
 								<f:then>
-									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( htmlEscape:'true', key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
+									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
 								</f:then>
 								<f:else>
 									-
@@ -830,14 +830,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -855,7 +855,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -875,7 +875,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -889,7 +889,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -903,7 +903,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -917,7 +917,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -931,7 +931,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -944,10 +944,10 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -966,12 +966,12 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
 								<f:then>
-									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( htmlEscape:'true', key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
+									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
 								</f:then>
 								<f:else>
 									-
@@ -993,14 +993,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -1018,7 +1018,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -1038,7 +1038,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -1052,7 +1052,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -1066,7 +1066,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -1080,7 +1080,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -1094,7 +1094,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -1107,10 +1107,10 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -1129,12 +1129,12 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
 								<f:then>
-									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( htmlEscape:'true', key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
+									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
 								</f:then>
 								<f:else>
 									-
@@ -1156,14 +1156,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -1181,7 +1181,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -1201,7 +1201,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -1215,7 +1215,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -1229,7 +1229,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -1243,7 +1243,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -1257,7 +1257,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -1270,10 +1270,10 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -1292,12 +1292,12 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
 								<f:then>
-									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( htmlEscape:'true', key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
+									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
 								</f:then>
 								<f:else>
 									-
@@ -1319,14 +1319,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -1344,7 +1344,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -1364,7 +1364,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -1378,7 +1378,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -1392,7 +1392,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -1406,7 +1406,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -1420,7 +1420,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -1433,10 +1433,10 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -1455,12 +1455,12 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
 								<f:then>
-									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( htmlEscape:'true', key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
+									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
 								</f:then>
 								<f:else>
 									-
@@ -1482,14 +1482,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -1507,7 +1507,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -1527,7 +1527,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -1541,7 +1541,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -1555,7 +1555,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -1569,7 +1569,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -1583,7 +1583,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -1596,10 +1596,10 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -1618,12 +1618,12 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
 								<f:then>
-									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( htmlEscape:'true', key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
+									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
 								</f:then>
 								<f:else>
 									-
@@ -1645,14 +1645,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -1670,7 +1670,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -1690,7 +1690,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -1704,7 +1704,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -1718,7 +1718,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -1732,7 +1732,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -1746,7 +1746,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -1759,10 +1759,10 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -1781,12 +1781,12 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
 								<f:then>
-									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( htmlEscape:'true', key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
+									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
 								</f:then>
 								<f:else>
 									-
@@ -1808,14 +1808,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -1833,7 +1833,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -1853,7 +1853,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -1867,7 +1867,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -1881,7 +1881,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -1895,7 +1895,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -1909,7 +1909,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -1922,10 +1922,10 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -1944,12 +1944,12 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
 								<f:then>
-									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( htmlEscape:'true', key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
+									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
 								</f:then>
 								<f:else>
 									-
@@ -1971,14 +1971,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -1996,7 +1996,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -2016,7 +2016,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -2030,7 +2030,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -2044,7 +2044,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -2058,7 +2058,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -2072,7 +2072,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -2085,10 +2085,10 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -2107,12 +2107,12 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
 								<f:then>
-									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( htmlEscape:'true', key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
+									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
 								</f:then>
 								<f:else>
 									-
@@ -2134,14 +2134,14 @@
 				<thead>
 				<tr data-uid="0" data-l10nparent="0">
 					<th nowrap="nowrap" class="col-icon"></th>
-					<th nowrap="nowrap" class="col-path">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
-					<th nowrap="nowrap" class="col-title">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
+					<th nowrap="nowrap" class="col-path">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_filepath' )}</th>
+					<th nowrap="nowrap" class="col-title">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_file' )}</th>
 					<th nowrap="nowrap" class="col-control"></th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
-					<th nowrap="nowrap">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_fileext' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
+					<th nowrap="nowrap">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
 				</tr>
 				</thead>
 				<tbody>
@@ -2159,7 +2159,7 @@
 							<f:if condition="{file.isMetadataEditable}">
 								<f:then>
 									<a href="#" class="filelist-file-title"
-										 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
+										 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editMetadata' )}"
 										 data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 									>
 										{file.name->f:format.crop( maxCharacters:30 )}
@@ -2179,7 +2179,7 @@
 								<f:if condition="{file.isEditable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-edit"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.editcontent' )}"
 											 data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-page-open" />
@@ -2193,7 +2193,7 @@
 								<f:if condition="{file.publicUrl}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-view"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.view' )}"
 											 data-url="{file.publicUrl}"
 										>
 											<core:icon identifier="actions-document-view" />
@@ -2207,7 +2207,7 @@
 								<f:if condition="{file.isReplaceable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-replace"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.replace' )}"
 											 data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-replace" />
@@ -2221,7 +2221,7 @@
 								<f:if condition="{file.isRenamable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-rename"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.rename' )}"
 											 data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
 										>
 											<core:icon identifier="actions-edit-rename" />
@@ -2235,7 +2235,7 @@
 								<f:if condition="{file.isReadable}">
 									<f:then>
 										<a href="#" class="btn btn-default filelist-file-info"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.info' )}"
 											 data-identifier="{file.combinedIdentifier}"
 										>
 											<core:icon identifier="actions-document-info" />
@@ -2248,10 +2248,10 @@
 								<f:if condition="{file.isDeletable}">
 									<f:then>
 										<a href="#" class="btn btn-default t3js-filelist-delete"
-											 title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
 											 data-identifier="{file.identifier}"
-											 data-title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
-											 data-content="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
+											 data-title="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.delete' )}"
+											 data-content="{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:mess.delete', arguments: {0:file.name} )}"
 											 data-check="{f:if(condition:settings.jsConfirmationDelete, then:'1', else:'0')}"
 											 data-delete-url="{deleteUrl}"
 											 data-delete-type="delete_file"
@@ -2270,12 +2270,12 @@
 						<td nowrap="nowrap">{file.lastModified}</td>
 						<td nowrap="nowrap">{file.size}</td>
 						<td nowrap="nowrap">
-							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
+							<f:if condition="{file.isReadable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:read' )}</strong></f:if><f:if condition="{file.isWritable}"><strong class="text-danger">{f:translate( key:'LLL:EXT:lang/Resources/Private/Language/locallang_mod_file_list.xlf:write' )}</strong></f:if>
 						</td>
 						<td nowrap="nowrap">
 							<f:if condition="{file.referenceCount} > 0">
 								<f:then>
-									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( htmlEscape:'true', key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
+									<a href="#" class="filelist-file-references" data-identifier="{file.combinedIdentifier}" title="{f:translate( key:'LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references' )} ({file.referenceCount})">{file.referenceCount}</a>
 								</f:then>
 								<f:else>
 									-