diff --git a/indra/newview/skins/default/xui/de/floater_web_content.xml b/indra/newview/skins/default/xui/de/floater_web_content.xml
index e537e35951..ff36a0875a 100644
--- a/indra/newview/skins/default/xui/de/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/de/floater_web_content.xml
@@ -10,6 +10,14 @@
 			<icon name="media_secure_lock_flag" tool_tip="Sicheres Browsen"/>
 			<button name="popexternal" tool_tip="Aktuelle URL im Desktop-Browser öffnen"/>
 		</layout_panel>
+		<layout_panel name="debug_controls">
+			<button tool_tip="Web-Tests-Homepage" name="web_test_home_page"/>
+			<button tool_tip="MPEG4 Video-Test" name="VLC Plugin Test MPEG4"/>
+			<button tool_tip="MKV Video-Test" name="VLC Plugin Test MKV"/>
+			<button tool_tip="WebM Video-Test" name="VLC Plugin Test WebM"/>
+			<button tool_tip="MP3 Audio-Test" name="VLC Plugin Test MP3"/>
+			<button tool_tip="FLV Test" name="VLC Plugin Test FLV"/>
+		</layout_panel>
 		<layout_panel name="external_controls">
 			<text name="plugin_fail_text">
 Das Web-Browser-Plugin lädt gerade.
diff --git a/indra/newview/skins/default/xui/de/menu_login.xml b/indra/newview/skins/default/xui/de/menu_login.xml
index 31ce5d19d8..43dba472a5 100644
--- a/indra/newview/skins/default/xui/de/menu_login.xml
+++ b/indra/newview/skins/default/xui/de/menu_login.xml
@@ -28,7 +28,7 @@
 		<menu_item_call label="Fenstergröße einstellen..." name="Set Window Size..."/>
 		<menu_item_call label="Servicebedingungen anzeigen" name="TOS"/>
 		<menu_item_call label="Wichtige Meldung anzeigen" name="Critical"/>
-		<menu_item_call label="Web Content Floater Debug Test" name="Web Content Floater Debug Test"/>
+		<menu_item_call label="Medienbrowser" name="Media Browser"/>
 		<menu label="Protokollierungsstufe festlegen" name="Set Logging Level">
 			<menu_item_check label="Debug" name="Debug"/>
 			<menu_item_check label="Info" name="Info"/>
diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml
index 1f6c0657dc..fd367f9379 100644
--- a/indra/newview/skins/default/xui/de/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/de/menu_viewer.xml
@@ -492,9 +492,8 @@
 			<menu_item_call label="Simulator-Features ausgeben" name="DumpSimFeaturesToChat"/>
 		</menu>
 		<menu label="UI" name="UI">
-			<menu_item_call label="Test Medienbrowser" name="Web Browser Test"/>
 			<menu_item_call label="Test Regionsneustart" name="Region Restart Test"/>
-			<menu_item_call label="Webinhaltsbrowser" name="Web Content Browser"/>
+			<menu_item_call label="Medienbrowser" name="Media Browser"/>
 			<menu_item_call label="Facebook Connection-Test" name="FB Connect Test"/>
 			<menu_item_call label="SelectMgr ausgeben" name="Dump SelectMgr"/>
 			<menu_item_call label="Inventarinfo ausgeben" name="Dump Inventory"/>
diff --git a/indra/newview/skins/default/xui/de/mime_types.xml b/indra/newview/skins/default/xui/de/mime_types.xml
index ee05e47a63..a67edc1958 100644
--- a/indra/newview/skins/default/xui/de/mime_types.xml
+++ b/indra/newview/skins/default/xui/de/mime_types.xml
@@ -57,6 +57,11 @@
 			Echtzeit-Streaming
 		</label>
 	</scheme>
+	<scheme name="libvlc">
+		<label name="libvlc_label">
+			LibVLC-unterstütze Medien
+		</label>
+	</scheme>
 	<mimetype name="blank">
 		<label name="blank_label">
 			- Keine -
@@ -202,6 +207,11 @@
 			Video (MP4)
 		</label>
 	</mimetype>
+	<mimetype name="application/octet-stream">
+		<label name="video/octet-stream">
+			Video
+		</label>
+	</mimetype>
 	<mimetype menu="1" name="video/quicktime">
 		<label name="video/quicktime_label">
 			Video (QuickTime)
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index ff690471a8..ecdbd60e60 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -68,6 +68,7 @@ libcurl-Version: [LIBCURL_VERSION]
 J2C-Decoderversion: [J2C_VERSION]
 Audio-Treiberversion: [AUDIO_DRIVER_VERSION]
 LLCEFLib/CEF-Version: [LLCEFLIB_VERSION]
+LibVLC-Version: [LIBVLC_VERSION]
 Voice-Serverversion: [VOICE_VERSION]
 	</string>
 	<string name="AboutSettings">
diff --git a/indra/newview/skins/default/xui/en/floater_web_content.xml b/indra/newview/skins/default/xui/en/floater_web_content.xml
index 82f53deeae..3b68f88692 100644
--- a/indra/newview/skins/default/xui/en/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/en/floater_web_content.xml
@@ -196,7 +196,7 @@
         height="22"
         layout="topleft"
         left="27"
-        name="VLC Plugin Test"
+        name="VLC Plugin Test MPEG4"
         top="0"
         width="22">
         <button.commit_callback
@@ -216,7 +216,7 @@
         height="22"
         layout="topleft"
         left="51"
-        name="VLC Plugin Test"
+        name="VLC Plugin Test MKV"
         top="0"
         width="22">
         <button.commit_callback
@@ -236,7 +236,7 @@
         height="22"
         layout="topleft"
         left="75"
-        name="VLC Plugin Test"
+        name="VLC Plugin Test WebM"
         top="0"
         width="22">
         <button.commit_callback
@@ -256,7 +256,7 @@
         height="22"
         layout="topleft"
         left="99"
-        name="VLC Plugin Test"
+        name="VLC Plugin Test MP3"
         top="0"
         width="22">
         <button.commit_callback
@@ -276,7 +276,7 @@
         height="22"
         layout="topleft"
         left="123"
-        name="VLC Plugin Test"
+        name="VLC Plugin Test FLV"
         top="0"
         width="22">
         <button.commit_callback