Index: wp-includes/js/tinymce/langs/wp-langs-en.js
===================================================================
--- wp-includes/js/tinymce/langs/wp-langs-en.js	(revision 17488)
+++ wp-includes/js/tinymce/langs/wp-langs-en.js	(working copy)
@@ -125,12 +125,6 @@
 fullscreen:{
 desc:"Toggle fullscreen mode (Alt+Shift+G)"
 },
-media:{
-desc:"Insert / edit embedded media",
-delta_width:"0",
-delta_height:"0",
-edit:"Edit embedded media"
-},
 fullpage:{
 desc:"Document properties"
 },
@@ -275,110 +269,6 @@
 link_list:"Link list"
 });
 
-tinyMCE.addI18n("en.media_dlg",{
-title:"Insert / edit embedded media",
-general:"General",
-advanced:"Advanced",
-file:"File/URL",
-list:"List",
-size:"Dimensions",
-preview:"Preview",
-constrain_proportions:"Constrain proportions",
-type:"Type",
-id:"Id",
-name:"Name",
-class_name:"Class",
-vspace:"V-Space",
-hspace:"H-Space",
-play:"Auto play",
-loop:"Loop",
-menu:"Show menu",
-quality:"Quality",
-scale:"Scale",
-align:"Align",
-salign:"SAlign",
-wmode:"WMode",
-bgcolor:"Background",
-base:"Base",
-flashvars:"Flashvars",
-liveconnect:"SWLiveConnect",
-autohref:"AutoHREF",
-cache:"Cache",
-hidden:"Hidden",
-controller:"Controller",
-kioskmode:"Kiosk mode",
-playeveryframe:"Play every frame",
-targetcache:"Target cache",
-correction:"No correction",
-enablejavascript:"Enable JavaScript",
-starttime:"Start time",
-endtime:"End time",
-href:"Href",
-qtsrcchokespeed:"Choke speed",
-target:"Target",
-volume:"Volume",
-autostart:"Auto start",
-enabled:"Enabled",
-fullscreen:"Fullscreen",
-invokeurls:"Invoke URLs",
-mute:"Mute",
-stretchtofit:"Stretch to fit",
-windowlessvideo:"Windowless video",
-balance:"Balance",
-baseurl:"Base URL",
-captioningid:"Captioning id",
-currentmarker:"Current marker",
-currentposition:"Current position",
-defaultframe:"Default frame",
-playcount:"Play count",
-rate:"Rate",
-uimode:"UI Mode",
-flash_options:"Flash options",
-qt_options:"Quicktime options",
-wmp_options:"Windows media player options",
-rmp_options:"Real media player options",
-shockwave_options:"Shockwave options",
-autogotourl:"Auto goto URL",
-center:"Center",
-imagestatus:"Image status",
-maintainaspect:"Maintain aspect",
-nojava:"No java",
-prefetch:"Prefetch",
-shuffle:"Shuffle",
-console:"Console",
-numloop:"Num loops",
-controls:"Controls",
-scriptcallbacks:"Script callbacks",
-swstretchstyle:"Stretch style",
-swstretchhalign:"Stretch H-Align",
-swstretchvalign:"Stretch V-Align",
-sound:"Sound",
-progress:"Progress",
-qtsrc:"QT Src",
-qt_stream_warn:"Streamed rtsp resources should be added to the QT Src field under the advanced tab.",
-align_top:"Top",
-align_right:"Right",
-align_bottom:"Bottom",
-align_left:"Left",
-align_center:"Center",
-align_top_left:"Top left",
-align_top_right:"Top right",
-align_bottom_left:"Bottom left",
-align_bottom_right:"Bottom right",
-flv_options:"Flash video options",
-flv_scalemode:"Scale mode",
-flv_buffer:"Buffer",
-flv_startimage:"Start image",
-flv_starttime:"Start time",
-flv_defaultvolume:"Default volume",
-flv_hiddengui:"Hidden GUI",
-flv_autostart:"Auto start",
-flv_loop:"Loop",
-flv_showscalemodes:"Show scale modes",
-flv_smoothvideo:"Smooth video",
-flv_jscallback:"JS Callback"
-});
-
 tinyMCE.addI18n("en.wordpress",{
 wp_adv_desc:"Show/Hide Kitchen Sink (Alt+Shift+Z)",
 wp_more_desc:"Insert More tag (Alt+Shift+T)",
Index: wp-includes/js/tinymce/langs/wp-langs.php
===================================================================
--- wp-includes/js/tinymce/langs/wp-langs.php	(revision 17488)
+++ wp-includes/js/tinymce/langs/wp-langs.php	(working copy)
@@ -148,12 +148,6 @@
 fullscreen:{
 desc:"' . mce_escape( __('Toggle fullscreen mode') ) . ' (Alt+Shift+G)"
 },
-media:{
-desc:"' . mce_escape( __('Insert / edit embedded media') ) . '",
-delta_width:"' . /* translators: Extra width for the media popup in pixels */ mce_escape( _x('0', 'media popup width') ) . '",
-delta_height:"' . /* translators: Extra height for the media popup in pixels */ mce_escape( _x('0', 'media popup height') ) . '",
-edit:"' . mce_escape( __('Edit embedded media') ) . '"
-},
 fullpage:{
 desc:"' . mce_escape( __('Document properties') ) . '"
 },
@@ -298,110 +292,6 @@
 link_list:"' . mce_escape( __('Link list') ) . '"
 });
 
-tinyMCE.addI18n("' . $language . '.media_dlg",{
-title:"' . mce_escape( __('Insert / edit embedded media') ) . '",
-general:"' . mce_escape( __('General') ) . '",
-advanced:"' . mce_escape( __('Advanced') ) . '",
-file:"' . mce_escape( __('File/URL') ) . '",
-list:"' . mce_escape( __('List') ) . '",
-size:"' . mce_escape( __('Dimensions') ) . '",
-preview:"' . mce_escape( __('Preview') ) . '",
-constrain_proportions:"' . mce_escape( __('Constrain proportions') ) . '",
-type:"' . mce_escape( __('Type') ) . '",
-id:"' . mce_escape( __('Id') ) . '",
-name:"' . mce_escape( __('Name') ) . '",
-class_name:"' . mce_escape( __('Class') ) . '",
-vspace:"' . mce_escape( __('V-Space') ) . '",
-hspace:"' . mce_escape( __('H-Space') ) . '",
-play:"' . mce_escape( __('Auto play') ) . '",
-loop:"' . mce_escape( __('Loop') ) . '",
-menu:"' . mce_escape( __('Show menu') ) . '",
-quality:"' . mce_escape( __('Quality') ) . '",
-scale:"' . mce_escape( __('Scale') ) . '",
-align:"' . mce_escape( __('Align') ) . '",
-salign:"' . mce_escape( __('SAlign') ) . '",
-wmode:"' . mce_escape( __('WMode') ) . '",
-bgcolor:"' . mce_escape( __('Background') ) . '",
-base:"' . mce_escape( __('Base') ) . '",
-flashvars:"' . mce_escape( __('Flashvars') ) . '",
-liveconnect:"' . mce_escape( __('SWLiveConnect') ) . '",
-autohref:"' . mce_escape( __('AutoHREF') ) . '",
-cache:"' . mce_escape( __('Cache') ) . '",
-hidden:"' . mce_escape( __('Hidden') ) . '",
-controller:"' . mce_escape( __('Controller') ) . '",
-kioskmode:"' . mce_escape( __('Kiosk mode') ) . '",
-playeveryframe:"' . mce_escape( __('Play every frame') ) . '",
-targetcache:"' . mce_escape( __('Target cache') ) . '",
-correction:"' . mce_escape( __('No correction') ) . '",
-enablejavascript:"' . mce_escape( __('Enable JavaScript') ) . '",
-starttime:"' . mce_escape( __('Start time') ) . '",
-endtime:"' . mce_escape( __('End time') ) . '",
-href:"' . mce_escape( __('href') ) . '",
-qtsrcchokespeed:"' . mce_escape( __('Choke speed') ) . '",
-target:"' . mce_escape( __('Target') ) . '",
-volume:"' . mce_escape( __('Volume') ) . '",
-autostart:"' . mce_escape( __('Auto start') ) . '",
-enabled:"' . mce_escape( __('Enabled') ) . '",
-fullscreen:"' . mce_escape( __('Fullscreen') ) . '",
-invokeurls:"' . mce_escape( __('Invoke URLs') ) . '",
-mute:"' . mce_escape( __('Mute') ) . '",
-stretchtofit:"' . mce_escape( __('Stretch to fit') ) . '",
-windowlessvideo:"' . mce_escape( __('Windowless video') ) . '",
-balance:"' . mce_escape( __('Balance') ) . '",
-baseurl:"' . mce_escape( __('Base URL') ) . '",
-captioningid:"' . mce_escape( __('Captioning id') ) . '",
-currentmarker:"' . mce_escape( __('Current marker') ) . '",
-currentposition:"' . mce_escape( __('Current position') ) . '",
-defaultframe:"' . mce_escape( __('Default frame') ) . '",
-playcount:"' . mce_escape( __('Play count') ) . '",
-rate:"' . mce_escape( __('Rate') ) . '",
-uimode:"' . mce_escape( __('UI Mode') ) . '",
-flash_options:"' . mce_escape( __('Flash options') ) . '",
-qt_options:"' . mce_escape( __('Quicktime options') ) . '",
-wmp_options:"' . mce_escape( __('Windows media player options') ) . '",
-rmp_options:"' . mce_escape( __('Real media player options') ) . '",
-shockwave_options:"' . mce_escape( __('Shockwave options') ) . '",
-autogotourl:"' . mce_escape( __('Auto goto URL') ) . '",
-center:"' . mce_escape( __('Center') ) . '",
-imagestatus:"' . mce_escape( __('Image status') ) . '",
-maintainaspect:"' . mce_escape( __('Maintain aspect') ) . '",
-nojava:"' . mce_escape( __('No java') ) . '",
-prefetch:"' . mce_escape( __('Prefetch') ) . '",
-shuffle:"' . mce_escape( __('Shuffle') ) . '",
-console:"' . mce_escape( __('Console') ) . '",
-numloop:"' . mce_escape( __('Num loops') ) . '",
-controls:"' . mce_escape( __('Controls') ) . '",
-scriptcallbacks:"' . mce_escape( __('Script callbacks') ) . '",
-swstretchstyle:"' . mce_escape( __('Stretch style') ) . '",
-swstretchhalign:"' . mce_escape( __('Stretch H-Align') ) . '",
-swstretchvalign:"' . mce_escape( __('Stretch V-Align') ) . '",
-sound:"' . mce_escape( __('Sound') ) . '",
-progress:"' . mce_escape( __('Progress') ) . '",
-qtsrc:"' . mce_escape( __('QT Src') ) . '",
-qt_stream_warn:"' . mce_escape( __('Streamed rtsp resources should be added to the QT Src field under the advanced tab.') ) . '",
-align_top:"' . mce_escape( __('Top') ) . '",
-align_right:"' . mce_escape( __('Right') ) . '",
-align_bottom:"' . mce_escape( __('Bottom') ) . '",
-align_left:"' . mce_escape( __('Left') ) . '",
-align_center:"' . mce_escape( __('Center') ) . '",
-align_top_left:"' . mce_escape( __('Top left') ) . '",
-align_top_right:"' . mce_escape( __('Top right') ) . '",
-align_bottom_left:"' . mce_escape( __('Bottom left') ) . '",
-align_bottom_right:"' . mce_escape( __('Bottom right') ) . '",
-flv_options:"' . mce_escape( __('Flash video options') ) . '",
-flv_scalemode:"' . mce_escape( __('Scale mode') ) . '",
-flv_buffer:"' . mce_escape( __('Buffer') ) . '",
-flv_startimage:"' . mce_escape( __('Start image') ) . '",
-flv_starttime:"' . mce_escape( __('Start time') ) . '",
-flv_defaultvolume:"' . mce_escape( __('Default volume') ) . '",
-flv_hiddengui:"' . mce_escape( __('Hidden GUI') ) . '",
-flv_autostart:"' . mce_escape( __('Auto start') ) . '",
-flv_loop:"' . mce_escape( __('Loop') ) . '",
-flv_showscalemodes:"' . mce_escape( __('Show scale modes') ) . '",
-flv_smoothvideo:"' . mce_escape( __('Smooth video') ) . '",
-flv_jscallback:"' . mce_escape( __('JS Callback') ) . '"
-});
-
 tinyMCE.addI18n("' . $language . '.wordpress",{
 wp_adv_desc:"' . mce_escape( __('Show/Hide Kitchen Sink') )  . ' (Alt+Shift+Z)",
 wp_more_desc:"' . mce_escape( __('Insert More Tag') ) . ' (Alt+Shift+T)",