diff --git a/typo3/sysext/backend/Resources/Private/Language/locallang_db_new_content_el.xlf b/typo3/sysext/backend/Resources/Private/Language/locallang_db_new_content_el.xlf
index 906693c642188e0484af53d2a88300b6303c1068..76b87ef3d1e67db12fbafe83f5eeeac3a78b7e67 100644
--- a/typo3/sysext/backend/Resources/Private/Language/locallang_db_new_content_el.xlf
+++ b/typo3/sysext/backend/Resources/Private/Language/locallang_db_new_content_el.xlf
@@ -63,30 +63,6 @@
 			<trans-unit id="special_filelinks_description">
 				<source>Makes a list of files for download.</source>
 			</trans-unit>
-			<trans-unit id="special_multimedia_title">
-				<source>Multimedia</source>
-			</trans-unit>
-			<trans-unit id="special_multimedia_description">
-				<source>Inserts a media element like a Flash animation, audio file or video clip.</source>
-			</trans-unit>
-			<trans-unit id="special_media_title">
-				<source>Media</source>
-			</trans-unit>
-			<trans-unit id="special_media_description">
-				<source>Inserts a media element like a Flash animation, audio file or video clip.</source>
-			</trans-unit>
-			<trans-unit id="special_swfobject_title">
-				<source>Inserts a Flash media element.</source>
-			</trans-unit>
-			<trans-unit id="special_swfobject_description">
-				<source>Inserts Flash media element, audio file or video clip.</source>
-			</trans-unit>
-			<trans-unit id="special_qtobject_title">
-				<source>Inserts a Quicktime element.</source>
-			</trans-unit>
-			<trans-unit id="special_qtobject_description">
-				<source>Inserts a Quicktime element like a Quicktime audio file or video clip (*.mov).</source>
-			</trans-unit>
 			<trans-unit id="special_sitemap_title">
 				<source>Sitemap</source>
 			</trans-unit>
diff --git a/typo3/sysext/frontend/Resources/Private/Language/locallang_ttc.xlf b/typo3/sysext/frontend/Resources/Private/Language/locallang_ttc.xlf
index ec2e5d575511edaea2f96d3247047f6fd37a320a..7cfa01d1befbf5fb4ccde50d011d90675cb3cc85 100644
--- a/typo3/sysext/frontend/Resources/Private/Language/locallang_ttc.xlf
+++ b/typo3/sysext/frontend/Resources/Private/Language/locallang_ttc.xlf
@@ -27,9 +27,6 @@
 			<trans-unit id="CType.I.6">
 				<source>File Links</source>
 			</trans-unit>
-			<trans-unit id="CType.I.7">
-				<source>Multimedia</source>
-			</trans-unit>
 			<trans-unit id="CType.I.8">
 				<source>Form</source>
 			</trans-unit>
@@ -60,9 +57,6 @@
 			<trans-unit id="CType.I.17">
 				<source>HTML</source>
 			</trans-unit>
-			<trans-unit id="CType.I.18">
-				<source>Media</source>
-			</trans-unit>
 			<trans-unit id="CType.div.standard">
 				<source>Standard</source>
 			</trans-unit>
@@ -762,165 +756,6 @@
 			<trans-unit id="tabs.plugin">
 				<source>Plugin</source>
 			</trans-unit>
-			<trans-unit id="media.options">
-				<source>Media Options</source>
-			</trans-unit>
-			<trans-unit id="media.tabAudio">
-				<source>Audio Element</source>
-			</trans-unit>
-			<trans-unit id="media.tabVideo">
-				<source>Video Element</source>
-			</trans-unit>
-			<trans-unit id="media.tabVideoAccessible">
-				<source>HTML5 Additions</source>
-			</trans-unit>
-			<trans-unit id="media.url">
-				<source>Path or URL</source>
-			</trans-unit>
-			<trans-unit id="media.fallbackUrl">
-				<source>Path or URL to fallback video source (Flash or QuickTime)</source>
-			</trans-unit>
-			<trans-unit id="media.previewImage">
-				<source>Preview-Image for the Video (HTML5 only)</source>
-			</trans-unit>
-			<trans-unit id="media.sources">
-				<source>Video sources for HTML5 &lt;video&gt; element</source>
-			</trans-unit>
-			<trans-unit id="media.captionUrl">
-				<source>Path or URL to captions file</source>
-			</trans-unit>
-			<trans-unit id="media.audioSources">
-				<source>Audio sources for HTML5 &lt;audio&gt; element</source>
-			</trans-unit>
-			<trans-unit id="media.audioDescription">
-				<source>audio description for videos</source>
-			</trans-unit>
-			<trans-unit id="media.audioFallbackUrl">
-				<source>Path or URL to fallback audio source (Flash or QuickTime)</source>
-			</trans-unit>
-			<trans-unit id="media.browseUrlTitle">
-				<source>Select File or URL</source>
-			</trans-unit>
-			<trans-unit id="media.width">
-				<source>Media Width</source>
-			</trans-unit>
-			<trans-unit id="media.height">
-				<source>Media Height</source>
-			</trans-unit>
-			<trans-unit id="media.forcePlayer">
-				<source>Use Player (Flash only)</source>
-			</trans-unit>
-			<trans-unit id="media.type">
-				<source>Media Type</source>
-			</trans-unit>
-			<trans-unit id="media.useHTML5">
-				<source>HTML5 / accessible rendering</source>
-			</trans-unit>
-			<trans-unit id="media.type.video">
-				<source>Video</source>
-			</trans-unit>
-			<trans-unit id="media.type.audio">
-				<source>Audio</source>
-			</trans-unit>
-			<trans-unit id="media.renderType">
-				<source>Render Type</source>
-			</trans-unit>
-			<trans-unit id="media.renderType.auto">
-				<source>Auto</source>
-			</trans-unit>
-			<trans-unit id="media.renderType.swf">
-				<source>Flash Browser Plugin</source>
-			</trans-unit>
-			<trans-unit id="media.renderType.preferHtml5OverFlash">
-				<source>HTML5 video/audio tag with fallback to Flash</source>
-			</trans-unit>
-			<trans-unit id="media.renderType.preferFlashOverHtml5">
-				<source>Flash with fallback to HTML5 video/audio tag</source>
-			</trans-unit>
-			<trans-unit id="media.renderType.qt">
-				<source>QuickTime Browser Plugin</source>
-			</trans-unit>
-			<trans-unit id="media.renderType.embed">
-				<source>Native HTML Embed Element</source>
-			</trans-unit>
-			<trans-unit id="media.additionalOptions">
-				<source>Additional Parameters</source>
-			</trans-unit>
-			<trans-unit id="media.params">
-				<source>Media Parameter</source>
-			</trans-unit>
-			<trans-unit id="media.params.option">
-				<source>Option</source>
-			</trans-unit>
-			<trans-unit id="media.params.setTo">
-				<source>Set to</source>
-			</trans-unit>
-			<trans-unit id="media.params.on">
-				<source>On</source>
-			</trans-unit>
-			<trans-unit id="media.params.off">
-				<source>Off</source>
-			</trans-unit>
-			<trans-unit id="media.params.valueEntry">
-				<source>Value Entry</source>
-			</trans-unit>
-			<trans-unit id="media.params.value">
-				<source>Value</source>
-			</trans-unit>
-			<trans-unit id="media.params.autoPlay">
-				<source>AutoPlay</source>
-			</trans-unit>
-			<trans-unit id="media.params.loop">
-				<source>Loop</source>
-			</trans-unit>
-			<trans-unit id="media.params.quality">
-				<source>Quality</source>
-			</trans-unit>
-			<trans-unit id="media.params.preview">
-				<source>Preview Video</source>
-			</trans-unit>
-			<trans-unit id="media.params.bgColor">
-				<source>Background Color</source>
-			</trans-unit>
-			<trans-unit id="media.params.allowScriptAccess">
-				<source>Allow ScriptAccess</source>
-			</trans-unit>
-			<trans-unit id="media.params.allowFullScreen">
-				<source>Allow Fullscreen</source>
-			</trans-unit>
-			<trans-unit id="media.params.preload">
-				<source>Preload media</source>
-			</trans-unit>
-			<trans-unit id="media.params.controlsBelow">
-				<source>Display controls below video</source>
-			</trans-unit>
-			<trans-unit id="media.params.controlsAtStart">
-				<source>Make controls visible when page loads</source>
-			</trans-unit>
-			<trans-unit id="media.params.controlsHiding">
-				<source>Hide controls when not over the video</source>
-			</trans-unit>
-			<trans-unit id="media.params.defaultVolume">
-				<source>Default volume</source>
-			</trans-unit>
-			<trans-unit id="media.alternativeContent">
-				<source>Alternative Content</source>
-			</trans-unit>
-			<trans-unit id="media.params.customEntry">
-				<source>Custom Parameters</source>
-			</trans-unit>
-			<trans-unit id="media.params.customEntryLabel">
-				<source>Enter flashvars, params or attributes</source>
-			</trans-unit>
-			<trans-unit id="media.noFile">
-				<source>ERROR: Missing URL or File!</source>
-			</trans-unit>
-			<trans-unit id="media.needFlashPlugin">
-				<source>You need a Flash plugin to view this content.</source>
-			</trans-unit>
-			<trans-unit id="media.downloadFlash">
-				<source>Click here to download the latest version.</source>
-			</trans-unit>
 			<trans-unit id="sys_language_uid_formlabel">
 				<source>Language</source>
 			</trans-unit>
@@ -957,9 +792,6 @@
 			<trans-unit id="bodytext.ALT.media_formlabel">
 				<source>Alternative Content</source>
 			</trans-unit>
-			<trans-unit id="bodytext.ALT.multimedia_formlabel">
-				<source>Parameters</source>
-			</trans-unit>
 			<trans-unit id="bodytext.ALT.textbox_formlabel">
 				<source>Text</source>
 			</trans-unit>
diff --git a/typo3/sysext/mediace/Classes/ContentObject/FlowPlayerContentObject.php b/typo3/sysext/mediace/Classes/ContentObject/FlowPlayerContentObject.php
index 9bc8b0553c960e6686a74e47e453a9f59cd289f3..6d3a044441ab9d9b8267f08fe95ea1ea866325d5 100644
--- a/typo3/sysext/mediace/Classes/ContentObject/FlowPlayerContentObject.php
+++ b/typo3/sysext/mediace/Classes/ContentObject/FlowPlayerContentObject.php
@@ -260,7 +260,7 @@ class FlowPlayerContentObject extends \TYPO3\CMS\Frontend\ContentObject\Abstract
         $flashDownloadUrl = 'http://www.adobe.com/go/getflashplayer';
         $onFail = 'function()  {
 			if (!(flashembed.getVersion()[0] > 0)) {
-				var message = "<p>" + "' . $GLOBALS['TSFE']->sL('LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.needFlashPlugin') . '" + "</p>" + "<p>" + "<a href=\\"' . $flashDownloadUrl . '\\">' . $GLOBALS['TSFE']->sL('LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.downloadFlash') . '</a>" + "</p>";
+				var message = "<p>" + "' . $GLOBALS['TSFE']->sL('LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.needFlashPlugin') . '" + "</p>" + "<p>" + "<a href=\\"' . $flashDownloadUrl . '\\">' . $GLOBALS['TSFE']->sL('LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.downloadFlash') . '</a>" + "</p>";
 				document.getElementById("' . $replaceElementIdString . '_flash_install_info").innerHTML = "<div class=\\"message\\">" + message + "</div>";
 			}
 		}';
diff --git a/typo3/sysext/mediace/Configuration/FlexForms/media.xml b/typo3/sysext/mediace/Configuration/FlexForms/media.xml
index e675b42a2a0e85c1deb92326db8da09b46839061..53f88fc42ceeb5f99b153810e8a9dde0f0558296 100644
--- a/typo3/sysext/mediace/Configuration/FlexForms/media.xml
+++ b/typo3/sysext/mediace/Configuration/FlexForms/media.xml
@@ -4,23 +4,23 @@
 		<sGeneral>
 			<ROOT>
 				<TCEforms>
-					<sheetTitle>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.options</sheetTitle>
+					<sheetTitle>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.options</sheetTitle>
 				</TCEforms>
 				<type>array</type>
 				<el>
 					<mmType>
 						<TCEforms>
 							<onChange>reload</onChange>
-							<label>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.type</label>
+							<label>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.type</label>
 							<config>
 								<type>select</type>
 								<items>
 									<numIndex index="0">
-										<numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.type.video</numIndex>
+										<numIndex index="0">LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.type.video</numIndex>
 										<numIndex index="1">video</numIndex>
 									</numIndex>
 									<numIndex index="1">
-										<numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.type.audio</numIndex>
+										<numIndex index="0">LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.type.audio</numIndex>
 										<numIndex index="1">audio</numIndex>
 									</numIndex>
 								</items>
@@ -29,7 +29,7 @@
 					</mmType>
 					<mmUseHTML5>
 						<TCEforms>
-							<label>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.useHTML5</label>
+							<label>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.useHTML5</label>
 							<displayCond>FIELD:mmType:!=:audio</displayCond>
 							<onChange>reload</onChange>
 							<config>
@@ -40,7 +40,7 @@
 					</mmUseHTML5>
 					<mmWidth>
 						<TCEforms>
-							<label>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.width</label>
+							<label>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.width</label>
 							<config>
 								<type>input</type>
 								<size>8</size>
@@ -51,7 +51,7 @@
 					</mmWidth>
 					<mmHeight>
 						<TCEforms>
-							<label>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.height</label>
+							<label>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.height</label>
 							<config>
 								<type>input</type>
 								<size>8</size>
@@ -62,21 +62,21 @@
 					</mmHeight>
 					<mmRenderType>
 						<TCEforms>
-							<label>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.renderType</label>
+							<label>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.renderType</label>
 							<displayCond>FIELD:mmType:!=:audio</displayCond>
 							<config>
 								<type>select</type>
 								<items>
 									<numIndex index="0">
-										<numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.renderType.auto</numIndex>
+										<numIndex index="0">LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.renderType.auto</numIndex>
 										<numIndex index="1">auto</numIndex>
 									</numIndex>
 									<numIndex index="1">
-										<numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.renderType.qt</numIndex>
+										<numIndex index="0">LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.renderType.qt</numIndex>
 										<numIndex index="1">qt</numIndex>
 									</numIndex>
 									<numIndex index="2">
-										<numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.renderType.embed</numIndex>
+										<numIndex index="0">LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.renderType.embed</numIndex>
 										<numIndex index="1">embed</numIndex>
 									</numIndex>
 								</items>
@@ -85,62 +85,62 @@
 						</TCEforms>
 					</mmRenderType>
 					<mmMediaOptions>
-						<title>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.additionalOptions</title>
+						<title>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.additionalOptions</title>
 						<type>array</type>
 						<section>1</section>
 						<el>
 							<mmMediaOptionsContainer>
 								<type>array</type>
-								<title>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.params</title>
+								<title>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.params</title>
 								<el>
 									<mmParamName>
 										<TCEforms>
-											<label>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.params.option</label>
+											<label>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.params.option</label>
 											<config>
 												<type>select</type>
 												<items>
 													<numIndex index="0">
-														<numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.params.autoPlay</numIndex>
+														<numIndex index="0">LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.params.autoPlay</numIndex>
 														<numIndex index="1">autoPlay</numIndex>
 													</numIndex>
 													<numIndex index="1">
-														<numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.params.loop</numIndex>
+														<numIndex index="0">LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.params.loop</numIndex>
 														<numIndex index="1">loop</numIndex>
 													</numIndex>
 													<numIndex index="2">
-														<numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.params.quality</numIndex>
+														<numIndex index="0">LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.params.quality</numIndex>
 														<numIndex index="1">quality</numIndex>
 													</numIndex>
 													<numIndex index="3">
-														<numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.params.preview</numIndex>
+														<numIndex index="0">LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.params.preview</numIndex>
 														<numIndex index="1">preview</numIndex>
 													</numIndex>
 													<numIndex index="4">
-														<numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.params.allowScriptAccess</numIndex>
+														<numIndex index="0">LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.params.allowScriptAccess</numIndex>
 														<numIndex index="1">allowScriptAccess</numIndex>
 													</numIndex>
 													<numIndex index="5">
-														<numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.params.allowFullScreen</numIndex>
+														<numIndex index="0">LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.params.allowFullScreen</numIndex>
 														<numIndex index="1">allowFullScreen</numIndex>
 													</numIndex>
 													<numIndex index="6">
-														<numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.params.preload</numIndex>
+														<numIndex index="0">LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.params.preload</numIndex>
 														<numIndex index="1">preload</numIndex>
 													</numIndex>
 													<numIndex index="7">
-														<numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.params.controlsBelow</numIndex>
+														<numIndex index="0">LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.params.controlsBelow</numIndex>
 														<numIndex index="1">controlsBelow</numIndex>
 													</numIndex>
 													<numIndex index="8">
-														<numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.params.controlsAtStart</numIndex>
+														<numIndex index="0">LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.params.controlsAtStart</numIndex>
 														<numIndex index="1">controlsAtStart</numIndex>
 													</numIndex>
 													<numIndex index="9">
-														<numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.params.controlsHiding</numIndex>
+														<numIndex index="0">LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.params.controlsHiding</numIndex>
 														<numIndex index="1">controlsHiding</numIndex>
 													</numIndex>
 													<numIndex index="10">
-														<numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.params.defaultVolume</numIndex>
+														<numIndex index="0">LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.params.defaultVolume</numIndex>
 														<numIndex index="1">defaultVolume</numIndex>
 													</numIndex>
 												</items>
@@ -150,20 +150,20 @@
 									</mmParamName>
 									<mmParamSet>
 										<TCEforms>
-											<label>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.params.setTo</label>
+											<label>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.params.setTo</label>
 											<config>
 												<type>select</type>
 												<items>
 													<numIndex index="0">
-														<numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.params.on</numIndex>
+														<numIndex index="0">LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.params.on</numIndex>
 														<numIndex index="1">1</numIndex>
 													</numIndex>
 													<numIndex index="1">
-														<numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.params.off</numIndex>
+														<numIndex index="0">LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.params.off</numIndex>
 														<numIndex index="1">0</numIndex>
 													</numIndex>
 													<numIndex index="2">
-														<numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.params.valueEntry</numIndex>
+														<numIndex index="0">LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.params.valueEntry</numIndex>
 														<numIndex index="1">2</numIndex>
 													</numIndex>
 												</items>
@@ -172,7 +172,7 @@
 									</mmParamSet>
 									<mmParamValue>
 										<TCEforms>
-											<label>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.params.value</label>
+											<label>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.params.value</label>
 											<config>
 												<type>input</type>
 												<size>16</size>
@@ -184,11 +184,11 @@
 							</mmMediaOptionsContainer>
 							<mmMediaCustomParameterContainer>
 								<type>array</type>
-								<title>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.params.customEntry</title>
+								<title>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.params.customEntry</title>
 								<el>
 									<mmParamCustomEntry>
 										<TCEforms>
-											<label>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.params.customEntryLabel</label>
+											<label>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.params.customEntryLabel</label>
 											<config>
 												<type>text</type>
 												<rows>6</rows>
@@ -206,14 +206,14 @@
 		<sVideo>
 			<ROOT>
 				<TCEforms>
-					<sheetTitle>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.tabVideo</sheetTitle>
+					<sheetTitle>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.tabVideo</sheetTitle>
 					<displayCond>FIELD:sGeneral.mmType:!=:audio</displayCond>
 				</TCEforms>
 				<type>array</type>
 				<el>
 					<mmFile>
 						<TCEforms>
-							<label>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.fallbackUrl</label>
+							<label>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.fallbackUrl</label>
 							<config>
 								<type>input</type>
 								<size>60</size>
@@ -222,8 +222,8 @@
 								<wizards type="array">
 									<link type="array">
 										<type>popup</type>
-										<title>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.browseUrlTitle</title>
-										<icon>EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_link.gif</icon>
+										<title>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.browseUrlTitle</title>
+										<icon>EXT:mediace/Resources/Public/Images/FormFieldWizard/wizard_link.gif</icon>
 										<module type="array">
 											<name>wizard_link_browser</name>
 											<urlParameters type="array">
@@ -246,23 +246,23 @@
 		<sVideoAccessible>
 			<ROOT>
 				<TCEforms>
-					<sheetTitle>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.tabVideoAccessible</sheetTitle>
+					<sheetTitle>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.tabVideoAccessible</sheetTitle>
 					<displayCond>FIELD:sGeneral.mmUseHTML5:=:1</displayCond>
 				</TCEforms>
 				<type>array</type>
 				<el>
 					<mmSources>
-						<title>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.sources</title>
+						<title>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.sources</title>
 						<type>array</type>
 						<section>1</section>
 						<el>
 							<mmSourcesContainer>
 								<type>array</type>
-								<title>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.media.url</title>
+								<title>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.media.url</title>
 								<el>
 									<mmSource>
 										<TCEforms>
-											<label>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.url</label>
+											<label>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.url</label>
 											<config>
 												<type>input</type>
 												<size>60</size>
@@ -271,8 +271,8 @@
 												<wizards type="array">
 													<link type="array">
 														<type>popup</type>
-														<title>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.browseUrlTitle</title>
-														<icon>EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_link.gif</icon>
+														<title>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.browseUrlTitle</title>
+														<icon>EXT:mediace/Resources/Public/Images/FormFieldWizard/wizard_link.gif</icon>
 														<module type="array">
 															<name>wizard_link_browser</name>
 															<urlParameters type="array">
@@ -295,7 +295,7 @@
 					</mmSources>
 					<mmCaption>
 						<TCEforms>
-							<label>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.captionUrl</label>
+							<label>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.captionUrl</label>
 							<config>
 								<type>input</type>
 								<size>60</size>
@@ -304,8 +304,8 @@
 								<wizards type="array">
 									<link type="array">
 										<type>popup</type>
-										<title>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.browseUrlTitle</title>
-										<icon>EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_link.gif</icon>
+										<title>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.browseUrlTitle</title>
+										<icon>EXT:mediace/Resources/Public/Images/FormFieldWizard/wizard_link.gif</icon>
 										<module type="array">
 											<name>wizard_link_browser</name>
 											<urlParameters type="array">
@@ -323,17 +323,17 @@
 						</TCEforms>
 					</mmCaption>
 					<mmAudioSources>
-						<title>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.audioDescription</title>
+						<title>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.audioDescription</title>
 						<type>array</type>
 						<section>1</section>
 						<el>
 							<mmAudioSourcesContainer>
 								<type>array</type>
-								<title>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.media.browseUrl</title>
+								<title>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.media.browseUrl</title>
 								<el>
 									<mmAudioSource>
 										<TCEforms>
-											<label>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.browseUrl</label>
+											<label>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.browseUrl</label>
 											<config>
 												<type>input</type>
 												<size>60</size>
@@ -342,8 +342,8 @@
 												<wizards type="array">
 													<link type="array">
 														<type>popup</type>
-														<title>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.browseUrlTitle</title>
-														<icon>EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_link.gif</icon>
+														<title>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.browseUrlTitle</title>
+														<icon>EXT:mediace/Resources/Public/Images/FormFieldWizard/wizard_link.gif</icon>
 														<module type="array">
 															<name>wizard_link_browser</name>
 															<urlParameters type="array">
@@ -371,14 +371,14 @@
 		<sAudio>
 			<ROOT>
 				<TCEforms>
-					<sheetTitle>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.tabAudio</sheetTitle>
+					<sheetTitle>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.tabAudio</sheetTitle>
 					<displayCond>FIELD:sGeneral.mmType:=:audio</displayCond>
 				</TCEforms>
 				<type>array</type>
 				<el>
 					<mmAudioFallback>
 						<TCEforms>
-							<label>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.audioFallbackUrl</label>
+							<label>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.audioFallbackUrl</label>
 							<config>
 								<type>input</type>
 								<size>60</size>
@@ -387,8 +387,8 @@
 								<wizards type="array">
 									<link type="array">
 										<type>popup</type>
-										<title>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.browseUrlTitle</title>
-										<icon>EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_link.gif</icon>
+										<title>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.browseUrlTitle</title>
+										<icon>EXT:mediace/Resources/Public/Images/FormFieldWizard/wizard_link.gif</icon>
 										<module type="array">
 											<name>wizard_link_browser</name>
 											<urlParameters type="array">
@@ -406,17 +406,17 @@
 						</TCEforms>
 					</mmAudioFallback>
 					<mmAudioSources>
-						<title>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.audioSources</title>
+						<title>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.audioSources</title>
 						<type>array</type>
 						<section>1</section>
 						<el>
 							<mmAudioSourcesContainer>
 								<type>array</type>
-								<title>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.media.url</title>
+								<title>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.media.url</title>
 								<el>
 									<mmAudioSource>
 										<TCEforms>
-											<label>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.url</label>
+											<label>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.url</label>
 											<config>
 												<type>input</type>
 												<size>60</size>
@@ -425,8 +425,8 @@
 												<wizards type="array">
 													<link type="array">
 														<type>popup</type>
-														<title>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:media.browseUrlTitle</title>
-														<icon>EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_link.gif</icon>
+														<title>LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:flexform.browseUrlTitle</title>
+														<icon>EXT:mediace/Resources/Public/Images/FormFieldWizard/wizard_link.gif</icon>
 														<module type="array">
 															<name>wizard_link_browser</name>
 															<urlParameters type="array">
diff --git a/typo3/sysext/mediace/Configuration/TCA/Overrides/tt_content.php b/typo3/sysext/mediace/Configuration/TCA/Overrides/tt_content.php
index 37a74fd2c32da89320e91993d27aec1b62080dca..24b84cf52f4a0da9968b17f39c0d43e531abe1c2 100644
--- a/typo3/sysext/mediace/Configuration/TCA/Overrides/tt_content.php
+++ b/typo3/sysext/mediace/Configuration/TCA/Overrides/tt_content.php
@@ -11,7 +11,7 @@ $GLOBALS['TCA']['tt_content']['ctrl']['typeicon_classes']['media'] = 'mimetypes-
 // Register new CType in item list just before "menu"
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTcaSelectItem('tt_content', 'CType',
     array(
-        'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:CType.I.7',
+        'LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:tt_content.CType.item.multimedia',
         'multimedia',
         'content-special-media'
     ),
@@ -19,7 +19,7 @@ $GLOBALS['TCA']['tt_content']['ctrl']['typeicon_classes']['media'] = 'mimetypes-
 );
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTcaSelectItem('tt_content', 'CType',
     array(
-        'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:CType.I.18',
+        'LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:tt_content.CType.item.media',
         'media',
         'content-special-media'
     ),
@@ -29,7 +29,7 @@ $GLOBALS['TCA']['tt_content']['ctrl']['typeicon_classes']['media'] = 'mimetypes-
 // Add new field
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTCAcolumns('tt_content', array(
     'multimedia' => array(
-        'label' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:multimedia',
+        'label' => 'LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:tt_content.multimedia',
         'config' => array(
             'type' => 'group',
             'internal_type' => 'file',
@@ -48,7 +48,7 @@ $GLOBALS['TCA']['tt_content']['types']['multimedia'] = array(
     'showitem' => '--palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:palette.general;general,
 			--palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:palette.header;header,
 		--div--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:tabs.media,
-			--palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:palette.multimediafiles;multimediafiles,
+			--palette--;LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:tt_content.palette.multimediafiles;multimediafiles,
 		--div--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:tabs.appearance,
 			--palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:palette.frames;frames,
 		--div--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:tabs.access,
@@ -67,7 +67,7 @@ $GLOBALS['TCA']['tt_content']['types']['media'] = array(
 			--palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:palette.visibility;visibility,
 			--palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:palette.access;access,
 		--div--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:tabs.behaviour,
-			bodytext;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:bodytext.ALT.media_formlabel,
+			bodytext;LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:tt_content.bodytext,
 		--div--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:tabs.extended'
 );
 $baseDefaultExtrasOfBodytext = '';
@@ -83,7 +83,7 @@ if (!is_array($GLOBALS['TCA']['tt_content']['types']['media']['columnsOverrides'
 $GLOBALS['TCA']['tt_content']['types']['media']['columnsOverrides']['bodytext']['defaultExtras'] = $baseDefaultExtrasOfBodytext . 'richtext:rte_transform[mode=ts_css]';
 
 $GLOBALS['TCA']['tt_content']['palettes']['multimediafiles'] = array(
-    'showitem' => 'multimedia;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:multimedia_formlabel, bodytext;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:bodytext.ALT.multimedia_formlabel',
+    'showitem' => 'multimedia;LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:tt_content.multimedia_formlabel, bodytext;LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:tt_content.bodytext',
 );
 if (!is_array($GLOBALS['TCA']['tt_content']['types']['multimedia']['columnsOverrides'])) {
     $GLOBALS['TCA']['tt_content']['types']['multimedia']['columnsOverrides'] = array();
diff --git a/typo3/sysext/mediace/Configuration/TypoScript/setup.txt b/typo3/sysext/mediace/Configuration/TypoScript/setup.txt
index 26b626aac23cc1e5bf17ddaa13217ec033aa5dc9..b0b91c6ce0189143b887d40484d40e2055f1f1dc 100644
--- a/typo3/sysext/mediace/Configuration/TypoScript/setup.txt
+++ b/typo3/sysext/mediace/Configuration/TypoScript/setup.txt
@@ -13,7 +13,7 @@ tt_content.multimedia {
 
 	20.stdWrap {
 		editIcons = tt_content: multimedia, bodytext
-		editIcons.iconTitle.data = LLL:EXT:css_styled_content/Resources/Private/Language/locallang.xlf:eIcon.multimedia
+		editIcons.iconTitle.data = LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:editIcon.multimedia
 
 		prefixComment = 2 | Multimedia element:
 	}
@@ -74,7 +74,7 @@ tt_content.swfobject {
 	}
 	20.stdWrap {
 		editIcons = tt_content: multimedia, imagewidth, imageheight, pi_flexform, bodytext
-		editIcons.iconTitle.data = LLL:EXT:css_styled_content/Resources/Private/Language/locallang.xlf:eIcon.multimedia
+		editIcons.iconTitle.data = LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:editIcon.multimedia
 
 		prefixComment = 2 | SWFobject element:
 	}
@@ -134,7 +134,7 @@ tt_content.qtobject {
 	}
 	20.stdWrap {
 		editIcons = tt_content: multimedia, imagewidth, imageheight, pi_flexform, bodytext
-		editIcons.iconTitle.data = LLL:EXT:css_styled_content/Resources/Private/Language/locallang.xlf:eIcon.multimedia
+		editIcons.iconTitle.data = LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:editIcon.multimedia
 
 		prefixComment = 2 | QTobject element:
 	}
@@ -185,7 +185,7 @@ tt_content.media {
 	}
 	20.stdWrap {
 		editIcons = tt_content: pi_flexform, bodytext
-		editIcons.iconTitle.data = LLL:EXT:css_styled_content/Resources/Private/Language/locallang.xlf:eIcon.multimedia
+		editIcons.iconTitle.data = LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:editIcon.multimedia
 
 		prefixComment = 2 | Media element:
 	}
diff --git a/typo3/sysext/mediace/Resources/Private/Language/locallang.xlf b/typo3/sysext/mediace/Resources/Private/Language/locallang.xlf
new file mode 100644
index 0000000000000000000000000000000000000000..0599ab0bcbcf4f4c37001f5d8ddac472cce7dd6a
--- /dev/null
+++ b/typo3/sysext/mediace/Resources/Private/Language/locallang.xlf
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xliff version="1.0" xmlns:t3="http://typo3.org/schemas/xliff">
+    <file t3:id="1445518806" source-language="en" datatype="plaintext" original="messages" date="2015-10-22T14:22:32Z" product-name="friendsoftypo3/mediace">
+        <header/>
+        <body>
+            <trans-unit id="editIcon.multimedia">
+                <source>Edit multimedia element</source>
+            </trans-unit>
+            <trans-unit id="tt_content.CType.item.multimedia">
+                <source>Multimedia</source>
+            </trans-unit>
+            <trans-unit id="tt_content.CType.item.media">
+                <source>Media</source>
+            </trans-unit>
+            <trans-unit id="tt_content.palette.multimediafiles">
+                <source>Media</source>
+            </trans-unit>
+            <trans-unit id="tt_content.multimedia">
+                <source>Media File</source>
+            </trans-unit>
+            <trans-unit id="tt_content.multimedia_formlabel">
+                <source>Selected Media File</source>
+            </trans-unit>
+            <trans-unit id="tt_content.bodytext">
+                <source>Parameters</source>
+            </trans-unit>
+            <trans-unit id="flexform.options">
+                <source>Media Options</source>
+            </trans-unit>
+            <trans-unit id="flexform.tabAudio">
+                <source>Audio Element</source>
+            </trans-unit>
+            <trans-unit id="flexform.tabVideo">
+                <source>Video Element</source>
+            </trans-unit>
+            <trans-unit id="flexform.tabVideoAccessible">
+                <source>HTML5 Additions</source>
+            </trans-unit>
+            <trans-unit id="flexform.url">
+                <source>Path or URL</source>
+            </trans-unit>
+            <trans-unit id="flexform.fallbackUrl">
+                <source>Path or URL to fallback video source (Flash or QuickTime)</source>
+            </trans-unit>
+            <trans-unit id="flexform.previewImage">
+                <source>Preview-Image for the Video (HTML5 only)</source>
+            </trans-unit>
+            <trans-unit id="flexform.sources">
+                <source>Video sources for HTML5 &lt;video&gt; element</source>
+            </trans-unit>
+            <trans-unit id="flexform.captionUrl">
+                <source>Path or URL to captions file</source>
+            </trans-unit>
+            <trans-unit id="flexform.audioSources">
+                <source>Audio sources for HTML5 &lt;audio&gt; element</source>
+            </trans-unit>
+            <trans-unit id="flexform.audioDescription">
+                <source>audio description for videos</source>
+            </trans-unit>
+            <trans-unit id="flexform.audioFallbackUrl">
+                <source>Path or URL to fallback audio source (Flash or QuickTime)</source>
+            </trans-unit>
+            <trans-unit id="flexform.browseUrlTitle">
+                <source>Select File or URL</source>
+            </trans-unit>
+            <trans-unit id="flexform.width">
+                <source>Media Width</source>
+            </trans-unit>
+            <trans-unit id="flexform.height">
+                <source>Media Height</source>
+            </trans-unit>
+            <trans-unit id="flexform.forcePlayer">
+                <source>Use Player (Flash only)</source>
+            </trans-unit>
+            <trans-unit id="flexform.type">
+                <source>Media Type</source>
+            </trans-unit>
+            <trans-unit id="flexform.useHTML5">
+                <source>HTML5 / accessible rendering</source>
+            </trans-unit>
+            <trans-unit id="flexform.type.video">
+                <source>Video</source>
+            </trans-unit>
+            <trans-unit id="flexform.type.audio">
+                <source>Audio</source>
+            </trans-unit>
+            <trans-unit id="flexform.renderType">
+                <source>Render Type</source>
+            </trans-unit>
+            <trans-unit id="flexform.renderType.auto">
+                <source>Auto</source>
+            </trans-unit>
+            <trans-unit id="flexform.renderType.swf">
+                <source>Flash Browser Plugin</source>
+            </trans-unit>
+            <trans-unit id="flexform.renderType.preferHtml5OverFlash">
+                <source>HTML5 video/audio tag with fallback to Flash</source>
+            </trans-unit>
+            <trans-unit id="flexform.renderType.preferFlashOverHtml5">
+                <source>Flash with fallback to HTML5 video/audio tag</source>
+            </trans-unit>
+            <trans-unit id="flexform.renderType.qt">
+                <source>QuickTime Browser Plugin</source>
+            </trans-unit>
+            <trans-unit id="flexform.renderType.embed">
+                <source>Native HTML Embed Element</source>
+            </trans-unit>
+            <trans-unit id="flexform.additionalOptions">
+                <source>Additional Parameters</source>
+            </trans-unit>
+            <trans-unit id="flexform.params">
+                <source>Media Parameter</source>
+            </trans-unit>
+            <trans-unit id="flexform.params.option">
+                <source>Option</source>
+            </trans-unit>
+            <trans-unit id="flexform.params.setTo">
+                <source>Set to</source>
+            </trans-unit>
+            <trans-unit id="flexform.params.on">
+                <source>On</source>
+            </trans-unit>
+            <trans-unit id="flexform.params.off">
+                <source>Off</source>
+            </trans-unit>
+            <trans-unit id="flexform.params.valueEntry">
+                <source>Value Entry</source>
+            </trans-unit>
+            <trans-unit id="flexform.params.value">
+                <source>Value</source>
+            </trans-unit>
+            <trans-unit id="flexform.params.autoPlay">
+                <source>AutoPlay</source>
+            </trans-unit>
+            <trans-unit id="flexform.params.loop">
+                <source>Loop</source>
+            </trans-unit>
+            <trans-unit id="flexform.params.quality">
+                <source>Quality</source>
+            </trans-unit>
+            <trans-unit id="flexform.params.preview">
+                <source>Preview Video</source>
+            </trans-unit>
+            <trans-unit id="flexform.params.bgColor">
+                <source>Background Color</source>
+            </trans-unit>
+            <trans-unit id="flexform.params.allowScriptAccess">
+                <source>Allow ScriptAccess</source>
+            </trans-unit>
+            <trans-unit id="flexform.params.allowFullScreen">
+                <source>Allow Fullscreen</source>
+            </trans-unit>
+            <trans-unit id="flexform.params.preload">
+                <source>Preload media</source>
+            </trans-unit>
+            <trans-unit id="flexform.params.controlsBelow">
+                <source>Display controls below video</source>
+            </trans-unit>
+            <trans-unit id="flexform.params.controlsAtStart">
+                <source>Make controls visible when page loads</source>
+            </trans-unit>
+            <trans-unit id="flexform.params.controlsHiding">
+                <source>Hide controls when not over the video</source>
+            </trans-unit>
+            <trans-unit id="flexform.params.defaultVolume">
+                <source>Default volume</source>
+            </trans-unit>
+            <trans-unit id="flexform.alternativeContent">
+                <source>Alternative Content</source>
+            </trans-unit>
+            <trans-unit id="flexform.params.customEntry">
+                <source>Custom Parameters</source>
+            </trans-unit>
+            <trans-unit id="flexform.params.customEntryLabel">
+                <source>Enter flashvars, params or attributes</source>
+            </trans-unit>
+            <trans-unit id="flexform.noFile">
+                <source>ERROR: Missing URL or File!</source>
+            </trans-unit>
+            <trans-unit id="flexform.needFlashPlugin">
+                <source>You need a Flash plugin to view this content.</source>
+            </trans-unit>
+            <trans-unit id="flexform.downloadFlash">
+                <source>Click here to download the latest version.</source>
+            </trans-unit>
+            <trans-unit id="newContentElementWizard.media.title">
+                <source>Media</source>
+            </trans-unit>
+            <trans-unit id="newContentElementWizard.media.description">
+                <source>Inserts a media element like a Flash animation, audio file or video clip.</source>
+            </trans-unit>
+        </body>
+    </file>
+</xliff>
diff --git a/typo3/sysext/mediace/Resources/Public/Images/FormFieldWizard/wizard_link.gif b/typo3/sysext/mediace/Resources/Public/Images/FormFieldWizard/wizard_link.gif
new file mode 100644
index 0000000000000000000000000000000000000000..7bfa6582dfc9e9904718c9ad1a2062bf95f89634
Binary files /dev/null and b/typo3/sysext/mediace/Resources/Public/Images/FormFieldWizard/wizard_link.gif differ
diff --git a/typo3/sysext/mediace/ext_localconf.php b/typo3/sysext/mediace/ext_localconf.php
index 27b26e26b871d6e942d56b91da1b7d3fae795ddd..26e6851d0978ac7e007a185dec79b30851528b77 100644
--- a/typo3/sysext/mediace/ext_localconf.php
+++ b/typo3/sysext/mediace/ext_localconf.php
@@ -13,8 +13,8 @@ $GLOBALS['TYPO3_CONF_VARS']['FE']['ContentObjects']['QTOBJECT']   = \TYPO3\CMS\M
 	mod.wizards.newContentElement.wizardItems {
 		special.elements.media {
 			iconIdentifier = content-special-media
-			title = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:special_media_title
-			description = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:special_media_description
+			title = LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:newContentElementWizard.media.title
+			description = LLL:EXT:mediace/Resources/Private/Language/locallang.xlf:newContentElementWizard.media.description
 			tt_content_defValues.CType = media
 		}
 		special.show := addToList(media)