From: Siebrand Mazeland <siebrand@users.mediawiki.org>
Date: Sat, 22 Aug 2009 12:12:43 +0000 (+0000)
Subject: * added missing message "mwe-no_text_tracks_found"
X-Git-Tag: 1.31.0-rc.0~40124
X-Git-Url: http://git.cyclocoop.org/url?a=commitdiff_plain;h=c3c2487a2a12fe000873c733419e04d6ee2ebe71;p=lhc%2Fweb%2Fwiklou.git

* added missing message "mwe-no_text_tracks_found"
* harmonise message prefix
* fix typos in message keys
* fix typos in messages
* remove trailing whitespace

Should be almost done now. Next step is to get a proper mwEmbed.i18n.php, verify and fix that, and give it to the translators.
---

diff --git a/js2/mwEmbed/libAddMedia/mvAdvFirefogg.js b/js2/mwEmbed/libAddMedia/mvAdvFirefogg.js
index 944f99ea10..a4fde39522 100644
--- a/js2/mwEmbed/libAddMedia/mvAdvFirefogg.js
+++ b/js2/mwEmbed/libAddMedia/mvAdvFirefogg.js
@@ -5,7 +5,7 @@
 //@@todo put all msg text into loadGM json
 
 loadGM({
-	"help-sticky" : "Help (click to stick)",
+	"fogg-help-sticky" : "Help (click to stick)",
 	"fogg-cg-preset" : "Preset :  <strong>$1<\/strong>",
 	"fogg-cg-quality" : "Basic quality and resolution control",
 	"fogg-cg-meta" : "Metadata for the clip",
@@ -37,48 +37,48 @@ mvAdvFirefogg.prototype = {
 	config_groups : [ 'preset', 'range', 'quality', 'meta', 'advVideo', 'advAudio'],
 	//list of pre-sets:
 	//local instance encoder config:
-	default_local_settings:{
-		'd'	: 'webvideo',
-		'type'	: 'select',
-		'selectVal': ['webvideo'],
-		'group' : "preset",
-		'pSet' : {
-			'custom':{
-				'descKey': 'fogg-preset-custom',
-				'conf': {}
-			},
-			'webvideo': {
-				'desc': "Web Video Theora, Vorbis 400kbs & 400px max width",
-				'conf': {
-						'maxSize'		: 400,
-						'videoBitrate'	: 544,
-						'audioBitrate'	: 96,
-           				'noUpscaling' 	: true,
-					}
-			},
-			'savebandwith': {
-				'desc': "Low Bandwith Theora, Vorbis 164kbs & 200px max size",
-				'conf': {
-						'maxSize'		: 200,
-						'videoBitrate'	: 164,
-						'audioBitrate' 	: 32,
-            			'samplerate'    : 22050,
-            			'framerate'     : 15,
-            			'channels'      : 1,
-            			'noUpscaling'   : true
-					}
-			},
-			'hqstream':{
-				'desc': "High Quality Theora, Vorbis 1080px max width",
-				'conf': {
-						'maxSize'		: 1080,
-						'videoQuality'	: 6,
-						'audioQuality'	: 3,
-           				'noUpscaling' 	: true,
-					}
-			},
-		}
-	},
+default_local_settings:{
+	'd'	: 'webvideo',
+	'type'	: 'select',
+	'selectVal': ['webvideo'],
+	'group' : "preset",
+	'pSet' : {
+		'custom':{
+			'descKey': 'fogg-preset-custom',
+			'conf': {}
+		},
+		'webvideo': {
+			'desc': "Web Video Theora, Vorbis 400kbs & 400px max width",
+			'conf': {
+				'maxSize'      : 400,
+				'videoBitrate' : 544,
+				'audioBitrate' : 96,
+				'noUpscaling'  : true,
+			}
+		},
+		'savebandwith': {
+			'desc': "Low Bandwith Theora, Vorbis 164kbs & 200px max size",
+			'conf': {
+				'maxSize'       : 200,
+				'videoBitrate'  : 164,
+				'audioBitrate'  : 32,
+				'samplerate'    : 22050,
+				'framerate'     : 15,
+				'channels'      : 1,
+				'noUpscaling'   : true
+			}
+		},
+		'hqstream':{
+			'desc': "High Quality Theora, Vorbis 1080px max width",
+			'conf': {
+				'maxSize'      : 1080,
+				'videoQuality' : 6,
+				'audioQuality' : 3,
+				'noUpscaling'  : true,
+			}
+		},
+	}
+},
 	local_settings: {},
 
 	//core firefogg default encoder configuration
@@ -86,18 +86,18 @@ mvAdvFirefogg.prototype = {
 	default_encoder_config : {
 		//base quality settings:
 		'videoQuality': {
-			'd'			: 5,
-			't'			: 'Video Quality',
-			'range'	 : {'min':0,'max':10},
-			'type'		 : 'slider',
-			'group'		: 'quality',
-			'help'		 : "Used to set the <i>Visual Quality</i> of the encoded video. (not used if you set bitrate in advanced controls below)"
+			'd'     : 5,
+			't'     : 'Video Quality',
+			'range' : {'min':0,'max':10},
+			'type'  : 'slider',
+			'group' : 'quality',
+			'help'  : "Used to set the <i>Visual Quality</i> of the encoded video. (not used if you set bitrate in advanced controls below)"
 		},
 		'twopass':{
-			't'		: "Two Pass Encoding",
-			'type'	: "boolean",
-			'group'	: "quality",
-			'help'	: "Two Pass Encoding enables more consitant quality by making two passes over the video file"
+			't'     : "Two Pass Encoding",
+			'type'  : "boolean",
+			'group' : "quality",
+			'help'  : "Two Pass Encoding enables more consitant quality by making two passes over the video file"
 		},
 		'starttime':{
 			't'		: "Start Second",
@@ -210,8 +210,8 @@ mvAdvFirefogg.prototype = {
 			'type'		: 'select',
 			'selectVal'	: [{'22050':'22 kHz'}, {'44100':'44 khz'}, {'48000':'48 khz'}],
 			'formatSelect'	: function(val){
-        						return (Math.round(val/100)*10) + ' Hz';
-        					},
+				return (Math.round(val/100)*10) + ' Hz';
+			},
 			'help'		: "set output samplerate (in Hz)."
 		},
 		'noaudio':{
@@ -393,7 +393,7 @@ mvAdvFirefogg.prototype = {
 		out+='<tr><td valign="top">'+
 			'<label for="_' + cK + '">' +
 			 cConf.t + ':' +
-			 '<span title="' + gM('help-sticky') + '" class="help_'+ cK + ' ui-icon ui-icon-info" style="float:left"></span>'+
+			 '<span title="' + gM('fogg-help-sticky') + '" class="help_'+ cK + ' ui-icon ui-icon-info" style="float:left"></span>'+
 			 '</label></td><td valign="top">';
 		//if we don't value for this:
 		var dv = ( this.default_encoder_config[cK].d ) ? this.default_encoder_config[cK].d : '';
diff --git a/js2/mwEmbed/libAddMedia/mvBaseUploadInterface.js b/js2/mwEmbed/libAddMedia/mvBaseUploadInterface.js
index 438b563b41..63c2bf838b 100644
--- a/js2/mwEmbed/libAddMedia/mvBaseUploadInterface.js
+++ b/js2/mwEmbed/libAddMedia/mvBaseUploadInterface.js
@@ -1,7 +1,9 @@
 /**
  * the base Upload Interface for uploading.
  *
- * this base uploader is optionally extended by firefogg
+ * this base uploader is optionally extended by Firefogg
+ *
+ * @@todo: checkme: gM 'thumbnail-more' is used; only defined in MediaWiki core. Will that work properly?
  */
 loadGM({
 	"mwe-upload-transcode-in-progress" : "Transcode and upload in progress (do not close this window)",
@@ -670,7 +672,7 @@ mvBaseUploadInterface.prototype = {
 	  )
 	  //just display an empty progress window
 	  $j('#upProgressDialog').dialog('open');
-	   
+
 	  //setup progress bar:
 	  $j('#up-progressbar').progressbar({
 		  value:0
@@ -703,15 +705,15 @@ mvBaseUploadInterface.prototype = {
 	 * doDestCheck checks the destination
 	 */
 	$.fn.doDestCheck = function( opt ){
-		var _this = this;	
-		var destFile = this.selector;	
-		//set up option defaults; 
+		var _this = this;
+		var destFile = this.selector;
+		//set up option defaults;
 		if(!opt.warn_target)
 			opt.warn_target = '#wpDestFile-warning';
-		
-		//empty target warn: 
+
+		//empty target warn:
 		$j(opt.warn_target).empty();
-		
+
 		//show loading
 		$j(destFile).after('<img id = "mw-spinner-wpDestFile" src ="'+ stylepath + '/common/images/spinner.gif" />');
 		//try and get a thumb of the current file (check its destination)
@@ -730,7 +732,7 @@ mvBaseUploadInterface.prototype = {
 					//all good no file there
 				}else{
 					for(var page_id in data.query.pages){
-						var ntitle = ( data.query.normalized)? data.query.normalized[0].to : data.query.pages[ page_id ].title						
+						var ntitle = ( data.query.normalized)? data.query.normalized[0].to : data.query.pages[ page_id ].title
 						var img = data.query.pages[ page_id ].imageinfo[0];
 						$j('#wpDestFile-warning').html(
 							'<ul>' +
@@ -761,6 +763,5 @@ mvBaseUploadInterface.prototype = {
 				}
 			}
 		});
-	}	
+	}
 })(jQuery);
-
diff --git a/js2/mwEmbed/libAddMedia/mvFirefogg.js b/js2/mwEmbed/libAddMedia/mvFirefogg.js
index e57b797e26..0665eefe6e 100644
--- a/js2/mwEmbed/libAddMedia/mvFirefogg.js
+++ b/js2/mwEmbed/libAddMedia/mvFirefogg.js
@@ -723,7 +723,7 @@ mvFirefogg.prototype = { //extends mvBaseUploadInterface
 					form_txt = res.form_txt;
 			}
 			js_log( 'error text is: ' + result_txt );
-			$j( '#dlbox-centered' ).html( '<h3>' + gM('mv_upload_completed') + '</h3>' + result_txt + '<br>' + form_txt);
+			$j( '#dlbox-centered' ).html( '<h3>' + gM('mwe-upload_completed') + '</h3>' + result_txt + '<br>' + form_txt);
 		}
 	}
 };
diff --git a/js2/mwEmbed/libAddMedia/remoteSearchDriver.js b/js2/mwEmbed/libAddMedia/remoteSearchDriver.js
index 5ef8d1a038..7c25db7f8f 100644
--- a/js2/mwEmbed/libAddMedia/remoteSearchDriver.js
+++ b/js2/mwEmbed/libAddMedia/remoteSearchDriver.js
@@ -8,45 +8,44 @@
 	and archive.org
 */
 loadGM({
-	"add_media_wizard" : "Add media wizard",
-	"mv_media_search" : "Media search",
+	"mwe-add_media_wizard" : "Add media wizard",
+	"mwe-media_search" : "Media search",
 	"rsd_box_layout" : "Box layout",
 	"rsd_list_layout" : "List layout",
 	"rsd_results_desc" : "Results",
 	"rsd_results_next" : "next",
 	"rsd_results_prev" : "previous",
 	"rsd_no_results" : "No search results for <b>$1<\/b>",
-	"upload_tab" : "Upload",
+	"mwe-upload_tab" : "Upload",
 	"rsd_layout" : "Layout : ",
 	"rsd_resource_edit" : "Edit resource :  $1",
-	"resource_description_page" : "Resource description page",
+	"mwe-resource_description_page" : "Resource description page",
 	"rsd_local_resource_title" : "Local resource title",
 	"rsd_do_insert" : "Do insert",
-	"cc_title" : "Creative Commons",
-	"cc_by_title" : "Attribution",
-	"cc_nc_title" : "Noncommercial",
-	"cc_nd_title" : "No Derivative Works",
-	"cc_sa_title" : "Share Alike",
-	"cc_pd_title" : "Public Domain",
-	"unknown_license" : "Unknown license",
-	"no_import_by_url" : "This user or wiki <b>can not<\/b> import assets from remote URLs.<\/p><p>Do you need to login?<\/p><p>If permissions are set, you may have to enable $wgAllowCopyUploads (<a href=\"http : \/\/www.mediawiki.org\/wiki\/Manual : $wgAllowCopyUploads\">more information<\/a>).<\/p>",
-	"results_from" : "Results from <a href=\"$1\" target=\"_new\" >$2<\/a>",
-	"missing_desc_see_soruce" : "This asset is missing a description. Please see the [$1 orginal source] and help describe it.",
+	"mwe-cc_title" : "Creative Commons",
+	"mwe-cc_by_title" : "Attribution",
+	"mwe-cc_nc_title" : "Noncommercial",
+	"mwe-cc_nd_title" : "No Derivative Works",
+	"mwe-cc_sa_title" : "Share Alike",
+	"mwe-cc_pd_title" : "Public Domain",
+	"mwe-unknown_license" : "Unknown license",
+	"mwe-no_import_by_url" : "This user or wiki <b>can not<\/b> import assets from remote URLs.<\/p><p>Do you need to login?<\/p><p>If permissions are set, you may have to enable $wgAllowCopyUploads (<a href=\"http : \/\/www.mediawiki.org\/wiki\/Manual : $wgAllowCopyUploads\">more information<\/a>).<\/p>",
+	"mwe-results_from" : "Results from <a href=\"$1\" target=\"_new\" >$2<\/a>",
+	"mwe-missing_desc_see_source" : "This asset is missing a description. Please see the [$1 orginal source] and help describe it.",
 	"rsd_config_error" : "Add media wizard configuration error :  $1",
-	"uploaded_itmes" : "Uploaded Items:",
-	
-	"your_recent_uploads" : "Your Recent Uploads",
-	"upload_a_file": "Upload a New File",
-	
-	"resource_page_desc":"Resource Page Description:",
-	"edit_resource_desc": "Edit WikiText Resource Description:",
-	"local_resource_title": "Local Resource Title:",
-	"watch_this_page": "Watch this page",
-	"do_import_resource": "Do Import Resource",
-	"update_preview": "Update Preview",
-	"cancel_import": "Cancel Import",
-	"importing_asset" : "Importing Asset",
-	"preview_insert_resource": "Preview Insert of Resource: $1"
+
+	"mwe-your_recent_uploads" : "Your recent uploads",
+	"mwe-upload_a_file": "Upload a new file",
+
+	"mwe-resource_page_desc":"Resource page description:",
+	"mwe-edit_resource_desc": "Edit wiki text resource description:",
+	"mwe-local_resource_title": "Local resource title:",
+	"mwe-watch_this_page": "Watch this page",
+	"mwe-do_import_resource": "Import resource",
+	"mwe-update_preview": "Update preview",
+	"mwe-cancel_import": "Cancel import",
+	"mwe-importing_asset" : "Importing asset",
+	"mwe-preview_insert_resource": "Preview insert of resource: $1"
 });
 var default_remote_search_options = {
 	'profile':'mediawiki_edit',
@@ -111,7 +110,7 @@ remoteSearchDriver.prototype = {
 	 *
 	 * (should be note that special tabs like "upload" and "combined" don't go into the content proviers list:
 	 * @note do not use double underscore in content providers names (used for id lookup)
-	 * 
+	 *
 	 * @@todo we will want to load more per user-preference and per category lookup
 	 */
 	content_providers:{
@@ -147,7 +146,7 @@ remoteSearchDriver.prototype = {
 			'lib'	 : 'mediaWiki',
 			'local'	 : true,
 			'tab_img': false
-		},		
+		},
 		'wiki_commons':{
 			'enabled': 1,
 			'checked': 1,
@@ -271,12 +270,12 @@ remoteSearchDriver.prototype = {
 			return js_error('could not find:' + license_key);
 		//set the current license pointer:
 		var cl = this.licenses.cc;
-		var title = gM('cc_title');
+		var title = gM('mwe-cc_title');
 		var imgs = '';
 		var license_set = license_key.split('-');
 		for(var i=0;i < license_set.length; i++){
 			lkey =	 license_set[i];
-			title += ' ' + gM( 'cc_' + lkey + '_title');
+			title += ' ' + gM( 'mwe-cc_' + lkey + '_title');
 			imgs +='<img class="license_desc" width="20" src="' + cl.base_img_url +
 				cl.license_img[ lkey ].im + '">';
 		}
@@ -302,10 +301,10 @@ remoteSearchDriver.prototype = {
 				return this.getLicenceFromKey( i , license_url);
 			}
 		}
-		//could not find it return unknown_license
+		//could not find it return mwe-unknown_license
 		return {
-			'title'	 	: gM('unknown_license'),
-			'img_html'	: '<span>' + gM('unknown_license') + '</span>',
+			'title'	 	: gM('mwe-unknown_license'),
+			'img_html'	: '<span>' + gM('mwe-unknown_license') + '</span>',
 			'lurl'		: license_url
 		};
 	},
@@ -372,7 +371,7 @@ remoteSearchDriver.prototype = {
 			js_log("RemoteSearchDriver:: no target invocation provided (will have to run your own doInitDisplay() )");
 		}else{
 			if(this.target_invocation){
-				$j(this.target_invocation).css('cursor','pointer').attr('title', gM('add_media_wizard')).click(function(){
+				$j(this.target_invocation).css('cursor','pointer').attr('title', gM('mwe-add_media_wizard')).click(function(){
 					_this.doInitDisplay();
 				});
 			}
@@ -443,7 +442,7 @@ remoteSearchDriver.prototype = {
 		var _this = this;
 		//add the parent target_container if not provided or missing
 		if(!_this.target_container || $j(_this.target_container).length==0){
-			$j('body').append('<div id="rsd_modal_target" style="position:absolute;top:30px;left:0px;bottom:45px;right:0px;" title="' + gM('add_media_wizard') + '" ></div>');
+			$j('body').append('<div id="rsd_modal_target" style="position:absolute;top:30px;left:0px;bottom:45px;right:0px;" title="' + gM('mwe-add_media_wizard') + '" ></div>');
 			_this.target_container = '#rsd_modal_target';
 			//js_log('appended: #rsd_modal_target' + $j(_this.target_container).attr('id'));
 			//js_log('added target id:' + $j(_this.target_container).attr('id'));
@@ -521,7 +520,7 @@ remoteSearchDriver.prototype = {
 					'<form id="rsd_form" action="javascript:return false;" method="GET">'+
 						'<input class="ui-widget-content ui-corner-all" type="text" tabindex="1" value="' + dq + '" maxlength="512" id="rsd_q" name="rsd_q" '+
 							'size="20" autocomplete="off"/> '+
-						$j.btnHtml( gM('mv_media_search'), 'rms_search_button', 'search') +
+						$j.btnHtml( gM('mwe-media_search'), 'rms_search_button', 'search') +
 					'</form>';
 		//close up the control container:
 		o+='</div>';
@@ -574,7 +573,7 @@ remoteSearchDriver.prototype = {
 		//set it to loading:
 		mv_set_loading('#tab-upload');
 		//do things async to keep interface snapy
-		setTimeout(function(){				
+		setTimeout(function(){
 			//do config variable reality checks:
 			if( _this.upload_api_target == 'local' ){
 				if( ! _this.local_wiki_api_url ){
@@ -593,46 +592,46 @@ remoteSearchDriver.prototype = {
 			//set the form action based on domain:
 			if( parseUri( document.URL ).host == parseUri( _this.upload_api_target ).host ){
 				mvJsLoader.doLoad(['$j.fn.simpleUploadForm'],function(){
-									
+
 					//get extened info about the file
 					var cp = _this.content_providers['this_wiki'];
 					//check for "this_wiki" enabled
 					if(!cp.enabled){
 						$j('#tab-upload').html('error this_wiki not enabled (can\'t get uploaded file info)');
 						return false;
-					}				
-								
+					}
+
 					//load  this_wiki search system to grab the rObj
 					_this.loadSearchLib(cp, function(){
 						//do basic layout form on left upload "bin" on right
 						$j('#tab-upload').html('<table cellspacing="10">' +
 						'<tr>' +
 							'<td valign="top" style="width:350px;">' +
-								'<h4>' + gM('upload_a_file') + '</h4>' +  
-							 	'<div id="upload_form">' +						 	
+								'<h4>' + gM('mwe-upload_a_file') + '</h4>' +
+							 	'<div id="upload_form">' +
 							 		mv_get_loading_img() +
 							 	'</div>' +
 							'</td>' +
 							'<td valign="top" id="upload_bin_cnt">' +
-							'<h4>' + gM('your_recent_uploads') + '</h4>' +  
+							'<h4>' + gM('mwe-your_recent_uploads') + '</h4>' +
 								'<div id="upload_bin">' +
 									mv_get_loading_img() +
 								'</div>'+
 							'</td>' +
 						'</tr>' +
 						'</table>');
-						
-						
+
+
 						//fill in the user page:
 						if(typeof wgUserName != 'undefined' && wgUserName){
-							//load the upload bin with anything the current user has uploaded 
+							//load the upload bin with anything the current user has uploaded
 							cp.sObj.getUserRecentUploads( wgUserName, function(){
 								_this.drawOutputResults();
-							});								
-						}else{		
-							$j('#upload_bin_cnt').empty();										
-						}						
-						
+							});
+						}else{
+							$j('#upload_bin_cnt').empty();
+						}
+
 						//deal with the api form upload form directly:
 						$j('#upload_form').simpleUploadForm({
 							"api_target" :	_this.upload_api_target ,
@@ -642,14 +641,14 @@ remoteSearchDriver.prototype = {
 								$j( _this.target_container ).append('<div id="temp_edit_loader" '+
 									'style="position:absolute;top:0px;left:0px;bottom:5px;right:4px;background-color:#FFF;">' +
 										mv_get_loading_img('position:absolute;top:30px;left:30px') +
-								'</div>');											
+								'</div>');
 									cp.sObj.addByTitle( wTitle, function( rObj ){
 										$j( _this.target_container ).find('#temp_edit_loader').remove();
-										//redraw (with added result if new) 
-										_this.drawOutputResults();																	
-										//pull up recource editor: 
+										//redraw (with added result if new)
+										_this.drawOutputResults();
+										//pull up recource editor:
 										_this.resourceEdit( rObj, $j('#res_upload_' + rObj.id).get(0) );
-									});								
+									});
 								//return false to close progress window:
 								return false;
 							}
@@ -807,18 +806,18 @@ remoteSearchDriver.prototype = {
 				//combined results are harder to error handle just ignore that repo
 				cp.sObj.loading = false;
 			}else{
-				$j('#tab-' + this.disp_item).html( '<div style="padding:10px">'+ gM('no_import_by_url') +'</div>');
+				$j('#tab-' + this.disp_item).html( '<div style="padding:10px">'+ gM('mwe-no_import_by_url') +'</div>');
 			}
 			return false;
-		}		
+		}
 		_this.loadSearchLib(cp, function(){
 			//do search
 			cp.sObj.getSearchResults();
 			_this.checkResultsDone();
-		});		
+		});
 	},
 	loadSearchLib:function(cp, callback){
-		var _this = this;		
+		var _this = this;
 		//set up the library req:
 		mvJsLoader.doLoad( [
 			'baseRemoteSearch',
@@ -891,7 +890,7 @@ remoteSearchDriver.prototype = {
 			}
 			//do an upload tab if enabled:
 			if( this.enable_upload_tab ){
-				o+='<li class="rsd_cp_tab" ><a id="rsd_tab_upload" href="#tab-upload">' + gM('upload_tab') + '</a></li>';
+				o+='<li class="rsd_cp_tab" ><a id="rsd_tab_upload" href="#tab-upload">' + gM('mwe-upload_tab') + '</a></li>';
 				tabc+='<div id="tab-upload" />';
 				if(this.disp_item == 'upload')
 					selected_tab = inx++;
@@ -945,20 +944,20 @@ remoteSearchDriver.prototype = {
 	//@@todo we could load the id with the content provider id to find the object faster...
 	getResourceFromId:function( rid ){
 		js_log('getResourceFromId:' + rid );
-		//strip out /res/ if preset:				
+		//strip out /res/ if preset:
 		rid = rid.replace(/res_/, '');
 		//js_log("looking at: " + rid);
-		p = rid.split('__');		
+		p = rid.split('__');
 		var cp_id = p[0];
-		var rid = p[1];		
-	
+		var rid = p[1];
+
 		if(cp_id == 'upload')
 			cp_id = 'this_wiki';
-			
+
 		var cp = this.content_providers[cp_id];
 		if(cp && cp['sObj'] && cp.sObj.resultsObj[rid]){
 			return cp.sObj.resultsObj[rid];
-		}		
+		}
 		js_log("ERROR: could not find " + rid);
 		return false;
 	},
@@ -966,15 +965,15 @@ remoteSearchDriver.prototype = {
 		js_log('f:drawOutputResults::' + this.disp_item);
 		var _this = this;
 		var o='';
-		
+
 		var cp_id = this.disp_item;
 		var tab_target = '';
 		if(this.disp_item == 'upload'){
 			tab_target = '#upload_bin';
 			var cp = this.content_providers['this_wiki'];
-		}else{			
+		}else{
 			var cp = this.content_providers[this.disp_item];
-			tab_target = '#tab-' + cp_id;			
+			tab_target = '#tab-' + cp_id;
 		}
 		//empty the existing results:
 		$j(tab_target).empty();
@@ -1002,7 +1001,7 @@ remoteSearchDriver.prototype = {
 						//add a linkback to resource page in upper right:
 						if( rItem.link )
 							o+='<a target="_new" style="position:absolute;top:0px;right:0px" title="' +
-								 gM('resource_description_page') +
+								 gM('mwe-resource_description_page') +
 								'" href="' + rItem.link + '"><img src="http://upload.wikimedia.org/wikipedia/commons/6/6b/Magnify-clip.png"></a>';
 						//add license icons if present
 						if( rItem.license )
@@ -1064,10 +1063,10 @@ remoteSearchDriver.prototype = {
 	addResourceEditLoader:function(maxWidth, overflow_style){
 		var _this = this;
 		if(!maxWidth)maxWidth=400;
-		if(!overflow_style)overflow_style='overflow:auto;';					
-		//remove any old instance: 
+		if(!overflow_style)overflow_style='overflow:auto;';
+		//remove any old instance:
 		$j( _this.target_container ).find('#rsd_resource_edit').remove();
-		//add the edit layout window with loading place holders	
+		//add the edit layout window with loading place holders
 		$j( _this.target_container ).append('<div id="rsd_resource_edit" '+
 			'style="position:absolute;top:0px;left:0px;bottom:5px;right:4px;background-color:#FFF;">' +
 				'<div id="clip_edit_disp" style="position:absolute;' + overflow_style + 'width:100%;height:100%;padding:5px;'+
@@ -1103,7 +1102,7 @@ remoteSearchDriver.prototype = {
 		//append to the top level of model window:
 		_this.addResourceEditLoader(maxWidth, overflow_style);
 		//update add media wizard title:
-		$j( _this.target_container ).dialog( 'option', 'title', gM('add_media_wizard')+': '+ gM('rsd_resource_edit', rObj.title ) );
+		$j( _this.target_container ).dialog( 'option', 'title', gM('mwe-add_media_wizard')+': '+ gM('rsd_resource_edit', rObj.title ) );
 		js_log('did append to: '+ _this.target_container );
 
 		$j('#rsd_resource_edit').css('opacity',0);
@@ -1133,8 +1132,8 @@ remoteSearchDriver.prototype = {
 			'left':'5px',
 			'width': maxWidth + 'px',
 			'height': parseInt( tRatio * maxWidth)  + 'px'
-		}, "slow"); // do it slow to give it a chance to finish loading the HQ version				
-		
+		}, "slow"); // do it slow to give it a chance to finish loading the HQ version
+
 		if( mediaType == 'image' ){
 			_this.loadHQImg(rObj, {'width':maxWidth}, 'rsd_edit_img', function(){
 				$j('.mv_loading_img').remove();
@@ -1160,7 +1159,7 @@ remoteSearchDriver.prototype = {
 			rObj['width'] = imObj.width;
 			rObj['height'] = imObj.height;
 
-			//see if we need to animate some transition			
+			//see if we need to animate some transition
 			if( size.width != imObj.width ){
 				js_log('loadHQImg:size mismatch: ' + size.width + ' != ' + imObj.width );
 				//set the target id to the new size:
@@ -1188,10 +1187,10 @@ remoteSearchDriver.prototype = {
 		var _this = this;
 		var b_target =   _this.target_container + '~ .ui-dialog-buttonpane';
 		$j('#rsd_resource_edit').remove();
-		//restore the resource container: 
+		//restore the resource container:
 		$j('#rsd_results_container').show();
 		//restore the title:
-		$j( _this.target_container ).dialog( 'option', 'title', gM('add_media_wizard'));
+		$j( _this.target_container ).dialog( 'option', 'title', gM('mwe-add_media_wizard'));
 		js_log("should update: " + b_target + ' with: cancel');
 		//restore the buttons:
 		$j(b_target).html( $j.btnHtml( 'Cancel' , 'mv_cancel_rsd', 'close'))
@@ -1346,7 +1345,7 @@ remoteSearchDriver.prototype = {
 						if( rObj.desc ){
 							wt += '|Description= ' + rObj.desc + "\n";
 						}else{
-							wt += '|Description= ' + gM('missing_desc_see_soruce', rObj.link ) + "\n";
+							wt += '|Description= ' + gM('mwe-missing_desc_see_source', rObj.link ) + "\n";
 						}
 
 						//output search specific info
@@ -1365,13 +1364,13 @@ remoteSearchDriver.prototype = {
 							wt+='|other_versions=' + rObj.other_versions + "\n";
 
 						wt+='}}';
-						
+
 						//get any extra categories or helpful links
 						wt+= rObj.pSobj.getExtraResourceDescWiki( rObj );
 
 
 						$j('#rsd_resource_import').remove();//remove any old resource imports
-						
+
 						//@@ show user dialog to import the resource
 						$j( _this.target_container ).append('<div id="rsd_resource_import" '+
 						'class="ui-state-highlight ui-widget-content ui-state-error" ' +
@@ -1380,27 +1379,27 @@ remoteSearchDriver.prototype = {
 								'<div id="rsd_preview_import_container" style="position:absolute;width:50%;bottom:0px;left:0px;overflow:auto;top:30px;">' +
 									rObj.pSobj.getEmbedHTML( rObj, {'id': _this.target_container + '_rsd_pv_vid', 'max_height':'200','only_poster':true} )+ //get embedHTML with small thumb:
 									'<br style="clear both">'+
-									'<strong>'+gM('resource_page_desc') +'</strong>'+
+									'<strong>'+gM('mwe-resource_page_desc') +'</strong>'+
 									'<div id="rsd_import_desc" syle="display:inline;">'+
 										mv_get_loading_img('position:absolute;top:5px;left:5px') +
 									'</div>'+
 								'</div>'+
 								'<div id="rds_edit_import_container" style="position:absolute;left:50%;' +
 									'bottom:0px;top:30px;right:0px;overflow:auto;">'+
-									'<strong>' + gM('local_resource_title') + '</strong><br>'+
+									'<strong>' + gM('mwe-local_resource_title') + '</strong><br>'+
 									'<input type="text" size="30" value="' + rObj.target_resource_title + '" readonly="true"><br>'+
-									'<strong>' + gM('edit_resource_desc') + '</strong>' +
+									'<strong>' + gM('mwe-edit_resource_desc') + '</strong>' +
 									'<textarea id="rsd_import_ta" id="mv_img_desc" style="width:90%;" rows="8" cols="50">' +
 										wt +
 									'</textarea><br>' +
 									'<input type="checkbox" value="true" id="wpWatchthis" name="wpWatchthis" tabindex="7"/>' +
-									'<label for="wpWatchthis">'+gM('watch_this_page')+'</label><br><br><br>' +
+									'<label for="wpWatchthis">'+gM('mwe-watch_this_page')+'</label><br><br><br>' +
 
-									$j.btnHtml(gM('do_import_resource'), 'rsd_import_doimport', 'check' ) + ' ' +
+									$j.btnHtml(gM('mwe-do_import_resource'), 'rsd_import_doimport', 'check' ) + ' ' +
 
-									$j.btnHtml(gM('update_preview'), 'rsd_import_apreview', 'refresh' ) + '<div style="clear:both;height:20px;"/>' +
+									$j.btnHtml(gM('mwe-update_preview'), 'rsd_import_apreview', 'refresh' ) + '<div style="clear:both;height:20px;"/>' +
 
-									$j.btnHtml(gM('cancel_import'), 'rsd_import_acancel', 'close' ) + ' ' +
+									$j.btnHtml(gM('mwe-cancel_import'), 'rsd_import_acancel', 'close' ) + ' ' +
 
 								'</div>'+
 								//output the rendered and non-renderd version of description for easy swiching:
@@ -1536,7 +1535,7 @@ remoteSearchDriver.prototype = {
 							'style="position:absolute;top:0px;'+
 								'left:0px;width:100%;height:100%;'+
 								'z-index:5;background:#FFF;overflow:auto;">'+
-									'<div style="position:absolute;left:30%;right:30%"><h3>'+gM('importing_asset')+'</h3><br>' +
+									'<div style="position:absolute;left:30%;right:30%"><h3>'+gM('mwe-importing_asset')+'</h3><br>' +
 										mv_get_loading_img('','mv_loading_bar_img') +
 									'</div>'+
 							'</div>'
@@ -1568,7 +1567,7 @@ remoteSearchDriver.prototype = {
 									js_log( 'error text is: ' + error_txt );
 									$j( '#rsd_resource_import' ).html( '<h3>Error</h3>' + error_txt + '<br>' + form_txt +
 											'<br>'+
-										'<a href="#" id="rsd_import_error" >' + gM('cancel_import') + '</a>'
+										'<a href="#" id="rsd_import_error" >' + gM('mwe-cancel_import') + '</a>'
 									);
 									//set up cancel action:
 									$j('#rsd_import_error').click(function(){
@@ -1591,12 +1590,12 @@ remoteSearchDriver.prototype = {
 					'style="position:absolute;overflow:hidden;z-index:4;top:0px;bottom:75px;right:0px;left:0px;background-color:#FFF;">' +
 						mv_get_loading_img('top:30px;left:30px') +
 					'</div>');
-			
+
 			var bPlaneTarget = _this.target_container +'~ .ui-dialog-buttonpane';
 			var pTitle = $j( _this.target_container ).dialog('option', 'title');
 
 			//update title:
-			$j( _this.target_container ).dialog('option', 'title', gM('preview_insert_resource', rObj.title) );
+			$j( _this.target_container ).dialog('option', 'title', gM('mwe-preview_insert_resource', rObj.title) );
 
 			//update buttons preview:
 			$j(bPlaneTarget).html( $j.btnHtml( gM('rsd_do_insert'), 'preview_do_insert', 'check') + ' ' )
@@ -1675,7 +1674,7 @@ remoteSearchDriver.prototype = {
 				 //update if its video or audio:
 				 if( rObj.mime.indexOf('audio')!=-1 ||
 				 	 rObj.mime.indexOf('video')!=-1 ||
-				 	 rObj.mime.indexOf('/ogg') !=-1){				 	
+				 	 rObj.mime.indexOf('/ogg') !=-1){
 					 mvJsLoader.embedVideoCheck(function(){
 					 	mv_video_embed();
 					 });
@@ -1701,7 +1700,7 @@ remoteSearchDriver.prototype = {
 		if( this.content_providers[this.disp_item] ){
 			var cp = this.content_providers[this.disp_item];
 			about_desc ='<span style="position:relative;top:0px;font-style:italic;">' +
-					'<i>' + gM('results_from', [cp.homepage, cp.title]) + '</i></span>';
+					'<i>' + gM('mwe-results_from', [cp.homepage, cp.title]) + '</i></span>';
 			$j('#tab-'+this.disp_item).append( '<div id="rds_results_bar">'+
 				'<span style="float:left;top:0px;font-style:italic;">'+
 					gM('rsd_layout')+' '+
diff --git a/js2/mwEmbed/libAddMedia/searchLibs/baseRemoteSearch.js b/js2/mwEmbed/libAddMedia/searchLibs/baseRemoteSearch.js
index f89c378996..687649f26b 100644
--- a/js2/mwEmbed/libAddMedia/searchLibs/baseRemoteSearch.js
+++ b/js2/mwEmbed/libAddMedia/searchLibs/baseRemoteSearch.js
@@ -1,7 +1,7 @@
 //base remote search obj
 
 loadGM({
-	"imported_from" : "$1 imported from [$2 $3]. See the original [$4 resource page] for more information."
+	"mwe-imported_from" : "$1 imported from [$2 $3]. See the original [$4 resource page] for more information."
 })
 // @key is name of rObj variable
 // @value is where to find the value in the item xml
@@ -171,7 +171,7 @@ baseRemoteSearch.prototype = {
 
 	},
 	getImportResourceDescWiki:function(rObj){
-		return gM('imported_from', [rObj.title,  this.cp.homepage, this.cp.title, rObj.link]);
+		return gM('mwe-imported_from', [rObj.title,  this.cp.homepage, this.cp.title, rObj.link]);
 	},
 	//for thigns like categories and the like
 	getExtraResourceDescWiki:function( rObj ){
diff --git a/js2/mwEmbed/libAddMedia/searchLibs/metavidSearch.js b/js2/mwEmbed/libAddMedia/searchLibs/metavidSearch.js
index b043dfd240..a8c8d3986e 100644
--- a/js2/mwEmbed/libAddMedia/searchLibs/metavidSearch.js
+++ b/js2/mwEmbed/libAddMedia/searchLibs/metavidSearch.js
@@ -1,8 +1,8 @@
 /*
-* api modes (implementations should call these objects which inherit the mvBaseRemoteSearch  
+* API modes (implementations should call these objects which inherit the mvBaseRemoteSearch
 */
 loadGM({
-	"mv_stream_title" : "$1 $2 to $3"
+	"mwe-stream_title" : "$1 $2 to $3"
 });
 var metavidSearch = function(iObj) {
 	return this.init(iObj);
@@ -10,10 +10,10 @@ var metavidSearch = function(iObj) {
 metavidSearch.prototype = {
 	reqObj:{  //set up the default request paramaters
 		'order':'recent',
-		'feed_format':'rss'		
+		'feed_format':'rss'
 	},
 	init:function( iObj ){
-		//init base class and inherit: 
+		//init base class and inherit:
 		var baseSearch = new baseRemoteSearch( iObj );
 		for(var i in baseSearch){
 			if(typeof this[i] =='undefined'){
@@ -22,11 +22,11 @@ metavidSearch.prototype = {
 				this['parent_'+i] =  baseSearch[i];
 			}
 		}
-	},	
+	},
 	getSearchResults:function(){
-		//call parent: 
+		//call parent:
 		this.parent_getSearchResults();
-		
+
 		var _this = this;
 		//start loading:
 		_this.loading= 1;
@@ -36,127 +36,127 @@ metavidSearch.prototype = {
 		//add on the req_param
 		for(var i in this.reqObj){
 			url += '&' + i + '=' + this.reqObj[i];
-		}		
+		}
 		url += '&f[0][t]=match&f[0][v]=' + $j('#rsd_q').val();
-		//add offset limit: 
+		//add offset limit:
 		url+='&limit=' + this.cp.limit;
-		url+='&offset=' + this.cp.offset;				
-		
+		url+='&offset=' + this.cp.offset;
+
 		do_request(url, function(data){
-			
-			js_log('mvSearch: got data response'); 
+
+			js_log('mvSearch: got data response');
 			//should have an xml rss data object:
 			_this.addRSSData( data , url );
-			
+
 			//do some metavid specific pos processing on the rObj data:
-			for(var i in _this.resultsObj){				
-				var rObj = _this.resultsObj[i];				
-				var proe = parseUri( rObj['roe_url'] );				
+			for(var i in _this.resultsObj){
+				var rObj = _this.resultsObj[i];
+				var proe = parseUri( rObj['roe_url'] );
 				rObj['start_time'] = proe.queryKey['t'].split('/')[0];
-				rObj['end_time'] = proe.queryKey['t'].split('/')[1];	
+				rObj['end_time'] = proe.queryKey['t'].split('/')[1];
 				rObj['stream_name'] = proe.queryKey['stream_name'];
-								
-				//all metavid content is public domain: 
+
+				//all metavid content is public domain:
 				rObj['license'] = _this.rsd.getLicenceFromKey( 'pd' );
-				
-				//transform the title into a wiki_safe title:			 
+
+				//transform the title into a wiki_safe title:
 				//rObj['titleKey'] = proe.queryKey['stream_name'] + '_' + rObj['start_time'].replace(/:/g,'.') + '_' + rObj['end_time'].replace(/:/g,'.') + '.ogg';
 				rObj['titleKey'] =	 _this.getTitleKey( rObj );
-				
-				//default width of metavid clips:	 
-				rObj['target_width'] = 400;	   
-			}			
-			//done loading: 
+
+				//default width of metavid clips:
+				rObj['target_width'] = 400;
+			}
+			//done loading:
 			_this.loading=0;
 		});
 	},
 	getTitleKey:function( rObj ){
-		return rObj['stream_name'] + '_start-' + rObj['start_time'].replace(/:/g,'.') + '_end-' + rObj['end_time'].replace(/:/g,'.') + '.ogg';	
-	},	
+		return rObj['stream_name'] + '_start-' + rObj['start_time'].replace(/:/g,'.') + '_end-' + rObj['end_time'].replace(/:/g,'.') + '.ogg';
+	},
 	getTitle:function( rObj ){
 		var sn = rObj['stream_name'].replace(/_/g, ' ');
-		sn = sn.charAt(0).toUpperCase() + sn.substr(1);		
-		return gM('mv_stream_title', [ sn, rObj.start_time, rObj.end_time ]);	
-	},	
-	//metavid descption tied to public domain license key (government produced content) 
+		sn = sn.charAt(0).toUpperCase() + sn.substr(1);
+		return gM('mwe-stream_title', [ sn, rObj.start_time, rObj.end_time ]);
+	},
+	//metavid descption tied to public domain license key (government produced content)
 	getPermissionWikiTag:function( rObj ){
 		return '{{PD-USGov}}';
-	},	
+	},
 	getExtraResourceDescWiki:function( rObj ){
 		var o = "\n";
-		//check for person	
+		//check for person
 		if(  rObj.person && rObj.person['label'])
 			o += '* featuring [[' + rObj.person['label'] + ']]' + "\n";
-			
+
 		if( rObj.parent_clip )
 			o += '* part of longer [' + rObj.parent_clip + ' video clip]'+ "\n";
-			
+
 		if( rObj.person && rObj.person['url'] && rObj.person['label'] )
 			o += '* also see speeches by [' +  $j.trim( rObj.person.url ) + ' ' + rObj.person['label'] + ']'+ "\n";
-		
+
 		//check for bill:
 		if( rObj.bill && rObj.bill['label'] && rObj.bill['url'])
-			o += '* related to bill: [[' + rObj.bill['label'] + ']] more bill [' + rObj.bill['url'] + ' video clips]'+ "\n";			
+			o += '* related to bill: [[' + rObj.bill['label'] + ']] more bill [' + rObj.bill['url'] + ' video clips]'+ "\n";
 		return o;
-	},	
+	},
 	//format is "quote" followed by [[name of person]]
-	getInlineDescWiki:function( rObj ){								
-		var o = this.parent_getInlineDescWiki( rObj );		
+	getInlineDescWiki:function( rObj ){
+		var o = this.parent_getInlineDescWiki( rObj );
 		//add in person if found
 		if( rObj.person &&  rObj.person['label'] ){
 			o = $j.trim(  o.replace(rObj.person['label'], '') );
-			//trim leading : 
+			//trim leading :
 			if(o.substr(0,1)==':')
-				o =  o.substr(1);				
-			//add quotes and person at the end: 
+				o =  o.substr(1);
+			//add quotes and person at the end:
 			var d = this.getDateFromLink( rObj.link );
 			o ='"' + o + '" [[' + rObj.person['label'] + ']] on ' + d.toDateString();
-		}		
-		//could do ref or direct link:  
-		o += ' \'\'[' + $j.trim( rObj.link ) + ' source clip]\'\' '; 
-		
+		}
+		//could do ref or direct link:
+		o += ' \'\'[' + $j.trim( rObj.link ) + ' source clip]\'\' ';
+
 		//var o= '"' + o + '" by [[' + rObj.person['label'] + ']] '+
-		//		'<ref>[' + rObj.link + ' Metavid Source Page] for ' + rObj.title +'</ref>';		
-		return o;		
+		//		'<ref>[' + rObj.link + ' Metavid Source Page] for ' + rObj.title +'</ref>';
+		return o;
 	},
 	//give an updated start and end time updates the title and url
 	applyVideoAdj: function( rObj ){
-		js_log('mv ApplyVideoAdj::');		
-		//update the titleKey: 
-		rObj['titleKey'] =	 this.getTitleKey( rObj );	
-		
-		//update the title: 
-		rObj['title'] = this.getTitle( rObj );	
-		
-		//update the interface: 
+		js_log('mv ApplyVideoAdj::');
+		//update the titleKey:
+		rObj['titleKey'] =	 this.getTitleKey( rObj );
+
+		//update the title:
+		rObj['title'] = this.getTitle( rObj );
+
+		//update the interface:
 		js_log('update title to: ' + rObj['title']);
 		$j('#rsd_resource_title').html( gM('rsd_resource_edit', rObj['title'] ) );
-		
-		//if the video is "roe" based select the ogg stream		
-		if( rObj.roe_url && rObj.pSobj.cp.stream_import_key){			
+
+		//if the video is "roe" based select the ogg stream
+		if( rObj.roe_url && rObj.pSobj.cp.stream_import_key){
 			var source = $j('#embed_vid').get(0).media_element.getSourceById( rObj.pSobj.cp.stream_import_key );
 			if(!source){
-				js_error('Error::could not find source: ' +  rObj.pSobj.cp.stream_import_key);					
+				js_error('Error::could not find source: ' +  rObj.pSobj.cp.stream_import_key);
 			}else{
 				rObj['src'] = source.getURI();
 				js_log("g src_key: " + rObj.pSobj.cp.stream_import_key + ' src:' + rObj['src']) ;
 				return true;
 			}
-		}	
+		}
 	},
 	getEmbedHTML:function( rObj , options ){
 	    if(!options)
 		     options={};
 		var id_attr = (options['id'])?' id = "' + options['id'] +'" ': '';
-		var style_attr = (options['max_width'])?' style="width:'+options['max_width']+'px;"':'';	
-		//@@maybe check type here ?	
+		var style_attr = (options['max_width'])?' style="width:'+options['max_width']+'px;"':'';
+		//@@maybe check type here ?
 		if(options['only_poster']){
-			return '<img ' + id_attr + ' src="' + rObj['poster']+'" ' + style_attr + '>';	
+			return '<img ' + id_attr + ' src="' + rObj['poster']+'" ' + style_attr + '>';
 		}else{
 			return '<video ' + id_attr + ' roe="' + rObj['roe_url'] + '"></video>';
 		}
-	},	
-	getImageTransform:function( rObj, opt ){		
+	},
+	getImageTransform:function( rObj, opt ){
 		if( opt.width <= 80 ){
 			return getURLParamReplace( rObj.poster, { 'size' : "icon" } )
 		}else if( opt.width <= 160 ){
@@ -167,38 +167,38 @@ metavidSearch.prototype = {
 			return getURLParamReplace( rObj.poster, { 'size' : 'large' } )
 		}else{
 			return getURLParamReplace( rObj.poster, { 'size' : 'full' } )
-		}		
+		}
 	},
 	getEmbedObjParsedInfo:function(rObj, eb_id){
 		var sources = $j('#'+eb_id).get(0).media_element.getSources();
 		rObj.other_versions ='*[' + rObj['roe_url'] + ' XML of all Video Formats and Timed Text]'+"\n";
 		for(var i in sources){
 			var cur_source = sources[i];
-			//rObj.other_versions += '*['+cur_source.getURI() +' ' + cur_source.title +']' + "\n";			
+			//rObj.other_versions += '*['+cur_source.getURI() +' ' + cur_source.title +']' + "\n";
 			if( cur_source.id ==  this.cp.target_source_id)
 				rObj['url'] = cur_source.getURI();
 		}
 		//js_log('set url to: ' + rObj['url']);
-		return rObj;			
+		return rObj;
 	},
 	//update rObj for import:
 	updateDataForImport:function( rObj ){
 		rObj['author']='US Government';
 		//convert data to UTC type date:
 		var d = this.getDateFromLink( rObj.link );
-		rObj['date'] =	 d.toDateString();		
-		rObj['license_template_tag']='PD-USGov';		
-		//update based on new start time:		 
-		js_log('url is: ' + rObj.src + ' ns: ' + rObj.start_time + ' ne:' + rObj.end_time);		
-			
+		rObj['date'] =	 d.toDateString();
+		rObj['license_template_tag']='PD-USGov';
+		//update based on new start time:
+		js_log('url is: ' + rObj.src + ' ns: ' + rObj.start_time + ' ne:' + rObj.end_time);
+
 		return rObj;
 	},
 	getDateFromLink:function( link ){
-		var dateExp = new RegExp(/_([0-9]+)\-([0-9]+)\-([0-9]+)/);	
+		var dateExp = new RegExp(/_([0-9]+)\-([0-9]+)\-([0-9]+)/);
 		var dParts = link.match (dateExp);
 		var d = new Date();
 		var year_full = (dParts[3].length==2)?'20'+dParts[3].toString():dParts[3];
-		d.setFullYear(year_full, dParts[1]-1, dParts[2]);	
+		d.setFullYear(year_full, dParts[1]-1, dParts[2]);
 		return d;
 	}
-}
\ No newline at end of file
+}
diff --git a/js2/mwEmbed/libAddMedia/seqRemoteSearchDriver.js b/js2/mwEmbed/libAddMedia/seqRemoteSearchDriver.js
index 944a254923..2d994a6f4c 100644
--- a/js2/mwEmbed/libAddMedia/seqRemoteSearchDriver.js
+++ b/js2/mwEmbed/libAddMedia/seqRemoteSearchDriver.js
@@ -10,15 +10,15 @@ seqRemoteSearchDriver.prototype = {
 	init:function( this_seq ){
 		var _this = this;
 		js_log("init:seqRemoteSearchDriver");
-		//setup remote search driver with a seq parent: 
+		//setup remote search driver with a seq parent:
 		this.pSeq = this_seq;
-		var iObj = {			
+		var iObj = {
 			'target_container'	: '#cliplib_ic',
-			'local_wiki_api_url': this_seq.getLocalApiUrl(),										
-			'instance_name'		: this_seq.instance_name + '.mySearch',		
-			'default_query'		: this.pSeq.plObj.title							
-		}		
-		//inherit the remoteSearchDriver properties:n		
+			'local_wiki_api_url': this_seq.getLocalApiUrl(),
+			'instance_name'		: this_seq.instance_name + '.mySearch',
+			'default_query'		: this.pSeq.plObj.title
+		}
+		//inherit the remoteSearchDriver properties:n
 		var tmpRSD = new remoteSearchDriver( iObj );
 		for(var i in tmpRSD){
 			if(this[i]){
@@ -34,100 +34,100 @@ seqRemoteSearchDriver.prototype = {
 				js_log("seqRemoteSearchDriver::" + _this.pSeq.disp_menu_item);
 				//call the parent
 				_this.pSeq.parent_do_refresh_timeline();
-				//add our local bindings				
-				_this.addResultBindings();				
+				//add our local bindings
+				_this.addResultBindings();
 				return true;
 			}
 		}
-	},	
+	},
 	resourceEdit:function(){
-		var _this = this;	
-		
-	},	
+		var _this = this;
+
+	},
 	addResultBindings:function(){
-		//set up seq:		
+		//set up seq:
 		var _this = this;
 		//setup parent bindings:
 		this.parent_addResultBindings();
-		
+
 		//add an aditional click binding
 		$j('.rsd_res_item').click(function(){
 			js_log('SeqRemoteSearch: rsd_res_item: click (remove sequence_add_target)');
 			_this.sequence_add_target =false;
 		});
-		
-		//add an additional drag binding					
+
+		//add an additional drag binding
 		$j( '.rsd_res_item' ).draggable('destroy').draggable({
 			helper:function(){
 				return $j( this ).clone().appendTo('body').css({'z-index':9999}).get(0);
-			},		
-			revert:'invalid',						
+			},
+			revert:'invalid',
 			start:function(){
 				js_log('start drag');
-			}								
-		});				
+			}
+		});
 		$j(".mv_clip_drag").droppable( 'destroy' ).droppable({
 			accept: '.rsd_res_item',
 			over:function(event, ui){
 				//js_log("over : mv_clip_drag: " + $j(this).attr('id') );
-				$j(this).css('border-right', 'solid thick red');				
+				$j(this).css('border-right', 'solid thick red');
 			},
 			out:function(event, ui){
-				$j(this).css('border-right', 'solid thin white');				
+				$j(this).css('border-right', 'solid thin white');
 			},
 			drop: function(event, ui) {
 				$j(this).css('border-right', 'solid thin white');
 				js_log("Droped: "+ $j(ui.draggable).attr('id') +' on ' +  $j(this).attr('id') );
 				_this.sequence_add_target =  $j(this).attr('id');
 				//load the orginal draged item
-				var rObj = _this.getResourceFromId( $j(ui.draggable).attr('id') );							
-				_this.resourceEdit(rObj, ui.draggable);				
+				var rObj = _this.getResourceFromId( $j(ui.draggable).attr('id') );
+				_this.resourceEdit(rObj, ui.draggable);
 			}
-		});		
-	
+		});
+
 	},
 	insertResource:function(rObj){
 		var _this = this;
 		js_log("SEQ insert resource after:" + _this.sequence_add_target  + ' of type: ' + rObj.mime);
 		if(_this.sequence_add_target ){
-			var tClip = _this.pSeq.getClipFromSeqID( _this.sequence_add_target );		
+			var tClip = _this.pSeq.getClipFromSeqID( _this.sequence_add_target );
 			var target_order = false;
 			if(tClip)
 				var target_order = tClip.order;
-		} 
-		//@@todo show watting of sorts. 
-		
+		}
+		//@@todo show watting of sorts.
+
 		//get target order:
-		var cat = rObj;			
+		var cat = rObj;
 		//check for target insert path
-		this.checkImportResource( rObj, function(){	
-										
-			var clipConfig = {					
+		this.checkImportResource( rObj, function(){
+
+			var clipConfig = {
 				'type' 	 : rObj.mime,
-				'uri' 	 : _this.cFileNS + ':' + rObj.target_resource_title,				
-				'title'	 : rObj.title								
-			};																
-			//set via local properites if avaliable			
+				'uri' 	 : _this.cFileNS + ':' + rObj.target_resource_title,
+				'title'	 : rObj.title
+			};
+			//set via local properites if avaliable
 			clipConfig['src'] = (rObj.local_src) ? rObj.local_src : rObj.src;
 			clipConfig['poster'] = ( rObj.local_poster ) ? rObj.local_poster : rObj.poster;
-			
+
 			if(rObj.start_time && rObj.end_time){
 				clipConfig['dur'] = npt2seconds( rObj.end_time ) - npt2seconds( rObj.start_time );
 			}else{
-				//provide a default duration if none set 
+				//provide a default duration if none set
 				clipConfig['dur'] = 4;
-			}			
-			
-			//create the media element (target order+1 (since we insert (after) 		
-			_this.pSeq.plObj.tryAddMediaObj( clipConfig, (parseInt(target_order) + 1) );										
-			//refresh the timeline: 
+			}
+
+			//create the media element (target order+1 (since we insert (after)
+			_this.pSeq.plObj.tryAddMediaObj( clipConfig, (parseInt(target_order) + 1) );
+			//refresh the timeline:
 			_this.pSeq.do_refresh_timeline();
-			js_log("run close all: ");						
+			js_log("run close all: ");
 			_this.closeAll();
 		});
 	},
 	getClipEditControlActions:function(){
-		var _this = this;	
+		var _this = this;
 		return {
 			'insert_seq':function(rObj){
 				_this.insertResource( rObj )
@@ -139,26 +139,26 @@ seqRemoteSearchDriver.prototype = {
 	},
 	resourceEdit:function(rObj, rsdElement){
 		var _this = this;
-		//don't resize to default (full screen behavior) 
+		//don't resize to default (full screen behavior)
 		_this.dmodalCss = {};
-		//open up a new target_contaienr: 
+		//open up a new target_contaienr:
 		if($j('#seq_resource_import').length == 0)
 			$j('body').append('<div id="seq_resource_import" style="position:relative"></div>');
-			
+
 		$j('#seq_resource_import').dialog('destroy').dialog({
 			bgiframe: true,
 			width:750,
 			height:480,
 			modal: true,
-			buttons: { 
-				"Cancel": function() { 
-						$j(this).dialog("close"); 
-					} 
+			buttons: {
+				"Cancel": function() {
+						$j(this).dialog("close");
+					}
 				}
 		});
-		_this.target_container = '#seq_resource_import';		
+		_this.target_container = '#seq_resource_import';
 		//do parent resource edit (with updated target)
-		this.parent_resourceEdit(rObj, rsdElement);				
+		this.parent_resourceEdit(rObj, rsdElement);
 	},
 	closeAll:function(){
 		js_log( 'should close: seq_resource_import');
@@ -174,6 +174,6 @@ seqRemoteSearchDriver.prototype = {
 	},
 	cancelClipEditCB:function(){
 		js_log('seqRSD:cancelClipEditCB');
-		$j('#seq_resource_import').dialog('close').dialog('destroy').remove();			
+		$j('#seq_resource_import').dialog('close').dialog('destroy').remove();
 	}
-};
\ No newline at end of file
+};
diff --git a/js2/mwEmbed/libAddMedia/simpleUploadForm.js b/js2/mwEmbed/libAddMedia/simpleUploadForm.js
index 978e2520be..1239689b4b 100644
--- a/js2/mwEmbed/libAddMedia/simpleUploadForm.js
+++ b/js2/mwEmbed/libAddMedia/simpleUploadForm.js
@@ -5,14 +5,14 @@
  */
 
 loadGM({
-	"select_file" : "Select file",
-	"more_licence_options" : "For more licence options, view the <a href=\"$1\">normal upload page<\/a>",
-	"select_ownwork" : "I am uploading entirely my own work, and licencing it under : ",
-	"licence_cc-by-sa" : "Creative Commons Share Alike (3.0)",
-	"upload" : "Upload file",
-	"destfilename" : "Destination filename : ",
-	"summary" : "Summary",
-	"error_not_loggedin" : "You do not appear to be logged in or do not have upload privlages."
+	"mwe-select_file" : "Select file",
+	"mwe-more_licence_options" : "For more licence options, view the <a href=\"$1\">normal upload page<\/a>",
+	"mwe-select_ownwork" : "I am uploading entirely my own work, and licencing it under:",
+	"mwe-licence_cc-by-sa" : "Creative Commons Share Alike (3.0)",
+	"mwe-upload" : "Upload file",
+	"mwe-destfilename" : "Destination filename:",
+	"mwe-summary" : "Summary",
+	"mwe-error_not_loggedin" : "You do not appear to be logged in or do not have upload privileges."
 });
 
 var default_form_options = {
@@ -41,7 +41,7 @@ var default_form_options = {
 		//much todo to improved this web form
 		get_mw_token('File:MyRandomFileTokenCheck', opt.api_target, function(eToken){
 			if( !eToken || eToken == '+\\' ){
-				$(this.selector).html( gM('error_not_loggedin') );
+				$(this.selector).html( gM('mwe-error_not_loggedin') );
 				return false;
 			}
 
@@ -54,22 +54,22 @@ var default_form_options = {
 				'<input type="hidden" name="token" value="'+ eToken +'">' +
 
 				//form name set:
-				'<label for="wpUploadFile">' + gM('select_file') + '</label><br>'+
+				'<label for="wpUploadFile">' + gM('mwe-select_file') + '</label><br>'+
 				'<input type="file" style="display: inline;" name="wpUploadFile" size="15"/><br>' +
 
-				'<label for="wpDestFile">' +gM('destfilename') + '</label><br>'+
-				'<input type="text" name="wpDestFile" size="30" /><br>'+								
+				'<label for="wpDestFile">' +gM('mwe-destfilename') + '</label><br>'+
+				'<input type="text" name="wpDestFile" size="30" /><br>'+
 
-				'<label for="wpUploadDescription">' + gM('summary') + ':</label><br>' +
+				'<label for="wpUploadDescription">' + gM('mwe-summary') + ':</label><br>' +
 				'<textarea cols="30" rows="3" name="wpUploadDescription" tabindex="3"/><br>'+
-				
+
 				'<div id="wpDestFile-warning"></div>' +
 				'<div style="clear:both;"></div>' +
-				
-				gM('select_ownwork') + '<br>' +
-				'<input type="checkbox" id="wpLicence" name="wpLicence" value="cc-by-sa">' + gM('licence_cc-by-sa') + '<br>' +
 
-				'<input type="submit" accesskey="s" value="' + gM('upload') + '" name="wpUploadBtn" id="wpUploadBtn"  tabindex="9"/>' +
+				gM('mwe-select_ownwork') + '<br>' +
+				'<input type="checkbox" id="wpLicence" name="wpLicence" value="cc-by-sa">' + gM('mwe-licence_cc-by-sa') + '<br>' +
+
+				'<input type="submit" accesskey="s" value="' + gM('mwe-upload') + '" name="wpUploadBtn" id="wpUploadBtn"  tabindex="9"/>' +
 				//close the form and div
 				'</form>';
 
@@ -109,15 +109,15 @@ var default_form_options = {
 					'warn_target':'#wpDestFile-warning'
 				});
 			});
-			
-			
+
+
 			//do destination check:
-			$j("[name='wpDestFile']").change(function(){				
+			$j("[name='wpDestFile']").change(function(){
 				$j(this).doDestCheck({
 					'warn_target':'#wpDestFile-warning'
 				});
 			});
-			
+
 			if(typeof opt.ondone_cb == 'undefined')
 				opt.ondone_cb = false;
 
@@ -129,13 +129,13 @@ var default_form_options = {
 					'form_rewrite': true,
 					'target_edit_from' : '#suf-upload',
 					'new_source_cb' : function( orgFilename, oggName ){
-						$j("#suf-upload [name='wpDestFile']").val( oggName ).doDestCheck({								
-							warn_target: "#wpDestFile-warning" 
-						});							
+						$j("#suf-upload [name='wpDestFile']").val( oggName ).doDestCheck({
+							warn_target: "#wpDestFile-warning"
+						});
 					},
 					'done_upload_cb' : opt.ondone_cb
 				});
 			}
 		});
 	}
-})(jQuery);
\ No newline at end of file
+})(jQuery);
diff --git a/js2/mwEmbed/libClipEdit/mvClipEdit.js b/js2/mwEmbed/libClipEdit/mvClipEdit.js
index bc27bdf80b..788f954a5e 100644
--- a/js2/mwEmbed/libClipEdit/mvClipEdit.js
+++ b/js2/mwEmbed/libClipEdit/mvClipEdit.js
@@ -7,27 +7,27 @@
 */
 //set gMsg object:
 loadGM({
-	"mv_crop" : "Crop image",
-	"mv_apply_crop" : "Apply crop to image",
-	"mv_reset_crop" : "Reset crop",
-	"mv_insert_image_page" : "Insert into page",
-	"mv_insert_into_sequence" : "Insert into sequence",
-	"mv_preview_insert" : "Preview insert",
-	"mv_cancel_image_insert" : "Cancel insert",
-	"sc_fileopts" : "Clip detail edit",
-	"sc_inoutpoints" : "Set in-out points",
-	"sc_overlays" : "Overlays",
-	"sc_audio" : "Audio control",
-	"sc_duration" : "Duration",
-	"mv_template_properties" : "Template properties",
-	"mv_custom_title" : "Custom title",
-	"mv_edit_properties" : "Edit properties",
-	"mv_other_properties" : "Other properties",
-	"mv_resource_page" : "Resource page:",
-	"mv_set_in_out_points" : "Set in-out points",
-	"mv_start_time" : "Start time",
-	"mv_end_time" : "End time",
-	"mv_preview_inout" : "Preview\/play in-out points"
+	"mwe-crop" : "Crop image",
+	"mwe-apply_crop" : "Apply crop to image",
+	"mwe-reset_crop" : "Reset crop",
+	"mwe-insert_image_page" : "Insert into page",
+	"mwe-insert_into_sequence" : "Insert into sequence",
+	"mwe-preview_insert" : "Preview insert",
+	"mwe-cancel_image_insert" : "Cancel insert",
+	"mwe-sc_fileopts" : "Clip detail edit",
+	"mwe-sc_inoutpoints" : "Set in-out points",
+	"mwe-sc_overlays" : "Overlays",
+	"mwe-sc_audio" : "Audio control",
+	"mwe-sc_duration" : "Duration",
+	"mwe-template_properties" : "Template properties",
+	"mwe-custom_title" : "Custom title",
+	"mwe-edit_properties" : "Edit properties",
+	"mwe-other_properties" : "Other properties",
+	"mwe-resource_page" : "Resource page:",
+	"mwe-set_in_out_points" : "Set in-out points",
+	"mwe-start_time" : "Start time",
+	"mwe-end_time" : "End time",
+	"mwe-preview_inout" : "Preview\/play in-out points"
 });
 
 var default_clipedit_values = {
@@ -218,11 +218,11 @@ mvClipEdit.prototype = {
 		//add html for rObj resource:
 		var o=	'<table>' +
 				'<tr>' +
-					'<td colspan="2"><b>'+gM('mv_edit_properties')+'</b></td>'+
+					'<td colspan="2"><b>'+gM('mwe-edit_properties')+'</b></td>'+
 				'</tr>'+
 				'<tr>'+
 					'<td>' +
-						gM('mv_custom_title') +
+						gM('mwe-custom_title') +
 					'</td>'+
 					'<td><input type="text" size="15" maxwidth="255" value="';
 						if(_this.rObj.title != null)
@@ -235,7 +235,7 @@ mvClipEdit.prototype = {
 			var testing_a = _this.rObj.tVars;
 			//debugger;
 			o+= '<tr>'+
-					'<td colspan="2"><b>' + gM('mv_template_properties') + '</b></td>'+
+					'<td colspan="2"><b>' + gM('mwe-template_properties') + '</b></td>'+
 				'</tr>';
 			for(var i =0; i < _this.rObj.tVars.length ; i++){
 				o+='<tr>'+
@@ -260,11 +260,11 @@ mvClipEdit.prototype = {
 			var res_title = parseUri(_this.rObj.src).file;
 		}
 		o+=	'<tr>'+
-					'<td colspan="2"><b>'+gM('mv_other_properties')+'</b></td>'+
+					'<td colspan="2"><b>'+gM('mwe-other_properties')+'</b></td>'+
 				'</tr>'+
 				'<tr>'+
 					'<td>' +
-						gM('mv_resource_page') +
+						gM('mwe-resource_page') +
 					'</td>' +
 					'<td><a href="' + res_src  +'" '+
 						' target="new">'+
@@ -331,7 +331,7 @@ mvClipEdit.prototype = {
 			}
 			if(include){
 				o+=	'<li>'+
-						'<a id="mv_smi_'+sInx+'" href="#sc_' + sInx + '">' + gM('sc_' + sInx ) + '</a>'+
+						'<a id="mv_smi_'+sInx+'" href="#sc_' + sInx + '">' + gM('mwe-sc_' + sInx ) + '</a>'+
 					'</li>';
 				tabc += '<div id="sc_' + sInx + '" style="overflow:auto;" ></div>';
 			}
@@ -429,23 +429,23 @@ mvClipEdit.prototype = {
 
 	},
 	getSetInOutHtml:function( setInt ){
-		return '<strong>' + gM('mv_set_in_out_points') + '</strong>'+
+		return '<strong>' + gM('mwe-set_in_out_points') + '</strong>'+
 			'<table border="0" style="background: transparent; width:94%;height:50px;">'+
 				'<tr>' +
 					'<td style="width:55px">'+
-						gM('mv_start_time') +
+						gM('mwe-start_time') +
 						'<input class="ui-widget-content ui-corner-all startInOut" size="9" value="' + setInt.start_ntp +'">'+
 					'</td>' +
 					'<td>' +
 						'<div class="inOutSlider"></div>'+
 					'</td>' +
 					'<td style="width:55px">'+
-						gM('mv_end_time') +
+						gM('mwe-end_time') +
 						'<input class="ui-widget-content ui-corner-all endInOut" size="9" value="'+ setInt.end_ntp +'">'+
 					'</td>' +
 				'</tr>' +
 			'</table>'+
-			'<a href="#" class="ui-state-default ui-corner-all ui-icon_link inOutPreviewClip"><span class="ui-icon ui-icon-video"></span>'+ gM('mv_preview_inout') +'</a>';
+			'<a href="#" class="ui-state-default ui-corner-all ui-icon_link inOutPreviewClip"><span class="ui-icon ui-icon-video"></span>'+ gM('mwe-preview_inout') +'</a>';
 	},
 	getInsertDescHtml:function(){
 		var o= '<h3>Inline Description</h3>'+
@@ -466,7 +466,7 @@ mvClipEdit.prototype = {
 		for( var cbType in _this.controlActionsCb ){
 			switch(cbType){
 				case 'insert_seq':
-					$j(b_target).append( $j.btnHtml(gM('mv_insert_into_sequence'), 'mv_insert_sequence', 'check' ) + ' ' )
+					$j(b_target).append( $j.btnHtml(gM('mwe-insert_into_sequence'), 'mv_insert_sequence', 'check' ) + ' ' )
 						.children('.mv_insert_sequence')
 						.btnBind()
 						.click(function(){
@@ -475,7 +475,7 @@ mvClipEdit.prototype = {
 						});
 				break;
 				case 'insert':
-					$j(b_target).append(  $j.btnHtml(gM('mv_insert_image_page'), 'mv_insert_image_page', 'check' ) + ' ' )
+					$j(b_target).append(  $j.btnHtml(gM('mwe-insert_image_page'), 'mv_insert_image_page', 'check' ) + ' ' )
 						.children('.mv_insert_image_page')
 						.btnBind()
 						.click(function(){
@@ -484,7 +484,7 @@ mvClipEdit.prototype = {
 						}).show('slow');
 				break;
 				case 'preview':
-					$j(b_target).append( $j.btnHtml( gM('mv_preview_insert'), 'mv_preview_insert', 'refresh') + ' ' )
+					$j(b_target).append( $j.btnHtml( gM('mwe-preview_insert'), 'mv_preview_insert', 'refresh') + ' ' )
 						.children('.mv_preview_insert')
 						.btnBind()
 						.click(function(){
@@ -493,7 +493,7 @@ mvClipEdit.prototype = {
 						}).show('slow');
 				break;
 				case 'cancel':
-					$j(b_target).append( $j.btnHtml( gM('mv_cancel_image_insert'), 'mv_cancel_img_edit', 'close') + ' ')
+					$j(b_target).append( $j.btnHtml( gM('mwe-cancel_image_insert'), 'mv_cancel_img_edit', 'close') + ' ')
 						.children('.mv_cancel_img_edit')
 						.btnBind()
 						.click(function(){
@@ -520,15 +520,15 @@ mvClipEdit.prototype = {
 		//by default apply Crop tool
 		$j('#'+this.control_ct).html(
 			'<h3>Edit tools</h3>' +
-					'<div class="mv_edit_button mv_crop_button_base" id="mv_crop_button" alt="crop" title="'+gM('mv_crop')+'"/>'+
-					'<a href="#" class="mv_crop_msg">' + gM('mv_crop') + '</a> '+
+					'<div class="mv_edit_button mv_crop_button_base" id="mv_crop_button" alt="crop" title="'+gM('mwe-crop')+'"/>'+
+					'<a href="#" class="mv_crop_msg">' + gM('mwe-crop') + '</a> '+
 					'<span style="display:none" class="mv_crop_msg_load">' + gM('mwe-loading_txt') + '</span> '+
-					'<a href="#" style="display:none" class="mv_apply_crop">' + gM('mv_apply_crop') + '</a> '+
-					'<a href="#" style="display:none" class="mv_reset_crop">' + gM('mv_reset_crop') + '</a> '+
+					'<a href="#" style="display:none" class="mv_apply_crop">' + gM('mwe-apply_crop') + '</a> '+
+					'<a href="#" style="display:none" class="mv_reset_crop">' + gM('mwe-reset_crop') + '</a> '+
 				'<hr style="clear:both"/><br>'+
 			'<span style="float:left;">Layout:</span>' +
-				'<input type="radio" name="mv_layout" id="mv_layout_left" style="float:left"><div id="mv_layout_left_img" title="'+gM('mv_layout_left')+'"/>'+
-				'<input type="radio" name="mv_layout" id="mv_layout_right" style="float:left"><div id="mv_layout_right_img" title="'+gM('mv_layout_left')+'"/>'+
+				'<input type="radio" name="mv_layout" id="mv_layout_left" style="float:left"><div id="mv_layout_left_img" title="'+gM('mwe-layout_left')+'"/>'+
+				'<input type="radio" name="mv_layout" id="mv_layout_right" style="float:left"><div id="mv_layout_right_img" title="'+gM('mwe-layout_left')+'"/>'+
 			'<hr style="clear:both" /><br>' +
 				_this.getInsertDescHtml()
 		);
@@ -536,10 +536,10 @@ mvClipEdit.prototype = {
 		_this.updateInsertControlActions()
 
 		/*scale:
-		 '<div class="mv_edit_button mv_scale_button_base" id="mv_scale_button" alt="crop" title="'+gM('mv_scale')+'"></div>'+
-				'<a href="#" class="mv_scale_msg">' + gM('mv_scale') + '</a><br>'+
-				'<a href="#" style="display:none" class="mv_apply_scale">' + gM('mv_apply_scale') + '</a> '+
-				'<a href="#" style="display:none" class="mv_reset_scale">' + gM('mv_reset_scale') + '</a><br> '+
+		 '<div class="mv_edit_button mv_scale_button_base" id="mv_scale_button" alt="crop" title="'+gM('mwe-scale')+'"></div>'+
+				'<a href="#" class="mv_scale_msg">' + gM('mwe-scale') + '</a><br>'+
+				'<a href="#" style="display:none" class="mv_apply_scale">' + gM('mwe-apply_scale') + '</a> '+
+				'<a href="#" style="display:none" class="mv_reset_scale">' + gM('mwe-reset_scale') + '</a><br> '+
 
 		*/
 		//add bindings:
@@ -573,7 +573,7 @@ mvClipEdit.prototype = {
 		$j('.mv_reset_crop').click(function(){
 			$j('.mv_apply_crop,.mv_reset_crop').hide();
 			$j('.mv_crop_msg').show();
-			$j('#mv_crop_button').removeClass('mv_crop_button_selected').addClass('mv_crop_button_base').attr('title',gM('mv_crop'));
+			$j('#mv_crop_button').removeClass('mv_crop_button_selected').addClass('mv_crop_button_base').attr('title',gM('mwe-crop'));
 			_this.rObj.crop=null;
 			$j('#' + _this.clip_disp_ct ).empty().html(
 				'<img src="' + _this.rObj.edit_url + '" id="rsd_edit_img">'
@@ -600,7 +600,7 @@ mvClipEdit.prototype = {
 		var _this = this;
 		$j('.mv_apply_crop').hide();
 		$j('.mv_crop_msg').show();
-		$j('#mv_crop_button').removeClass('mv_crop_button_selected').addClass('mv_crop_button_base').attr('title',gM('mv_crop'));
+		$j('#mv_crop_button').removeClass('mv_crop_button_selected').addClass('mv_crop_button_base').attr('title',gM('mwe-crop'));
 		js_log( 'click:turn off' );
 		var cat = _this.rObj;
 		if(_this.rObj.crop){
@@ -628,7 +628,7 @@ mvClipEdit.prototype = {
 		var doEnableCrop = function(){
 			$j('.mv_crop_msg_load').hide();
 			$j('.mv_reset_crop,.mv_apply_crop').show();
-			$j('#mv_crop_button').removeClass('mv_crop_button_base').addClass('mv_crop_button_selected').attr('title',gM('mv_crop_done'));
+			$j('#mv_crop_button').removeClass('mv_crop_button_base').addClass('mv_crop_button_selected').attr('title',gM('mwe-crop_done'));
 			$j('#' + _this.clip_disp_ct + ' img').Jcrop({
 				 onSelect: function(c){
 					 js_log('on select:' + c.x +','+ c.y+','+ c.x2+','+ c.y2+','+ c.w+','+ c.h);
diff --git a/js2/mwEmbed/libEmbedVideo/embedVideo.js b/js2/mwEmbed/libEmbedVideo/embedVideo.js
index 6984a31223..f2bd45bf27 100644
--- a/js2/mwEmbed/libEmbedVideo/embedVideo.js
+++ b/js2/mwEmbed/libEmbedVideo/embedVideo.js
@@ -3,53 +3,53 @@
 */
 
 loadGM({
-	"loading_plugin" : "loading plugin <blink>...<\/blink>",
-	"select_playback" : "Set playback preference",
-	"link_back" : "Link back",
-	"error_load_lib" : "Error: mv_embed was unable to load required JavaScript libraries.\nInsert script via DOM has failed. Please try reloading this page.",
-	"error_swap_vid" : "Error: mv_embed was unable to swap the video tag for the mv_embed interface",
-	"add_to_end_of_sequence" : "Add to end of sequence",
-	"missing_video_stream" : "The video file for this stream is missing",
-	"play_clip" : "Play clip",
-	"pause_clip" : "Pause clip",
-	"volume_control" : "Volume control",
-	"player_options" : "Player options",
-	"closed_captions" : "Close captions",
-	"player_fullscreen" : "Fullscreen",
-	"next_clip_msg" : "Play next clip",
-	"prev_clip_msg" : "Play previous clip",
-	"current_clip_msg" : "Continue playing this clip",
-	"seek_to" : "Seek to",
-	"download_segment" : "Download selection:",
-	"download_full" : "Download full video file:",
-	"download_right_click" : "To download, right click and select <i>Save target as...<\/i>",
-	"download_clip" : "Download video",
-	"download_text" : "Download text (<a style=\"color:white\" title=\"cmml\" href=\"http:\/\/wiki.xiph.org\/index.php\/CMML\">CMML<\/a> xml):",
-	"download" : "Download",
-	"share" : "Share",	
-	"credits" : "Credits",
-	"clip_linkback" : "Clip source page",
-	"chose_player" : "Choose Video Player",
-	"share_this_video" : "Share this video",
-	"video_credits" : "Video credits",
-	"menu_btn" : "Menu",
-	"close_btn" : "Close",
-	"mv_ogg-player-vlc-mozilla" : "VLC plugin",
-	"mv_ogg-player-videoElement" : "Native Ogg video support",
-	"mv_ogg-player-vlc-activex" : "VLC ActiveX",
-	"mv_ogg-player-oggPlugin" : "Generic Ogg plugin",
-	"mv_ogg-player-quicktime-mozilla" : "Quicktime plugin",
-	"mv_ogg-player-quicktime-activex" : "Quicktime ActiveX",
-	"mv_ogg-player-cortado" : "Java Cortado",
-	"mv_ogg-player-flowplayer" : "Flowplayer",
-	"mv_ogg-player-selected" : " (selected)",
-	"mv_ogg-player-omtkplayer" : "OMTK Flash Vorbis",
-	"mv_generic_missing_plugin" : "You browser does not appear to support the following playback type: <b>$1<\/b><br \/>Visit the <a href=\"http:\/\/commons.wikimedia.org\/wiki\/Commons:Media_help\">Playback Methods<\/a> page to download a player.<br \/>",
-	"mv_for_best_experience" : "For a better video playback experience we recommend:<br \/><b><a href=\"http:\/\/www.mozilla.com\/en-US\/firefox\/upgrade.html?from=mwEmbed\">Firefox 3.5<\/a>.<\/b>",
-	"mv_do_not_warn_again" : "Dissmiss for now.",
-	"playerselect" : "Players",
-	"read_before_embed": 'Please <a href="http://mediawiki.org/wiki/Security_Notes_on_Remote_Embedding" target="_new">Read This</a> before embeding!',
-	"embed_site_or_blog": "Embed on your site or blog"
+	"mwe-loading_plugin" : "loading plugin <blink>...<\/blink>",
+	"mwe-select_playback" : "Set playback preference",
+	"mwe-link_back" : "Link back",
+	"mwe-error_load_lib" : "Error: mv_embed was unable to load required JavaScript libraries.\nInsert script via DOM has failed. Please try reloading this page.",
+	"mwe-error_swap_vid" : "Error: mv_embed was unable to swap the video tag for the mv_embed interface",
+	"mwe-add_to_end_of_sequence" : "Add to end of sequence",
+	"mwe-missing_video_stream" : "The video file for this stream is missing",
+	"mwe-play_clip" : "Play clip",
+	"mwe-pause_clip" : "Pause clip",
+	"mwe-volume_control" : "Volume control",
+	"mwe-player_options" : "Player options",
+	"mwe-closed_captions" : "Close captions",
+	"mwe-player_fullscreen" : "Fullscreen",
+	"mwe-next_clip_msg" : "Play next clip",
+	"mwe-prev_clip_msg" : "Play previous clip",
+	"mwe-current_clip_msg" : "Continue playing this clip",
+	"mwe-seek_to" : "Seek to",
+	"mwe-download_segment" : "Download selection:",
+	"mwe-download_full" : "Download full video file:",
+	"mwe-download_right_click" : "To download, right click and select <i>Save target as...<\/i>",
+	"mwe-download_clip" : "Download video",
+	"mwe-download_text" : "Download text (<a style=\"color:white\" title=\"cmml\" href=\"http:\/\/wiki.xiph.org\/index.php\/CMML\">CMML<\/a> xml):",
+	"mwe-download" : "Download",
+	"mwe-share" : "Share",
+	"mwe-credits" : "Credits",
+	"mwe-clip_linkback" : "Clip source page",
+	"mwe-chose_player" : "Choose Video Player",
+	"mwe-share_this_video" : "Share this video",
+	"mwe-video_credits" : "Video credits",
+	"mwe-menu_btn" : "Menu",
+	"mwe-close_btn" : "Close",
+	"mwe-ogg-player-vlc-mozilla" : "VLC plugin",
+	"mwe-ogg-player-videoElement" : "Native Ogg video support",
+	"mwe-ogg-player-vlc-activex" : "VLC ActiveX",
+	"mwe-ogg-player-oggPlugin" : "Generic Ogg plugin",
+	"mwe-ogg-player-quicktime-mozilla" : "Quicktime plugin",
+	"mwe-ogg-player-quicktime-activex" : "Quicktime ActiveX",
+	"mwe-ogg-player-cortado" : "Java Cortado",
+	"mwe-ogg-player-flowplayer" : "Flowplayer",
+	"mwe-ogg-player-selected" : " (selected)",
+	"mwe-ogg-player-omtkplayer" : "OMTK Flash Vorbis",
+	"mwe-generic_missing_plugin" : "You browser does not appear to support the following playback type: <b>$1<\/b><br \/>Visit the <a href=\"http:\/\/commons.wikimedia.org\/wiki\/Commons:Media_help\">Playback Methods<\/a> page to download a player.<br \/>",
+	"mwe-for_best_experience" : "For a better video playback experience we recommend:<br \/><b><a href=\"http:\/\/www.mozilla.com\/en-US\/firefox\/upgrade.html?from=mwEmbed\">Firefox 3.5<\/a>.<\/b>",
+	"mwe-do_not_warn_again" : "Dissmiss for now.",
+	"mwe-playerselect" : "Players",
+	"mwe-read_before_embed": 'Please <a href="http://mediawiki.org/wiki/Security_Notes_on_Remote_Embedding" target="_new">Read This</a> before embeding!',
+	"mwe-embed_site_or_blog": "Embed on your site or blog"
 });
 
 var default_video_attributes = {
@@ -68,7 +68,7 @@ var default_video_attributes = {
 	"end":null,
 	"controls":true,
 	"muted":false,
-	
+
 	//roe url (for xml based metadata)
 	"roe":null,
 	//if roe includes metadata tracks we can expose a link to metadata
@@ -82,15 +82,15 @@ var default_video_attributes = {
 	"duration":null,   //media duration (read from file or the temporal url)
 	"networkState":0,
 
-	"startOffset":null, //if serving an ogg_chop segment use this to offset the presentation time 
+	"startOffset":null, //if serving an ogg_chop segment use this to offset the presentation time
 
 	//custom attributes for mv_embed:
-	"play_button":true,	
+	"play_button":true,
 	"thumbnail":null,
 	"linkback":null,
 	"embed_link":true,
 	"download_link":true,
-	"type":null	 //the content type of the media 
+	"type":null	 //the content type of the media
 };
 /*
  * the base source attibute checks
@@ -103,11 +103,11 @@ var mv_default_source_attr= new Array(
 	'startOffset',
 	'durationHint',
 	'start',
-	'end',	
+	'end',
 	'default',
 	'lang'
 );
-//set the dismissNativeWarn flag: 
+//set the dismissNativeWarn flag:
 _global['dismissNativeWarn'] = false;
 /*
 * Converts all occurrences of <video> tag into video object
@@ -115,79 +115,79 @@ _global['dismissNativeWarn'] = false;
 function mv_video_embed(swap_done_callback, force_id){
 	mvEmbed.init( swap_done_callback, force_id );
 }
-mvEmbed = {	
-	//flist stores the set of functions to run after the video has been swaped in. 
+mvEmbed = {
+	//flist stores the set of functions to run after the video has been swaped in.
 	flist:new Array(),
 	init:function( swap_done_callback, force_id ){
-		
+
 		if(swap_done_callback)
 			mvEmbed.flist.push( swap_done_callback );
-			
+
 		//get mv_embed location if it has not been set
-		js_log('mv_embed ' + MV_EMBED_VERSION);				
-		
-		var loadPlaylistLib=false;						
-		
+		js_log('mv_embed ' + MV_EMBED_VERSION);
+
+		var loadPlaylistLib=false;
+
 		var eAction = function(this_elm){
 			js_log( "Do SWAP: " + $j(this_elm).attr("id") + ' tag: '+ this_elm.tagName.toLowerCase() );
-					
+
 			if( $j(this_elm).attr("id") == '' ){
 				$j(this_elm).attr("id", 'v'+ global_player_list.length);
-			}			
-			//stre a global reference to the id	
+			}
+			//stre a global reference to the id
 		   global_player_list.push( $j(this_elm).attr("id") );
 		   //if video doSwap
 		   switch( this_elm.tagName.toLowerCase()){
 			   case 'video':
-				    var videoInterface = new embedVideo(this_elm);	 
+				    var videoInterface = new embedVideo(this_elm);
 					mvEmbed.swapEmbedVideoElement( this_elm, videoInterface );
 			   break;
 			   case 'audio':
-				   var videoInterface = new embedVideo(this_elm);	 
+				   var videoInterface = new embedVideo(this_elm);
 				   videoInterface.type ='audio';
 				   mvEmbed.swapEmbedVideoElement( this_elm, videoInterface );
 			   break;
 			   case 'playlist':
 				   loadPlaylistLib=true;
 			   break;
-		   }		
+		   }
 		}
-		
+
 		if( force_id == null && force_id != '' ){
-			var j_selector = 'video,audio,playlist';			   	
+			var j_selector = 'video,audio,playlist';
 		}else{
 			var j_selector = '#' + force_id;
 		}
-		//process selected elements: 
-		//ie8 does not play well with the jQuery video,audio,playlist selector use native: 
+		//process selected elements:
+		//ie8 does not play well with the jQuery video,audio,playlist selector use native:
 		if($j.browser.msie && $j.browser.version >= 8){
-			jtags = j_selector.split(',');				
-			for( var i=0; i < jtags.length; i++){				
+			jtags = j_selector.split(',');
+			for( var i=0; i < jtags.length; i++){
 				$j( document.getElementsByTagName( jtags[i] )).each(function(){
 					eAction(this);
 				});
-			}				
-		}else{			
+			}
+		}else{
 			$j( j_selector ).each(function(){
 				eAction(this);
-			});	
-		}				
-		if(loadPlaylistLib){		
-			mvJsLoader.doLoad([ 
+			});
+		}
+		if(loadPlaylistLib){
+			mvJsLoader.doLoad([
 				'mvPlayList',
 				'$j.ui',	//include dialog for pop-ing up thigns
-				'$j.ui.dialog'	
+				'$j.ui.dialog'
 			], function(){
-				$j('playlist').each(function(){															 														 				
+				$j('playlist').each(function(){
 					//create new playlist interface:
 					var plObj = new mvPlayList( this );
 					mvEmbed.swapEmbedVideoElement(this, plObj);
 					var added_height = plObj.pl_layout.title_bar_height + plObj.pl_layout.control_height;
-					//move into a blocking display container with height + controls + title height: 
-					$j('#'+plObj.id).wrap('<div style="display:block;height:' + (plObj.height + added_height) + 'px;"></div>');										
+					//move into a blocking display container with height + controls + title height:
+					$j('#'+plObj.id).wrap('<div style="display:block;height:' + (plObj.height + added_height) + 'px;"></div>');
 				});
 			});
-		}	   
+		}
 		this.checkClipsReady();
 	},
 	/*
@@ -199,13 +199,13 @@ mvEmbed = {
 		js_log('do swap ' + videoInterface.id + ' for ' + video_element);
 		embed_video = document.createElement('div');
 		//make sure our div has a hight/width set:
-			
+
 		$j(embed_video).css({
 			'width':videoInterface.width,
 			'height':videoInterface.height
-		}).html( mv_get_loading_img() );		
+		}).html( mv_get_loading_img() );
 		//inherit the video interface
-		for(var method in videoInterface){ //for in loop oky in Element context	
+		for(var method in videoInterface){ //for in loop oky in Element context
 			if(method!='readyState'){ //readyState crashes IE
 				if(method=='style'){
 						embed_video.setAttribute('style', videoInterface[method]);
@@ -222,32 +222,32 @@ mvEmbed = {
 			//string -> boolean:
 			if(embed_video[method]=="false")embed_video[method]=false;
 			if(embed_video[method]=="true")embed_video[method]=true;
-		}	
-		///js_log('did vI style');  
-		//now swap out the video element for the embed_video obj:	  
-		$j(video_element).after(embed_video).remove();	
-		//js_log('did swap');		  
-		$j('#'+embed_video.id).get(0).on_dom_swap();	
-			  
+		}
+		///js_log('did vI style');
+		//now swap out the video element for the embed_video obj:
+		$j(video_element).after(embed_video).remove();
+		//js_log('did swap');
+		$j('#'+embed_video.id).get(0).on_dom_swap();
+
 		// now that "embed_video" is stable, do more initialization (if we are ready)
-		if($j('#'+embed_video.id).get(0).loading_external_data == false && 
+		if($j('#'+embed_video.id).get(0).loading_external_data == false &&
 			   $j('#'+embed_video.id).get(0).init_with_sources_loadedDone == false){
-			//load and set ready state since source are available: 
+			//load and set ready state since source are available:
 			$j('#'+embed_video.id).get(0).init_with_sources_loaded();
 		}
-		
+
 		js_log('done with child: ' + embed_video.id + ' len:' + global_player_list.length);
 		return true;
 	},
 	//this should not be needed.
 	checkClipsReady : function(){
 		//js_log('checkClipsReady');
-		var is_ready=true;	  
+		var is_ready=true;
 		  for(var i=0; i < global_player_list.length; i++){
 			  if( $j('#'+global_player_list[i]).length !=0){
-				  var cur_vid =  $j('#'+global_player_list[i]).get(0);		  
+				  var cur_vid =  $j('#'+global_player_list[i]).get(0);
 				is_ready = ( cur_vid.ready_to_play ) ? is_ready : false;
-				if( !is_ready && cur_vid.load_error ){ 
+				if( !is_ready && cur_vid.load_error ){
 					is_ready=true;
 					$j(cur_vid).html( cur_vid.load_error );
 				}
@@ -255,15 +255,15 @@ mvEmbed = {
 		}
 		if( is_ready ){
 			mvEmbed.allClipsReady = true;
-			// run queued functions 
+			// run queued functions
 			//js_log('run queded functions:' + mvEmbed.flist[0]);
 			mvEmbed.runFlist();
-		}else{				 
+		}else{
 			 setTimeout( 'mvEmbed.checkClipsReady()', 25 );
-		 }			  
+		 }
 	},
 	runFlist:function(){
-		while (this.flist.length){				
+		while (this.flist.length){
 			this.flist.shift()();
 		}
 	}
@@ -306,37 +306,37 @@ mediaSource.prototype =
 
 	init : function(element)
 	{
-		//js_log('adding mediaSource: ' + element);				
+		//js_log('adding mediaSource: ' + element);
 		this.src = $j(element).attr('src');
 		this.marked_default = false;
 		if ( element.tagName.toLowerCase() == 'video')
-			this.marked_default = true;		
-		
+			this.marked_default = true;
+
 		//set default URLTimeEncoding if we have a time  url:
-		//not ideal way to discover if content is on an oggz_chop server. 
-		//should check some other way. 
+		//not ideal way to discover if content is on an oggz_chop server.
+		//should check some other way.
 		var pUrl = parseUri ( this.src );
 		if(typeof pUrl['queryKey']['t'] != 'undefined'){
-			this['URLTimeEncoding']=true;			
-		}				
+			this['URLTimeEncoding']=true;
+		}
 		for(var i=0; i < mv_default_source_attr.length; i++){ //array loop:
-			var attr = mv_default_source_attr[ i ];			
+			var attr = mv_default_source_attr[ i ];
 			if( $j(element).attr( attr ) ) {
 				this[ attr ] =  $j(element).attr( attr );
 			}
-		}				
-		//update duration from hit if present: 
+		}
+		//update duration from hit if present:
 		if(this.durationHint)
-			this.duration = this.durationHint;		
-					
-			
+			this.duration = this.durationHint;
+
+
 		if ( $j(element).attr('type'))
 			this.mime_type = $j(element).attr('type');
 		else if ($j(element).attr('content-type'))
 			this.mime_type = $j(element).attr('content-type');
-		else			
+		else
 			this.mime_type = this.detectType(this.src);
-		
+
 		//set the title if unset:
 		if( !this.title )
 			this.title = this.mime_type;
@@ -344,9 +344,9 @@ mediaSource.prototype =
 		this.parseURLDuration();
 	},
 	updateSource:function(element){
-		//for now just update the title: 
+		//for now just update the title:
 		if ($j(element).attr("title"))
-			this.title = $j(element).attr("title");		
+			this.title = $j(element).attr("title");
 	},
 	/** updates the src time and start & end
 	 *  @param {String} start_time in NTP format
@@ -357,18 +357,18 @@ mediaSource.prototype =
 		//js_log("pre uri:" + this.src);
 		//if we have time we can use:
 		if( this.URLTimeEncoding ){
-			//make sure its a valid start time / end time (else set default) 
-			if( !npt2seconds(start_ntp) ) 
+			//make sure its a valid start time / end time (else set default)
+			if( !npt2seconds(start_ntp) )
 				start_ntp = this.start_ntp;
-				
+
 			if( !npt2seconds(end_ntp) )
 				end_ntp = this.end_ntp;
-										  
-			this.src = getURLParamReplace(this.src, { 't': start_ntp +'/'+ end_ntp } );		   
-			
+
+			this.src = getURLParamReplace(this.src, { 't': start_ntp +'/'+ end_ntp } );
+
 			//update the duration
 			this.parseURLDuration();
-		}		 
+		}
 	},
 	setDuration:function (duration)
 	{
@@ -386,20 +386,20 @@ mediaSource.prototype =
 		return this.mime_type;
 	},
 	/** URI accessor function.
-	 *	 @param int seek_time_sec (used to adjust the URI for url based seeks) 
+	 *	 @param int seek_time_sec (used to adjust the URI for url based seeks)
 		@return the URI of the source.
 		@type String
 	*/
 	getURI : function( seek_time_sec )
-	{				
-	   if( !seek_time_sec || !this.URLTimeEncoding ){			
-			   return this.src;						  
-	   }				
+	{
+	   if( !seek_time_sec || !this.URLTimeEncoding ){
+			   return this.src;
+	   }
 	   if(!this.end_ntp){
 		  var endvar = '';
 	   }else{
 		  var endvar = '/'+ this.end_ntp;
-	   }		
+	   }
 	   return getURLParamReplace(this.src,  { 't': seconds2npt( seek_time_sec )+endvar } );	;
 	},
 	/** Title accessor function.
@@ -423,9 +423,9 @@ mediaSource.prototype =
 	 * special case derive duration from request url
 	 * supports media_url?t=ntp_start/ntp_end url request format
 	 */
-	parseURLDuration : function(){			  
-		//check if we have a URLTimeEncoding: 
-		if( this.URLTimeEncoding ){		  
+	parseURLDuration : function(){
+		//check if we have a URLTimeEncoding:
+		if( this.URLTimeEncoding ){
 			var annoURL = parseUri( this.src );
 			if( annoURL.queryKey['t'] ){
 				var times = annoURL.queryKey['t'].split('/');
@@ -437,15 +437,15 @@ mediaSource.prototype =
 				//look for this info as attributes
 				if(this.startOffset){
 					this.start_offset = this.startOffset;
-					this.start_ntp = seconds2npt( this.startOffset);					
-				} 
+					this.start_ntp = seconds2npt( this.startOffset);
+				}
 				if(this.duration){
 					this.end_ntp = seconds2npt( parseInt(this.duration) + parseInt(this.start_offset) );
-				}				
-			}						
+				}
+			}
 		}
 		//else nothing to parse just keep whatever info we already have
-		
+
 		//js_log('f:parseURLDuration() for:' + this.src  + ' d:' + this.duration);
 	},
 	/** Attempts to detect the type of a media file based on the URI.
@@ -485,12 +485,12 @@ function mediaElement(video_element)
 mediaElement.prototype =
 {
 	/** The array of mediaSource elements. */
-	sources:null,	
-	addedROEData:false,	
+	sources:null,
+	addedROEData:false,
 	/** Selected mediaSource element. */
 	selected_source:null,
 	thumbnail:null,
-	linkback:null,	
+	linkback:null,
 
 	/** @private */
 	init:function( video_element )
@@ -501,20 +501,20 @@ mediaElement.prototype =
 		this.thumbnail = mv_default_thumb_url;
 		// Process the source element:
 		if($j(video_element).attr("src"))
-			this.tryAddSource(video_element);			  
-		
+			this.tryAddSource(video_element);
+
 		if($j(video_element).attr('thumbnail'))
 			this.thumbnail = $j(video_element).attr('thumbnail');
-			
+
 		if($j(video_element).attr('poster'))
 			this.thumbnail = $j(video_element).attr('poster');
-			
-		// Process all inner <source> elements	
+
+		// Process all inner <source> elements
 		//js_log("inner source count: " + video_element.getElementsByTagName('source').length );
-		
-		$j(video_element).find('source,text').each(function(inx, inner_source){			
+
+		$j(video_element).find('source,text').each(function(inx, inner_source){
 			_this.tryAddSource( inner_source );
-		});						  
+		});
 	},
 	/** Updates the time request for all sources that have a standard time request argument (ie &t=start_time/end_time)
 	 */
@@ -526,10 +526,10 @@ mediaElement.prototype =
 	},
 	/*timed Text check*/
 	timedTextSources:function(){
-		for(var i=0; i < this.sources.length; i++){			
+		for(var i=0; i < this.sources.length; i++){
 			if(	this.sources[i].mime_type == 'text/cmml' ||
 				this.sources[i].mime_type == 'text/x-srt')
-					return true;								
+					return true;
 		};
 		return false;
 	},
@@ -540,7 +540,7 @@ mediaElement.prototype =
 	{
 		if(!mime_filter)
 			return this.sources;
-		//apply mime filter: 
+		//apply mime filter:
 		   var source_set = new Array();
 		for(var i=0; i < this.sources.length ; i++){
 			if( this.sources[i].mime_type.indexOf( mime_filter ) != -1 )
@@ -548,7 +548,7 @@ mediaElement.prototype =
 		}
 		return source_set;
 	},
-	getSourceById:function( source_id ){		
+	getSourceById:function( source_id ){
 		for(var i=0; i < this.sources.length ; i++){
 			if( this.sources[i].id ==  source_id)
 				return this.sources[i];
@@ -564,70 +564,70 @@ mediaElement.prototype =
 		for(var i=0; i < playable_sources.length; i++){
 			if( i==index ){
 				this.selected_source = playable_sources[i];
-				//update the user selected format: 
+				//update the user selected format:
 				embedTypes.players.userSelectFormat( playable_sources[i].mime_type );
 				break;
 			}
-		}		
+		}
 	},
 	/** selects the default source via cookie preference, default marked, or by id order
 	 * */
-	autoSelectSource:function(){ 
-		js_log('f:autoSelectSource:');	
-		//@@todo read user preference for source		
+	autoSelectSource:function(){
+		js_log('f:autoSelectSource:');
+		//@@todo read user preference for source
 		// Select the default source
-		var playable_sources = this.getPlayableSources();							
-		var flash_flag=ogg_flag=false;		  
+		var playable_sources = this.getPlayableSources();
+		var flash_flag=ogg_flag=false;
 		//debugger;
 		for(var source=0; source < playable_sources.length; source++){
 			var mime_type =playable_sources[source].mime_type;
 			if( playable_sources[source].marked_default ){
 				js_log('set via marked default: ' + playable_sources[source].marked_default);
-				this.selected_source = playable_sources[source];				
+				this.selected_source = playable_sources[source];
 				return true;
 			}
 			//set via user-preference
 			if(embedTypes.players.preference['format_prefrence'] == mime_type){
 				 js_log('set via preference: '+playable_sources[source].mime_type);
 				 this.selected_source = playable_sources[source];
-				 return true; 
-			}															
-		}	   
-		//set Ogg via player support		
+				 return true;
+			}
+		}
+		//set Ogg via player support
 		for(var source=0; source < playable_sources.length; source++){
 			js_log('f:autoSelectSource:' + playable_sources[source].mime_type);
-			var mime_type =playable_sources[source].mime_type;					
-			   //set source via player				 
-			if(mime_type=='video/ogg' || mime_type=='ogg/video' || mime_type=='video/annodex' || mime_type=='application/ogg'){				
+			var mime_type =playable_sources[source].mime_type;
+			   //set source via player
+			if(mime_type=='video/ogg' || mime_type=='ogg/video' || mime_type=='video/annodex' || mime_type=='application/ogg'){
 				for(var i=0; i < embedTypes.players.players.length; i++){ //for in loop on object oky
-					var player = embedTypes.players.players[i];					
+					var player = embedTypes.players.players[i];
 					if(player.library=='vlc' || player.library=='native'){
-						js_log('set via ogg via order');						
-						this.selected_source = playable_sources[source];	
+						js_log('set via ogg via order');
+						this.selected_source = playable_sources[source];
 						return true;
-					}					
+					}
 				}
 			}
 		}
 		//set basic flash
-		for(var source=0; source < playable_sources.length; source++){  
-			var mime_type =playable_sources[source].mime_type;										
+		for(var source=0; source < playable_sources.length; source++){
+			var mime_type =playable_sources[source].mime_type;
 			if( mime_type=='video/x-flv' ){
 				js_log('set via by player preference normal flash')
 				this.selected_source = playable_sources[source];
 				return true;
-			}						
+			}
 		}
-		//set h264 flash 
-		for(var source=0; source < playable_sources.length; source++){  
-			var mime_type =playable_sources[source].mime_type;										
+		//set h264 flash
+		for(var source=0; source < playable_sources.length; source++){
+			var mime_type =playable_sources[source].mime_type;
 			if( mime_type=='video/h264' ){
 				js_log('set via playable_sources preference h264 flash')
 				this.selected_source = playable_sources[source];
 				return true;
-			}			   
-		}		
-		//select first source		
+			}
+		}
+		//select first source
 		if (!this.selected_source)
 		{
 			js_log('set via first source:' + playable_sources[0]);
@@ -666,48 +666,48 @@ mediaElement.prototype =
 		//return mime_type=='video/ogg' || mime_type=='ogg/video' || mime_type=='video/annodex' || mime_type=='video/x-flv';
 	},
 	/** Adds a single mediaSource using the provided element if
-		the element has a 'src' attribute.		
+		the element has a 'src' attribute.
 		@param element {element} <video>, <source> or <mediaSource> element.
 	*/
 	tryAddSource:function(element)
 	{
-		js_log('f:tryAddSource:'+ $j(element).attr("src"));		
+		js_log('f:tryAddSource:'+ $j(element).attr("src"));
 		if (! $j(element).attr("src")){
 			//js_log("element has no src");
 			return false;
 		}
 		var new_src = $j(element).attr('src');
-		//make sure an existing element with the same src does not already exist:		 
-		for( var i=0; i < this.sources.length; i++ ){				
+		//make sure an existing element with the same src does not already exist:
+		for( var i=0; i < this.sources.length; i++ ){
 			if(this.sources[i].src == new_src){
-				//js_log('checking existing: '+this.sources[i].getURI() + ' != '+ new_src);	 
-				//can't add it all but try to update any additional attr: 
+				//js_log('checking existing: '+this.sources[i].getURI() + ' != '+ new_src);
+				//can't add it all but try to update any additional attr:
 				this.sources[i].updateSource(element);
 				return false;
 			}
 		}
-		var source = new mediaSource( element );		
-		this.sources.push(source);		
+		var source = new mediaSource( element );
+		this.sources.push(source);
 		//alert('pushed source to stack'+ source + 'sl:'+this.sources.length);
 	},
-	getPlayableSources: function(){		 
+	getPlayableSources: function(){
 		 var playable_sources= new Array();
-		 for(var i=0; i < this.sources.length; i++){								   
-			 if( this.isPlayableType( this.sources[i].mime_type ) ){				 
+		 for(var i=0; i < this.sources.length; i++){
+			 if( this.isPlayableType( this.sources[i].mime_type ) ){
 				 playable_sources.push( this.sources[i] );
 			 }else{
 				 js_log("type "+ this.sources[i].mime_type + 'is not playable');
 			 }
-		 };		 
+		 };
 		 return playable_sources;
 	},
 	/* Imports media sources from ROE data.
 	 *   @param roe_data ROE data.
 	*/
-	addROE:function(roe_data){		
+	addROE:function(roe_data){
 		js_log('f:addROE');
 		this.addedROEData=true;
-		var _this = this;		
+		var _this = this;
 		if( typeof roe_data == 'string' )
 		{
 			var parser=new DOMParser();
@@ -734,7 +734,7 @@ mediaElement.prototype =
 			});
 		}else{
 			js_log('ROE data empty.');
-		}				
+		}
 	}
 };
 
@@ -750,7 +750,7 @@ var embedVideo = function(element) {
 embedVideo.prototype = {
 	/** The mediaElement object containing all mediaSource objects */
 	media_element:null,
-	preview_mode:false,		   
+	preview_mode:false,
 	ready_to_play:false, //should use html5 ready state
 	load_error:false, //used to set error in case of error
 	loading_external_data:false,
@@ -758,19 +758,19 @@ embedVideo.prototype = {
 	thumbnail_disp:true,
 	init_with_sources_loadedDone:false,
 	inDOM:false,
-	//for onClip done stuff: 
+	//for onClip done stuff:
 	anno_data_cache:null,
 	seek_time_sec:0,
 	base_seeker_slider_offset:null,
 	onClipDone_disp:false,
-	supports:{},	
+	supports:{},
 	//for seek thumb updates:
 	cur_thumb_seek_time:0,
 	thumb_seek_interval:null,
-	
+
 	seeking:false,
-	//set the buffered percent:	
-	bufferedPercent:0,	
+	//set the buffered percent:
+	bufferedPercent:0,
 	//utility functions for property values:
 	hx : function ( s ) {
 		if ( typeof s != 'String' ) {
@@ -799,7 +799,7 @@ embedVideo.prototype = {
 		else
 			return parseInt(this.height);
 	},
-	init: function(element){		
+	init: function(element){
 		//this.element_pointer = element;
 
 		//inherit all the default video_attributes
@@ -812,16 +812,16 @@ embedVideo.prototype = {
 				//js_log('attr:' + attr + ' val: ' + video_attributes[attr] +" "+ 'elm_val:' + element.getAttribute(attr) + "\n (set by attr)");
 			}
 		}
-		//make sure startOffset is cast as an int		   
+		//make sure startOffset is cast as an int
 		if( this.startOffset && this.startOffset.split(':').length >= 2)
 			this.startOffset = npt2seconds(this.startOffset);
-		//make sure offset is in float: 
+		//make sure offset is in float:
 		this.startOffset = parseFloat(this.startOffset);
-		 
+
 		if( this.duration && this.duration.split(':').length >= 2)
-			this.duration = npt2seconds( this.duration );	 
-		   //make sure duration is in float:  
-		this.duration = parseFloat(this.duration);  
+			this.duration = npt2seconds( this.duration );
+		   //make sure duration is in float:
+		this.duration = parseFloat(this.duration);
 		js_log("duration is: " +  this.duration);
 		//if style is set override width and height
 		var dwh = mwConfig['video_size'].split('x');
@@ -835,114 +835,114 @@ embedVideo.prototype = {
 		if(element.innerHTML!='' && element.getElementsByTagName('source').length==0){
 			js_log('innerHTML: ' + element.innerHTML);
 			this.user_missing_plugin_html=element.innerHTML;
-		}				  
+		}
 		// load all of the specified sources
-		this.media_element = new mediaElement(element);							 
+		this.media_element = new mediaElement(element);
 	},
 	on_dom_swap: function(){
-		js_log('f:on_dom_swap');				
+		js_log('f:on_dom_swap');
 		// Process the provided ROE file... if we don't yet have sources
 		if(this.roe && this.media_element.sources.length==0 ){
 			js_log('loading external data');
 			this.loading_external_data=true;
-			var _this = this;					
+			var _this = this;
 			do_request(this.roe, function(data)
-			{							
-				//continue					   
-				_this.media_element.addROE( data );									  
-				js_log('added_roe::' + _this.media_element.sources.length);							   
-													   
-				js_log('set loading_external_data=false');	 
-				_this.loading_external_data=false;							   
-				
-				_this.init_with_sources_loaded();		
+			{
+				//continue
+				_this.media_element.addROE( data );
+				js_log('added_roe::' + _this.media_element.sources.length);
+
+				js_log('set loading_external_data=false');
+				_this.loading_external_data=false;
+
+				_this.init_with_sources_loaded();
 			});
 		}
 	},
 	init_with_sources_loaded : function()
-	{	
+	{
 		js_log('f:init_with_sources_loaded');
 		//set flag that we have run this function:
-		this.init_with_sources_loadedDone=true;				 
+		this.init_with_sources_loadedDone=true;
 		//autoseletct the source
-		this.media_element.autoSelectSource();		
+		this.media_element.autoSelectSource();
 		//auto select player based on prefrence or default order
 		if( !this.media_element.selected_source )
 		{
-			//check for parent clip: 
-			if( typeof this.pc != 'undefined' ){			
-				js_log('no sources, type:' +this.type + ' check for html');	
-				//debugger;			
-				//do load player if just displaying innerHTML: 
+			//check for parent clip:
+			if( typeof this.pc != 'undefined' ){
+				js_log('no sources, type:' +this.type + ' check for html');
+				//debugger;
+				//do load player if just displaying innerHTML:
 				if( this.pc.type == 'text/html' ){
 					this.selected_player = embedTypes.players.defaultPlayer( 'text/html' );
-					js_log('set selected player:'+ this.selected_player.mime_type);	
+					js_log('set selected player:'+ this.selected_player.mime_type);
 				}
 			}
-		}else{		
+		}else{
 			this.selected_player = embedTypes.players.defaultPlayer( this.media_element.selected_source.mime_type );
-		}						  
+		}
 		if( this.selected_player ){
 			js_log('selected ' + this.selected_player.getName());
 			js_log("PLAYBACK TYPE: "+this.selected_player.library);
-			this.thumbnail_disp = true;		
-			this.inheritEmbedObj();		   
-		}else{							 
+			this.thumbnail_disp = true;
+			this.inheritEmbedObj();
+		}else{
 			//no source's playable
 			var missing_type ='';
-			var or ='';  
+			var or ='';
 			for( var i=0; i < this.media_element.sources.length; i++){
 				missing_type+= or + this.media_element.sources[i].mime_type;
 				or=' or ';
-			}			
+			}
 			if( this.pc )
-				var missing_type = this.pc.type;										
+				var missing_type = this.pc.type;
 			   js_log('no player found for given source type ' + missing_type);
-			   this.load_error= this.getPluginMissingHTML(missing_type);										   
-		}		
+			   this.load_error= this.getPluginMissingHTML(missing_type);
+		}
 	},
-	inheritEmbedObj:function(){		
-		js_log("inheritEmbedObj:duration is: " +  this.duration);  
+	inheritEmbedObj:function(){
+		js_log("inheritEmbedObj:duration is: " +  this.duration);
 		//@@note: tricky cuz direct overwrite is not so ideal.. since the extended object is already tied to the dom
 		//clear out any non-base embedObj stuff:
 		if(this.instanceOf){
 			eval('tmpObj = '+this.instanceOf);
-			for(var i in tmpObj){ //for in loop oky for object  
+			for(var i in tmpObj){ //for in loop oky for object
 				if(this['parent_'+i]){
 					this[i]=this['parent_'+i];
 				}else{
 					this[i]=null;
 				}
 			}
-		}				  
+		}
 		//set up the new embedObj
 		js_log('f: inheritEmbedObj: embedding with ' + this.selected_player.library);
-		var _this = this;		
+		var _this = this;
 		this.selected_player.load( function()
 		{
-			 js_log("selected_player::load:duration is: " +  _this.duration);  
+			 js_log("selected_player::load:duration is: " +  _this.duration);
 			//js_log('inheriting '+_this.selected_player.library +'Embed to ' + _this.id + ' ' + $j('#'+_this.id).length);
 			//var _this = $j('#'+_this.id).get(0);
 			//js_log( 'type of ' + _this.selected_player.library +'Embed + ' +
-			//		eval('typeof '+_this.selected_player.library +'Embed')); 
+			//		eval('typeof '+_this.selected_player.library +'Embed'));
 			eval('embedObj = ' +_this.selected_player.library +'Embed;');
-			for(var method in embedObj){ //for in loop oky for object  
+			for(var method in embedObj){ //for in loop oky for object
 				//parent method preservation for local overwritten methods
 				if(_this[method])
 					_this['parent_' + method] = _this[method];
 				_this[method]=embedObj[method];
 			}
 			js_log('TYPEOF_ppause: ' + typeof _this['parent_pause']);
-			
+
 			if(_this.inheritEmbedOverride){
 				_this.inheritEmbedOverride();
 			}
 			//update controls if possible
 			if(!_this.loading_external_data)
-				_this.refreshControlsHTML();												
-			
-			//js_log("READY TO PLAY:"+_this.id);			
-			_this.ready_to_play=true;				
+				_this.refreshControlsHTML();
+
+			//js_log("READY TO PLAY:"+_this.id);
+			_this.ready_to_play=true;
 			_this.getDuration();
 			_this.getHTML();
 		});
@@ -953,61 +953,61 @@ embedVideo.prototype = {
 		if(this.selected_player.id != player.id){
 			this.selected_player = player;
 			this.inheritEmbedObj();
-		}			
+		}
 	},
-	doNativeWarningCheck:function(){			
+	doNativeWarningCheck:function(){
 		if( $j.cookie('dismissNativeWarn') && $j.cookie('dismissNativeWarn')===true){
 			return false;
-		}else{			
-			//see if we have native support for ogg: 
-			var supporting_players = embedTypes.players.getMIMETypePlayers( 'video/ogg' );		
+		}else{
+			//see if we have native support for ogg:
+			var supporting_players = embedTypes.players.getMIMETypePlayers( 'video/ogg' );
 			for(var i=0; i < supporting_players.length; i++){
 				if(supporting_players[i].id == 'videoElement'){
 					return false;
-				}			
-			}	
-			//see if we are using mv_embed without a ogg source in which case no point in promoting firefox :P			
+				}
+			}
+			//see if we are using mv_embed without a ogg source in which case no point in promoting firefox :P
 			if(this.media_element && this.media_element.sources){
 				var foundOgg = false;
 				var playable_sources = this.media_element.getPlayableSources();
-				for(var sInx=0; sInx < playable_sources.length; sInx++){  
+				for(var sInx=0; sInx < playable_sources.length; sInx++){
 					var mime_type = playable_sources[sInx].mime_type;
 					if( mime_type=='video/ogg' ){
-						//they  have flash / h.264 fallback no need to push firefox :( 
+						//they  have flash / h.264 fallback no need to push firefox :(
 						foundOgg = true;
 					}
 				}
 				//no ogg no point in download firefox
 				if(!foundOgg)
 					return false;
-										
+
 			}
 		}
-		return true;	
+		return true;
 	},
 	getTimeReq:function(){
 		var default_time_req = '0:00:00/' + seconds2npt(this.getDuration());
 		if(!this.media_element)
 			return default_time_req;
 		if(!this.media_element.selected_source)
-			return default_time_req;		
+			return default_time_req;
 		if(!this.media_element.selected_source.end_ntp)
-			return default_time_req;		
+			return default_time_req;
 		return this.media_element.selected_source.start_ntp+'/'+this.media_element.selected_source.end_ntp;
-	},	
-	getDuration:function(){							
-		//update some local pointers for the selected source:	
-		if(this.media_element && this.media_element.selected_source && this.media_element.selected_source.duration){									 
-			this.duration = this.media_element.selected_source.duration;						
+	},
+	getDuration:function(){
+		//update some local pointers for the selected source:
+		if(this.media_element && this.media_element.selected_source && this.media_element.selected_source.duration){
+			this.duration = this.media_element.selected_source.duration;
 			this.start_offset = this.media_element.selected_source.start_offset;
 			this.start_ntp = this.media_element.selected_source.start_ntp;
-			this.end_ntp = this.media_element.selected_source.end_ntp;		 			
+			this.end_ntp = this.media_element.selected_source.end_ntp;
 		}
-		//update start end_ntp if duration !=0 (set from plugin) 
+		//update start end_ntp if duration !=0 (set from plugin)
 		if(!this.start_ntp)
 			this.start_ntp = '0:0:0';
 		if(!this.end_ntp && this.duration)
-			this.end_ntp = seconds2npt( this.duration );		
+			this.end_ntp = seconds2npt( this.duration );
 		//return the duration
 		return this.duration;
 	},
@@ -1015,48 +1015,48 @@ embedVideo.prototype = {
 	 * wrapEmebedContainer
 	 * wraps the embed code into a container to better support playlist function
 	 *  (where embed element is swapped for next clip
-	 *  (where plugin method does not support playlsits) 
+	 *  (where plugin method does not support playlsits)
 	 */
 	wrapEmebedContainer:function(embed_code){
 		//check if parent clip is set( ie we are in a playlist so name the embed container by playlistID)
 		var id = (this.pc!=null)?this.pc.pp.id:this.id;
-		return '<div id="mv_ebct_'+id+'" style="width:'+this.width+'px;height:'+this.height+'px;">' + 
-					embed_code + 
+		return '<div id="mv_ebct_'+id+'" style="width:'+this.width+'px;height:'+this.height+'px;">' +
+					embed_code +
 				'</div>';
-	},	
+	},
 	getEmbedHTML : function(){
 		//return this.wrapEmebedContainer( this.getEmbedObj() );
 		return 'function getEmbedHTML should be overitten by embedLib ';
 	},
 	//do seek function (should be overwritten by implementing embedLibs)
-	// first check if seek can be done on locally downloaded content. 
-	doSeek : function( perc ){		
-		if( this.supportsURLTimeEncoding() ){			
+	// first check if seek can be done on locally downloaded content.
+	doSeek : function( perc ){
+		if( this.supportsURLTimeEncoding() ){
 			//make sure this.seek_time_sec is up-to-date:
 			this.seek_time_sec = npt2seconds( this.start_ntp ) + parseFloat( perc * this.getDuration() );
 			js_log('updated seek_time_sec: ' + seconds2npt ( this.seek_time_sec) );
-			this.stop();					
+			this.stop();
 			this.didSeekJump=true;
 			//update the slider
-			this.setSliderValue( perc ); 
-		}		
-		//do play in 100ms (give things time to clear) 
+			this.setSliderValue( perc );
+		}
+		//do play in 100ms (give things time to clear)
 		setTimeout('$j(\'#' + this.id + '\').get(0).play()',100);
 	},
 	/*
-	 * seeks to the requested time and issues a callback when ready 
+	 * seeks to the requested time and issues a callback when ready
 	 * (should be overwitten by client that supports frame serving)
-	 */	
+	 */
 	setCurrentTime:function( time, callback){
 		js_log('error: base embed setCurrentTime can not frame serve (overide via plugin)');
 	},
 	addPresTimeOffset:function(){
-	   //add in the offset:		
+	   //add in the offset:
 	   if(this.seek_time_sec && this.seek_time_sec!=0){
 			this.currentTime+=this.seek_time_sec;
-	   }else if(this.start_offset && this.start_offset!=0){	   
-		   this.currentTime = parseFloat(this.currentTime) + parseFloat(this.start_offset);			 
-	   }		   
+	   }else if(this.start_offset && this.start_offset!=0){
+		   this.currentTime = parseFloat(this.currentTime) + parseFloat(this.start_offset);
+	   }
 	},
 	doEmbedHTML:function()
 	{
@@ -1066,90 +1066,90 @@ embedVideo.prototype = {
 		this.closeDisplayedHTML();
 
 //		if(!this.selected_player){
-//			return this.getPluginMissingHTML();		
+//			return this.getPluginMissingHTML();
 		//Set "loading" here
 		$j('#mv_embedded_player_'+_this.id).html(''+
-			'<div style="color:black;width:'+this.width+'px;height:'+this.height+'px;">' + 
-				gM('loading_plugin') + 
-			'</div>'					
+			'<div style="color:black;width:'+this.width+'px;height:'+this.height+'px;">' +
+				gM('mwe-loading_plugin') +
+			'</div>'
 		);
 		// schedule embedding
 		this.selected_player.load(function()
 		{
-			js_log('performing embed for ' + _this.id);			
-			var embed_code = _this.getEmbedHTML();			
+			js_log('performing embed for ' + _this.id);
+			var embed_code = _this.getEmbedHTML();
 			//js_log('shopuld embed:' + embed_code);
-			$j('#mv_embedded_player_'+_this.id).html(embed_code);	
+			$j('#mv_embedded_player_'+_this.id).html(embed_code);
 		});
 	},
 	onClipDone:function(){
 		js_log('base:onClipDone');
-		//stop the clip (load the thumbnail etc) 
+		//stop the clip (load the thumbnail etc)
 		this.stop();
 		this.seek_time_sec = 0;
 		this.setSliderValue(0);
 		var _this = this;
-		
-		//if the clip resolution is < 320 don't do fancy onClipDone stuff 
+
+		//if the clip resolution is < 320 don't do fancy onClipDone stuff
 		if(this.width < 300){
 			return ;
 		}
 		this.onClipDone_disp=true;
 		this.thumbnail_disp=true;
-		//make sure we are not in preview mode( no end clip actions in preview mode) 
+		//make sure we are not in preview mode( no end clip actions in preview mode)
 		if( this.preview_mode )
 			return ;
-			
+
 		$j('#img_thumb_'+this.id).css('zindex',1);
 		$j('#big_play_link_'+this.id).hide();
-		//add the liks_info_div black back 
+		//add the liks_info_div black back
 		$j('#dc_'+this.id).append('<div id="liks_info_'+this.id+'" ' +
-					'style="width:' +parseInt(parseInt(this.width)/2)+'px;'+		
+					'style="width:' +parseInt(parseInt(this.width)/2)+'px;'+
 					'height:'+ parseInt(parseInt(this.height)) +'px;'+
-					'position:absolute;top:10px;overflow:auto'+				
+					'position:absolute;top:10px;overflow:auto'+
 					'width: '+parseInt( ((parseInt(this.width)/2)-15) ) + 'px;'+
-					'left:'+ parseInt( ((parseInt(this.width)/2)+15) ) +'px;">'+					
+					'left:'+ parseInt( ((parseInt(this.width)/2)+15) ) +'px;">'+
 				'</div>' +
 				'<div id="black_back_'+this.id+'" ' +
 					'style="z-index:-2;position:absolute;background:#000;' +
 					'top:0px;left:0px;width:'+parseInt(this.width)+'px;' +
 					'height:'+parseInt(this.height)+'px;">' +
 				'</div>'
-		   );		
-		
-		//start animation (make thumb small in upper left add in div for "loading"			
-		$j('#img_thumb_'+this.id).animate({				
+		   );
+
+		//start animation (make thumb small in upper left add in div for "loading"
+		$j('#img_thumb_'+this.id).animate({
 				width:parseInt(parseInt(_this.width)/2),
 				height:parseInt(parseInt(_this.height)/2),
 				top:20,
 				left:10
 			},
-			1000, 
+			1000,
 			function(){
-				//animation done.. add "loading" to div if empty		
+				//animation done.. add "loading" to div if empty
 				if($j('#liks_info_'+_this.id).html()==''){
-					$j('#liks_info_'+_this.id).html(gM('loading_txt'));
-				}		
+					$j('#liks_info_'+_this.id).html(gM('mwe-loading_txt'));
+				}
 			}
-		)				   
+		)
 		//now load roe if run the showNextPrevLinks
 		if(this.roe && this.media_element.addedROEData==false){
 			do_request(this.roe, function(data)
-			{															   
+			{
 				_this.media_element.addROE(data);
 				_this.getNextPrevLinks();
-			});	
+			});
 		}else{
 			this.getNextPrevLinks();
 		}
 	},
-	//@@todo we should merge getNextPrevLinks with textInterface .. there is repeated code between them. 
+	//@@todo we should merge getNextPrevLinks with textInterface .. there is repeated code between them.
 	getNextPrevLinks:function(){
 		js_log('f:getNextPrevLinks');
 		var anno_track_url = null;
-		var _this = this; 
+		var _this = this;
 		//check for annoative track
-		$j.each(this.media_element.sources, function(inx, n){			
+		$j.each(this.media_element.sources, function(inx, n){
 			if(n.mime_type=='text/cmml'){
 				if( n.id == 'Anno_en'){
 					anno_track_url = n.src;
@@ -1161,28 +1161,28 @@ embedVideo.prototype = {
 			//zero out seconds (should improve cache hit rate and generally expands metadata search)
 			//@@todo this could be repalced with a regExp
 			var annoURL = parseUri(anno_track_url);
-			var times = annoURL.queryKey['t'].split('/');			  
-			var stime_parts = times[0].split(':');   
-			var etime_parts = times[1].split(':');						 
+			var times = annoURL.queryKey['t'].split('/');
+			var stime_parts = times[0].split(':');
+			var etime_parts = times[1].split(':');
 			//zero out the hour:
 			var new_start = stime_parts[0]+':'+'0:0';
 			//zero out the end sec
 			var new_end   = (etime_parts[0]== stime_parts[0])? (etime_parts[0]+1)+':0:0' :etime_parts[0]+':0:0';
-					 
+
 			var etime_parts = times[1].split(':');
-			
+
 			var new_anno_track_url = annoURL.protocol +'://'+ annoURL.host + annoURL.path +'?';
 			$j.each(annoURL.queryKey, function(i, val){
 				new_anno_track_url +=(i=='t')?'t='+new_start+'/'+new_end +'&' :
 										 i+'='+ val+'&';
 			});
 			var request_key = new_start+'/'+new_end;
-			//check the anno_data cache: 
-			//@@todo search cache see if current is in range.  
+			//check the anno_data cache:
+			//@@todo search cache see if current is in range.
 			if(this.anno_data_cache){
 				js_log('anno data found in cache: '+request_key);
 				this.showNextPrevLinks();
-			}else{								
+			}else{
 				do_request(new_anno_track_url, function(cmml_data){
 					js_log('raw response: '+ cmml_data);
 					if(typeof cmml_data == 'string')
@@ -1193,8 +1193,8 @@ embedVideo.prototype = {
 					}
 					//init anno_data_cache
 					if(!_this.anno_data_cache)
-						_this.anno_data_cache={};					
-					//grab all metadata and put it into the anno_data_cache:					 
+						_this.anno_data_cache={};
+					//grab all metadata and put it into the anno_data_cache:
 					$j.each(cmml_data.getElementsByTagName('clip'), function(inx, clip){
 						_this.anno_data_cache[ $j(clip).attr("id") ]={
 								'start_time_sec':npt2seconds($j(clip).attr("start").replace('npt:','')),
@@ -1203,32 +1203,32 @@ embedVideo.prototype = {
 							};
 						//grab all its meta
 						_this.anno_data_cache[ $j(clip).attr("id") ]['meta']={};
-						$j.each(clip.getElementsByTagName('meta'),function(imx, meta){							
+						$j.each(clip.getElementsByTagName('meta'),function(imx, meta){
 							//js_log('adding meta: '+ $j(meta).attr("name")+ ' = '+ $j(meta).attr("content"));
 							_this.anno_data_cache[$j(clip).attr("id")]['meta'][$j(meta).attr("name")]=$j(meta).attr("content");
 						});
 					});
-					_this.showNextPrevLinks();					
+					_this.showNextPrevLinks();
 				});
 			}
 		}else{
 			js_log('no annotative track found');
 			$j('#liks_info_'+this.id).html('no metadata found for related links');
 		}
-		//query current request time +|- 60s to get prev next speech links. 
+		//query current request time +|- 60s to get prev next speech links.
 	},
 	showNextPrevLinks:function(){
 		//js_log('f:showNextPrevLinks');
-		//int requested links: 
+		//int requested links:
 		var link = {
 			'prev':'',
 			'current':'',
 			'next':''
-		}		
+		}
 		var curTime = this.getTimeReq().split('/');
-		
+
 		var s_sec = npt2seconds(curTime[0]);
-		var e_sec = npt2seconds(curTime[1]); 
+		var e_sec = npt2seconds(curTime[1]);
 		js_log('showNextPrevLinks: req time: '+ s_sec + ' to ' + e_sec);
 		//now we have all the data in anno_data_cache
 		var current_done=false;
@@ -1240,52 +1240,52 @@ embedVideo.prototype = {
 				link.prev = clip_id;
 				js_log('showNextPrevLinks: ' + s_sec + ' < ' + clip.end_time_sec + ' set prev');
 			}
-				
+
 			if(e_sec==clip.end_time_sec && s_sec== clip.start_time_sec)
 				current_done = true;
 			//current clip is not done:
 			if(  e_sec < clip.end_time_sec  && link.current=='' && !current_done){
 				link.current = clip_id;
-				js_log('showNextPrevLinks: ' + e_sec + ' < ' + clip.end_time_sec + ' set current'); 
+				js_log('showNextPrevLinks: ' + e_sec + ' < ' + clip.end_time_sec + ' set current');
 			}
-			
+
 			//set end clip (first clip where start time is > end_time of req
 			if( e_sec <  clip.start_time_sec && link.next==''){
 				link.next = clip_id;
 				js_log('showNextPrevLinks: '+  e_sec + ' < '+ clip.start_time_sec + ' && ' + link.next );
 			}
-		}   
-		var html='';   
+		}
+		var html='';
 		if(link.prev=='' && link.current=='' && link.next==''){
 			html='<p><a href="'+this.media_element.linkbackgetMsg+'">clip page</a>';
-		}else{		
+		}else{
 			for(var link_type in link){
-				var link_id = link[link_type];			
+				var link_id = link[link_type];
 				if(link_id!=''){
-					var clip = this.anno_data_cache[link_id];				
+					var clip = this.anno_data_cache[link_id];
 					var title_msg='';
 					for(var j in clip['meta']){
 						title_msg+=j.replace(/_/g,' ') +': ' +clip['meta'][j].replace(/_/g,' ') +" <br>";
-					}		
+					}
 					var time_req =	 clip.time_req;
-					if(link_type=='current') //if current start from end of current clip play to end of current meta:				 
+					if(link_type=='current') //if current start from end of current clip play to end of current meta:
 						time_req = curTime[1]+ '/' + seconds2npt( clip.end_time_sec );
-					
-					//do special linkbacks for metavid content: 
-					var regTimeCheck = new RegExp(/[0-9]+:[0-9]+:[0-9]+\/[0-9]+:[0-9]+:[0-9]+/);				
+
+					//do special linkbacks for metavid content:
+					var regTimeCheck = new RegExp(/[0-9]+:[0-9]+:[0-9]+\/[0-9]+:[0-9]+:[0-9]+/);
 					html+='<p><a  ';
 					if( regTimeCheck.test( this.media_element.linkback ) ){
-						html+=' href="'+ this.media_element.linkback.replace(regTimeCheck,time_req) +'" '; 
+						html+=' href="'+ this.media_element.linkback.replace(regTimeCheck,time_req) +'" ';
 					}else{
-						html+=' href="#" onClick="$j(\'#'+this.id+'\').get(0).playByTimeReq(\''+ 
-								time_req + '\'); return false; "';				
+						html+=' href="#" onClick="$j(\'#'+this.id+'\').get(0).playByTimeReq(\''+
+								time_req + '\'); return false; "';
 					}
-					html+=' title="' + title_msg + '">' + 
-						 gM(link_type+'_clip_msg') +				  
+					html+=' title="' + title_msg + '">' +
+						 gM('mwe-'+link_type+'_clip_msg') +
 					'</a><br><span style="font-size:small">'+ title_msg +'<span></p>';
-				}							
+				}
 			}
-		}	
+		}
 		//js_og("should set html:"+ html);
 		$j('#liks_info_'+this.id).html(html);
 	},
@@ -1293,15 +1293,15 @@ embedVideo.prototype = {
 		js_log('f:playByTimeReq: '+time_req );
 		this.stop();
 		this.updateVideoTimeReq(time_req);
-		this.play();		
+		this.play();
 	},
 	doThumbnailHTML:function()
-	{	  
+	{
 		var _this = this;
-		js_log('f:doThumbnailHTML'+ this.thumbnail_disp);		
-		this.closeDisplayedHTML();	   
+		js_log('f:doThumbnailHTML'+ this.thumbnail_disp);
+		this.closeDisplayedHTML();
 		$j( '#mv_embedded_player_' + this.id ).html( this.getThumbnailHTML() );
-		this.paused = true;		
+		this.paused = true;
 		this.thumbnail_disp = true;
 	},
 	refreshControlsHTML:function(){
@@ -1312,40 +1312,40 @@ embedVideo.prototype = {
 			return;
 		}else{
 			$j('#mv_embedded_controls_'+this.id).html( this.getControlsHTML() );
-			ctrlBuilder.addControlHooks(this);						
-		}		
-	},   
+			ctrlBuilder.addControlHooks(this);
+		}
+	},
 	getControlsHTML:function()
-	{			
+	{
 		return ctrlBuilder.getControls( this );
-	},	
-	getHTML : function (){		
-		//@@todo check if we have sources avaliable	
-		js_log('embedVideo:getHTML : ' + this.id  + ' resource type: ' + this.type);			
-		var _this = this;				 
-		var html_code = '';		
-		html_code = '<div id="videoPlayer_'+this.id+'" style="width:'+this.width+'px;position:relative;" class="videoPlayer">';		
+	},
+	getHTML : function (){
+		//@@todo check if we have sources avaliable
+		js_log('embedVideo:getHTML : ' + this.id  + ' resource type: ' + this.type);
+		var _this = this;
+		var html_code = '';
+		html_code = '<div id="videoPlayer_'+this.id+'" style="width:'+this.width+'px;position:relative;" class="videoPlayer">';
 		html_code += '<div style="width:'+parseInt(this.width)+'px;height:'+parseInt(this.height)+'px;"  id="mv_embedded_player_'+this.id+'">' +
-						this.getThumbnailHTML() + 
-					'</div>';											
-		//js_log("mvEmbed:controls "+ typeof this.controls);									
+						this.getThumbnailHTML() +
+					'</div>';
+		//js_log("mvEmbed:controls "+ typeof this.controls);
 		if( this.controls )
 		{
 			js_log("f:getHTML:AddControls");
 			html_code +='<div id="mv_embedded_controls_' + this.id + '" class="ui-widget ui-corner-bottom ui-state-default controls" >';
-			html_code += this.getControlsHTML();	   
-			html_code +='</div>';	  
-			//block out some space by encapulating the top level div 
+			html_code += this.getControlsHTML();
+			html_code +='</div>';
+			//block out some space by encapulating the top level div
 			$j(this).wrap('<div style="width:'+parseInt(this.width)+'px;height:'
-					+(parseInt(this.height)+ctrlBuilder.height)+'px"></div>');					
+					+(parseInt(this.height)+ctrlBuilder.height)+'px"></div>');
 		}
-		html_code += '</div>'; //videoPlayer div close		
+		html_code += '</div>'; //videoPlayer div close
 		//js_log('should set: '+this.id);
-		$j(this).html( html_code );					
+		$j(this).html( html_code );
 		//add hooks once Controls are in DOM
-		ctrlBuilder.addControlHooks(this);		
-						  
-		//js_log('set this to: ' + $j(this).html() );	
+		ctrlBuilder.addControlHooks(this);
+
+		//js_log('set this to: ' + $j(this).html() );
 		//alert('stop');
 		//if auto play==true directly embed the plugin
 		if(this.autoplay)
@@ -1365,7 +1365,7 @@ embedVideo.prototype = {
 		}else{
 		  if(!missing_type)
 		  	missing_type='';
-		  out+= gM('mv_generic_missing_plugin', missing_type) + ' or <a title="'+gM('download_clip')+'" href="'+this.src +'">'+gM('download_clip')+'</a>';
+		  out+= gM('mwe-generic_missing_plugin', missing_type) + ' or <a title="'+gM('mwe-download_clip')+'" href="'+this.src +'">'+gM('mwe-download_clip')+'</a>';
 		}
 		return out + '</div>';
 	},
@@ -1375,7 +1375,7 @@ embedVideo.prototype = {
 		this.updateVideoTime(time_parts[0], time_parts[1]);
 	},
 	//update video time
-	updateVideoTime:function(start_ntp, end_ntp){					
+	updateVideoTime:function(start_ntp, end_ntp){
 		//update media
 		this.media_element.updateSourceTimes( start_ntp, end_ntp );
 		//update mv_time
@@ -1387,11 +1387,11 @@ embedVideo.prototype = {
 			this.seek_time_sec=0;
 		else
 			this.seek_time_sec=npt2seconds(start_ntp);
-	},		
-	//@@todo overwite by embed library if we can render frames natavily 
+	},
+	//@@todo overwite by embed library if we can render frames natavily
 	renderTimelineThumbnail:function( options ){
 		var my_thumb_src = this.media_element.getThumbnailURL();
-		//check if our thumbnail has a time attribute: 
+		//check if our thumbnail has a time attribute:
 		if( my_thumb_src.indexOf('t=') !== -1){
 			var time_ntp =  seconds2npt ( options.time + parseInt(this.start_offset) );
 			my_thumb_src = getURLParamReplace( my_thumb_src, { 't':time_ntp, 'size': options.size } );
@@ -1399,7 +1399,7 @@ embedVideo.prototype = {
 		var thumb_class = (typeof options['thumb_class'] != 'undefined' ) ? options['thumb_class'] : '';
 		return '<div class="ui-corner-all ' + thumb_class + '" src="' + my_thumb_src + '" '+
 				'style="height:' + options.height + 'px;' +
-				'width:' + options.width + 'px" >' + 
+				'width:' + options.width + 'px" >' +
 					 '<img src="' + my_thumb_src +'" '+
 						'style="height:' + options.height + 'px;' +
 						'width:' + options.width + 'px">' +
@@ -1410,58 +1410,58 @@ embedVideo.prototype = {
 	},
 	updateThumbTime:function( float_sec ){
 		//js_log('updateThumbTime:'+float_sec);
-		var _this = this;													   
-		if( typeof this.org_thum_src=='undefined' ){		
+		var _this = this;
+		if( typeof this.org_thum_src=='undefined' ){
 			this.org_thum_src = this.media_element.getThumbnailURL();
-		}							
+		}
 		if( this.org_thum_src.indexOf('t=') !== -1){
-			this.last_thumb_url = getURLParamReplace(this.org_thum_src, 
-				{ 't' : seconds2npt( float_sec + parseInt(this.start_offset)) } );									
-			if(!this.thumbnail_updating){				
+			this.last_thumb_url = getURLParamReplace(this.org_thum_src,
+				{ 't' : seconds2npt( float_sec + parseInt(this.start_offset)) } );
+			if(!this.thumbnail_updating){
 				this.updateThumbnail(this.last_thumb_url ,false);
 				this.last_thumb_url =null;
 			}
 		}
 	},
 	//for now provide a src url .. but need to figure out how to copy frames from video for plug-in based thumbs
-	updateThumbPerc:function( perc ){	
+	updateThumbPerc:function( perc ){
 		return this.updateThumbTime( (this.getDuration() * perc) );
 	},
 	//updates the thumbnail if the thumbnail is being displayed
-	updateThumbnail : function(src, quick_switch){				
-		//make sure we don't go to the same url if we are not already updating: 
+	updateThumbnail : function(src, quick_switch){
+		//make sure we don't go to the same url if we are not already updating:
 		if( !this.thumbnail_updating && $j('#img_thumb_'+this.id).attr('src')== src )
 			return false;
-		//if we are already updating don't issue a new update: 
+		//if we are already updating don't issue a new update:
 		if( this.thumbnail_updating && $j('#new_img_thumb_'+this.id).attr('src')== src )
 			return false;
-		
+
 		js_log('update thumb: ' + src);
-		
+
 		if(quick_switch){
 			$j('#img_thumb_'+this.id).attr('src', src);
 		}else{
-			var _this = this;			
+			var _this = this;
 			//if still animating remove new_img_thumb_
 			if(this.thumbnail_updating==true)
-				$j('#new_img_thumb_'+this.id).stop().remove();		
-					
+				$j('#new_img_thumb_'+this.id).stop().remove();
+
 			if(this.thumbnail_disp){
 				js_log('set to thumb:'+ src);
 				this.thumbnail_updating=true;
 				$j('#dc_'+this.id).append('<img src="'+src+'" ' +
 					'style="display:none;position:absolute;zindex:2;top:0px;left:0px;" ' +
 					'width="'+this.width+'" height="'+this.height+'" '+
-					'id = "new_img_thumb_'+this.id+'" />');						
-				//js_log('appended: new_img_thumb_');		
-				$j('#new_img_thumb_'+this.id).fadeIn("slow", function(){						
+					'id = "new_img_thumb_'+this.id+'" />');
+				//js_log('appended: new_img_thumb_');
+				$j('#new_img_thumb_'+this.id).fadeIn("slow", function(){
 						//once faded in remove org and rename new:
 						$j('#img_thumb_'+_this.id).remove();
 						$j('#new_img_thumb_'+_this.id).attr('id', 'img_thumb_'+_this.id);
 						$j('#img_thumb_'+_this.id).css('zindex','1');
-						_this.thumbnail_updating=false;						
+						_this.thumbnail_updating=false;
 						//js_log("done fadding in "+ $j('#img_thumb_'+_this.id).attr("src"));
-						
+
 						//if we have a thumb queued update to that
 						if(_this.last_thumb_url){
 							var src_url =_this.last_thumb_url;
@@ -1478,7 +1478,7 @@ embedVideo.prototype = {
 		download, and embed code.
 	*/
 	getThumbnailHTML : function ()
-	{		
+	{
 		js_log('embedVideo:getThumbnailHTML::' + this.id);
 		var thumb_html = '';
 		var class_atr='';
@@ -1493,10 +1493,10 @@ embedVideo.prototype = {
 			' overflow:hidden; top:0px; left:0px; width:'+this.playerPixelWidth()+'px; height:'+this.playerPixelHeight()+'px; z-index:0;">'+
 			'<img width="'+this.playerPixelWidth()+'" height="'+this.playerPixelHeight()+'" style="position:relative;width:'+this.playerPixelWidth()+';height:'+this.playerPixelHeight()+'"' +
 			' id="img_thumb_'+this.id+'" src="' + this.thumbnail + '">';
-		
+
 		if(this.play_button == true && this.controls == true)
 			  thumb_html+=this.getPlayButton();
-			  
+
 		   thumb_html+='</div>';
 		return thumb_html;
 	},
@@ -1538,7 +1538,7 @@ embedVideo.prototype = {
 	},
 	getPlayButton:function(id){
 		if(!id)id=this.id;
-		return '<div title="' + gM('play_clip') + '" id="big_play_link_'+id+'" class="large_play_button" '+
+		return '<div title="' + gM('mwe-play_clip') + '" id="big_play_link_'+id+'" class="large_play_button" '+
 			'style="left:'+((this.playerPixelWidth()-130)/2)+'px;'+
 			'top:' + ((this.playerPixelHeight()-96)/2) + 'px;">'+
 			'<img src="' + mv_skin_img_path + 'player_big_play_button.png">'+
@@ -1547,19 +1547,19 @@ embedVideo.prototype = {
 	doLinkBack:function(){
 		if(this.roe && this.media_element.addedROEData==false){
 			var _this = this;
-			this.displayHTML(gM('loading_txt'));
+			this.displayHTML(gM('mwe-loading_txt'));
 			do_request(this.roe, function(data)
 			   {
-				  _this.media_element.addROE(data);							 
+				  _this.media_element.addROE(data);
 				  _this.doLinkBack();
-			   });			   
+			   });
 		}else{
-			if(this.media_element.linkback){			
+			if(this.media_element.linkback){
 				window.location = this.media_element.linkback;
 			}else{
-				this.displayHTML(gM('could_not_find_linkback'));
+				this.displayHTML(gM('mwe-could_not_find_linkback'));
 			}
-		}	   
+		}
 	},
 	//display the code to remotely embed this video:
 	showEmbedCode : function(embed_code){
@@ -1584,42 +1584,42 @@ embedVideo.prototype = {
 		this.displayHTML(o);
 	},
 	copyText:function(){
-	  $j('#embedding_user_html_'+this.id).focus().select();			
-	  if(document.selection){	  
-		  CopiedTxt = document.selection.createRange();	
+	  $j('#embedding_user_html_'+this.id).focus().select();
+	  if(document.selection){
+		  CopiedTxt = document.selection.createRange();
 		  CopiedTxt.execCommand("Copy");
 	  }
 	},
-	showTextInterface:function(){	
+	showTextInterface:function(){
 		var _this = this;
-		//display the text container with loading text: 
+		//display the text container with loading text:
 		//@@todo support position config
-		var loc = $j(this).position();			
+		var loc = $j(this).position();
 		if($j('#metaBox_'+this.id).length==0){
 			$j(this).after('<div class="ui-widget ui-widget-content ui-corner-all" style="position:absolute;z-index:10;'+
 						'top:' + (loc.top) + 'px;' +
 						'left:' + (parseInt( loc.left ) + parseInt(this.width) + 10 )+'px;' +
-						'height:'+ parseInt( this.height )+'px;width:400px;' +						
+						'height:'+ parseInt( this.height )+'px;width:400px;' +
 						'display:none;" ' +
 						'id="metaBox_' + this.id + '">'+
-							gM('loading_txt') +
-						'</div>');					
+							gM('mwe-loading_txt') +
+						'</div>');
 		}
 		//fade in the text display
-		$j('#metaBox_'+this.id).fadeIn("fast");	
+		$j('#metaBox_'+this.id).fadeIn("fast");
 		//check if textObj present:
 		if(typeof this.textInterface == 'undefined' ){
 			//load the default text interface:
 			mvJsLoader.doLoad([
-					'mvTextInterface', 
+					'mvTextInterface',
 					'$j.fn.hoverIntent'
-				], function(){					
-					_this.textInterface = new mvTextInterface( _this );							
+				], function(){
+					_this.textInterface = new mvTextInterface( _this );
 					//show interface
 					_this.textInterface.show();
 					js_log("NEW TEXT INTERFACE");
 					for(var i in _this.textInterface.availableTracks){
-						js_log("tracks in new interface: "+_this.id+ ' tid:' + i);						
+						js_log("tracks in new interface: "+_this.id+ ' tid:' + i);
 					}
 				}
 			);
@@ -1636,26 +1636,26 @@ embedVideo.prototype = {
 	},
 	/** Generic function to display custom HTML inside the mv_embed element.
 		The code should call the closeDisplayedHTML function to close the
-		display of the custom HTML and restore the regular mv_embed display.		
+		display of the custom HTML and restore the regular mv_embed display.
 		@param {String} HTML code for the selection list.
 	*/
 	displayHTML:function(html_code)
 	{
 		var sel_id = (this.pc!=null)?this.pc.pp.id:this.id;
-		
+
 		if(!this.supports['overlays'])
 			this.stop();
-		
+
 		//put select list on-top
 		//make sure the parent is relatively positioned:
 		$j('#'+sel_id).css('position', 'relative');
 		//set height width (check for playlist container)
 		var width = (this.pc)?this.pc.pp.width:this.playerPixelWidth();
 		var height = (this.pc)?this.pc.pp.height:this.playerPixelHeight();
-		
+
 		if(this.pc)
 			height+=(this.pc.pp.pl_layout.title_bar_height + this.pc.pp.pl_layout.control_height);
-	  
+
 		var fade_in = true;
 		if($j('#blackbg_'+sel_id).length!=0)
 		{
@@ -1667,11 +1667,11 @@ embedVideo.prototype = {
 			 'style="height:'+parseInt(height)+'px;width:'+parseInt(width)+'px;">'+
 			  '<div class="videoOptionsComplete">'+
 			//@@TODO: this style should go to .css
-			'<span style="float:right;margin-right:10px">' +			
+			'<span style="float:right;margin-right:10px">' +
 					'<a href="#" style="color:white;" onClick="$j(\'#'+sel_id+'\').get(0).closeDisplayedHTML();return false;">close</a>' +
 			'</span>'+
 			'<div id="mv_disp_inner_'+sel_id+'" style="padding-top:10px;">'+
-				 html_code 
+				 html_code
 			   +'</div>'+
 			   '</div></div>';
 		$j('#'+sel_id).prepend(div_code);
@@ -1691,43 +1691,43 @@ embedVideo.prototype = {
 		 });
 		 return false; //onclick action return false
 	},
-	selectPlaybackMethod:function(){		
+	selectPlaybackMethod:function(){
 		//get id (in case where we have a parent container)
 		var this_id = (this.pc!=null)?this.pc.pp.id:this.id;
-		
-		var _this=this;			   
+
+		var _this=this;
 		var out= '<span style="color:#FFF;background-color:black;"><blockquote style="background-color:black;">';
 		var _this=this;
 		//js_log('selected src'+ _this.media_element.selected_source.url);
-		$j.each( this.media_element.getPlayableSources(), function(source_id, source){			 
-			var default_player = embedTypes.players.defaultPlayer( source.getMIMEType() );								   
-			
+		$j.each( this.media_element.getPlayableSources(), function(source_id, source){
+			var default_player = embedTypes.players.defaultPlayer( source.getMIMEType() );
+
 			var is_selected = (source == _this.media_element.selected_source);
 			var image_src =  mv_skin_img_path ;
-			
-			//set the Playable source type: 
+
+			//set the Playable source type:
 			if( source.mime_type == 'video/x-flv' ){
 				image_src += 'flash_icon_';
 			}else if( source.mime_type == 'video/h264'){
-				//for now all mp4 content is pulled from archive.org (so use archive.org icon) 
+				//for now all mp4 content is pulled from archive.org (so use archive.org icon)
 				image_src += 'archive_org_';
 			}else{
 				image_src += 'fish_xiph_org_';
 			}
 			image_src += is_selected ? 'color':'bw';
-			image_src += '.png';					   
-			
+			image_src += '.png';
+
 			if (default_player)
 			{
 				out += '<img src="'+image_src+'"/>';
 				if( ! is_selected )
 					out+='<a href="#" class="sel_source" id="sc_' + source_id + '_' + default_player.id +'">';
 				out += source.getTitle()+ (is_selected?'</a>':'') + ' ';
-				
-				//output the player select code: 
-				var supporting_players = embedTypes.players.getMIMETypePlayers( source.getMIMEType() );		
+
+				//output the player select code:
+				var supporting_players = embedTypes.players.getMIMETypePlayers( source.getMIMEType() );
 				out+='<div id="player_select_list_' + source_id + '" class="player_select_list"><ul>';
-				for(var i=0; i < supporting_players.length ; i++){				
+				for(var i=0; i < supporting_players.length ; i++){
 					if( _this.selected_player.id == supporting_players[i].id && is_selected ){
 						out+='<li style="border-style:dashed;margin-left:20px;">'+
 									'<img border="0" width="16" height="16" src="' + mv_skin_img_path + 'plugin.png">' +
@@ -1743,60 +1743,60 @@ embedVideo.prototype = {
 							'</li>';
 					}
 				 }
-				 out+='</ul></div>';		   
+				 out+='</ul></div>';
 			}else
 				out+= source.getTitle() + ' - no player available';
 		});
 		out+='</blockquote></span>';
 		this.displayHTML(out);
-		
+
 		//set up the click bindings:
 		$j('.sel_source').each(function(){
 			$j(this).click(function(){
 				var iparts = $j(this).attr( 'id' ).replace(/sc_/,'').split('_');
 				var source_id = iparts[0];
 				var default_player_id = iparts[1];
-				js_log('source id: ' +  source_id + ' player id: ' + default_player_id);				
-				 
-				$j('#' + this_id  ).get(0).closeDisplayedHTML();				
+				js_log('source id: ' +  source_id + ' player id: ' + default_player_id);
+
+				$j('#' + this_id  ).get(0).closeDisplayedHTML();
 				$j('#' + _this.id ).get(0).media_element.selectSource( source_id );
-				
+
 				embedTypes.players.userSelectPlayer( default_player_id,
 					 _this.media_element.sources[ source_id ].getMIMEType() );
-					 
+
 				//be sure to issue a stop
 				$j('#' + this_id  ).get(0).stop();
-				
+
 				//don't follow the empty # link:
 				return false;
 			});
 		});
-	},	
-	showVideoDownload:function(){		
+	},
+	showVideoDownload:function(){
 		//load the roe if available (to populate out download options:
 		//js_log('f:showVideoDownload '+ this.roe + ' ' + this.media_element.addedROEData);
 		if(this.roe && this.media_element.addedROEData == false){
 			var _this = this;
-			this.displayHTML(gM('loading_txt'));
+			this.displayHTML(gM('mwe-loading_txt'));
 			do_request(this.roe, function(data)
 			{
-			   _this.media_element.addROE(data);							 
+			   _this.media_element.addROE(data);
 			   $j('#mv_disp_inner_'+_this.id).html( _this.getShowVideoDownload() );
-			});			   
+			});
 		}else{
 			this.displayHTML( this.getShowVideoDownload() );
-		}	   
+		}
 	},
-	getShowVideoDownload:function(){ 
+	getShowVideoDownload:function(){
 		var out='<div style="color:white">' +
-				'<b style="color:white;">'+gM('download_segment')+'</b><br>';
+				'<b style="color:white;">'+gM('mwe-download_segment')+'</b><br>';
 		out+='<blockquote style="background:#000">'+
-				gM('download_right_click') + '</blockquote><br>';
+				gM('mwe-download_right_click') + '</blockquote><br>';
 		var dl_list='';
-		var dl_txt_list='';		
+		var dl_txt_list='';
 		$j.each(this.media_element.getSources(), function(index, source){
 			var dl_line = '<li>' + '<a style="color:white" href="' + source.getURI() +'"> '
-				+ source.getTitle()+'</a> '+ '</li>'+"\n";			
+				+ source.getTitle()+'</a> '+ '</li>'+"\n";
 			if(	 source.getURI().indexOf('?t=')!==-1){
 				out+=dl_line;
 			}else if( this.getMIMEType()=="text/cmml" || this.getMIMEType()=="text/x-srt" ){
@@ -1804,12 +1804,12 @@ embedVideo.prototype = {
 			}else{
 				dl_list+=dl_line;
 			}
-		});		
-		
+		});
+
 		if(dl_list!='')
-			out+=gM('download_full') + '<blockquote style="background:#000">' + dl_list + '</blockquote>';
+			out+=gM('mwe-download_full') + '<blockquote style="background:#000">' + dl_list + '</blockquote>';
 		if(dl_txt_list!='')
-			out+=gM('download_text')+'<blockquote style="background:#000">' + dl_txt_list +'</blockquote>';
+			out+=gM('mwe-download_text')+'<blockquote style="background:#000">' + dl_txt_list +'</blockquote>';
 		out+='</div>';
 		return out;
 	},
@@ -1819,11 +1819,11 @@ embedVideo.prototype = {
 	*/
 	play:function(){
 		var this_id = (this.pc!=null)?this.pc.pp.id:this.id;
-				
-		//js_log( "mv_embed play:" + this.id);		
+
+		//js_log( "mv_embed play:" + this.id);
 		//js_log('thum disp:'+this.thumbnail_disp);
 		//check if thumbnail is being displayed and embed html
-		if( this.thumbnail_disp ){			
+		if( this.thumbnail_disp ){
 			if( !this.selected_player ){
 				js_log('no selected_player');
 				//this.innerHTML = this.getPluginMissingHTML();
@@ -1831,21 +1831,21 @@ embedVideo.prototype = {
 				$j('#'+this.id).html( this.getPluginMissingHTML() );
 			}else{
 				this.doEmbedHTML();
-				this.onClipDone_disp=false;			   
-				this.paused=false;	   
-				this.thumbnail_disp=false;		 
+				this.onClipDone_disp=false;
+				this.paused=false;
+				this.thumbnail_disp=false;
 			}
 		}else{
-			//the plugin is already being displayed			
+			//the plugin is already being displayed
 			this.paused=false; //make sure we are not "paused"
 			this.seeking=false;
-		}				
-		
-		 $j("#mv_play_pause_button_" + this_id + ' span').removeClass('ui-icon-play').addClass('ui-icon-pause');			   
-		 $j("#mv_play_pause_button_" + this_id).unbind().btnBind().click(function(){					
+		}
+
+		 $j("#mv_play_pause_button_" + this_id + ' span').removeClass('ui-icon-play').addClass('ui-icon-pause');
+		 $j("#mv_play_pause_button_" + this_id).unbind().btnBind().click(function(){
 		 	$j('#' + this_id ).get(0).pause();
-	   	 }).attr('title', gM('pause_clip'));
-		   
+	   	 }).attr('title', gM('mwe-pause_clip'));
+
 	},
 	load:function(){
 		//should be done by child (no base way to load assets)
@@ -1853,41 +1853,41 @@ embedVideo.prototype = {
 	},
 	getSrc:function(){
 	   return this.media_element.selected_source.getURI( this.seek_time_sec );
-	}, 
+	},
 	/*
 	 * base embed pause
 	 *	there is no general way to pause the video
 	 *  must be overwritten by embed object to support this functionality.
 	 */
 	pause: function(){
-		var this_id = (this.pc!=null)?this.pc.pp.id:this.id;							  
-		//js_log('mv_embed:do pause');		
-		//(playing) do pause		
-		this.paused = true; 
-		//update the ctrl "paused state"				
+		var this_id = (this.pc!=null)?this.pc.pp.id:this.id;
+		//js_log('mv_embed:do pause');
+		//(playing) do pause
+		this.paused = true;
+		//update the ctrl "paused state"
 		$j("#mv_play_pause_button_" + this_id + ' span').removeClass('ui-icon-pause').addClass('ui-icon-play');
-		$j("#mv_play_pause_button_" + this_id).unbind().btnBind().click(function(){							 
+		$j("#mv_play_pause_button_" + this_id).unbind().btnBind().click(function(){
 				$j('#'+this_id).get(0).play();
-		}).attr('title', gM('play_clip'));
-	},	
+		}).attr('title', gM('mwe-play_clip'));
+	},
 	/*
 	 * base embed stop (can be overwritten by the plugin)
 	 */
 	stop: function(){
 		var _this = this;
 		js_log('mvEmbed:stop:'+this.id);
-		
+
 		//no longer seeking:
 		this.didSeekJump=false;
-		
-		//first issue pause to update interface	(only call the parent) 
+
+		//first issue pause to update interface	(only call the parent)
 		if(this['parent_pause']){
 			this.parent_pause();
 		}else{
 			this.pause();
-		}	
-		
-		//reset the currentTime: 
+		}
+
+		//reset the currentTime:
 		this.currentTime=0;
 		//check if thumbnail is being displayed in which case do nothing
 		if( this.thumbnail_disp ){
@@ -1900,12 +1900,12 @@ embedVideo.prototype = {
 			this.setSliderValue(0);
 			this.setStatus( this.getTimeReq() );
 		}
-		
-		//make sure the big playbutton is has click action: 
+
+		//make sure the big playbutton is has click action:
 		$j('#big_play_link_' + _this.id).unbind('click').click(function(){
 			$j('#' +_this.id).get(0).play();
 		});
-		
+
 		if(this.update_interval)
 		{
 			clearInterval(this.update_interval);
@@ -1913,19 +1913,19 @@ embedVideo.prototype = {
 		}
 	},
 	toggleMute:function(){
-		var this_id = (this.pc!=null)?this.pc.pp.id:this.id;	
+		var this_id = (this.pc!=null)?this.pc.pp.id:this.id;
 		if(this.muted){
 			this.muted=false;
 			$j('#volume_control_'+this_id + ' span').removeClass('ui-icon-volume-off').addClass('ui-icon-volume-on');
-			$j('#volume_bar_'+this_id).slider('value', 100); 
+			$j('#volume_bar_'+this_id).slider('value', 100);
 			this.updateVolumen(1);
 		}else{
 			this.muted=true;
 			$j('#volume_control_'+this_id + ' span').removeClass('ui-icon-volume-on').addClass('ui-icon-volume-off');
 			$j('#volume_bar_'+this_id).slider('value', 0);
-			this.updateVolumen(0); 
+			this.updateVolumen(0);
 		}
-		js_log('f:toggleMute::' + this.muted);		
+		js_log('f:toggleMute::' + this.muted);
 	},
 	updateVolumen:function(perc){
 		js_log('update volume not supported with current playback type');
@@ -1959,19 +1959,19 @@ embedVideo.prototype = {
 	postEmbedJS:function(){
 		return '';
 	},
-	//do common monitor code like update the playhead and play status 
+	//do common monitor code like update the playhead and play status
 	//plugin objects are responsible for updating currentTime
 	monitor:function(){
 		if( this.currentTime && this.currentTime > 0 && this.duration){
 			if( !this.userSlide ){
-				if( this.start_offset  ){ 
-					//if start offset include that calculation 
-					this.setSliderValue( ( this.currentTime - this.start_offset ) / this.duration );			
-					this.setStatus( seconds2npt(this.currentTime) + '/'+ seconds2npt(parseFloat(this.start_offset)+parseFloat(this.duration) ));		
+				if( this.start_offset  ){
+					//if start offset include that calculation
+					this.setSliderValue( ( this.currentTime - this.start_offset ) / this.duration );
+					this.setStatus( seconds2npt(this.currentTime) + '/'+ seconds2npt(parseFloat(this.start_offset)+parseFloat(this.duration) ));
 				}else{
 					this.setSliderValue( this.currentTime / this.duration );
 					this.setStatus( seconds2npt(this.currentTime) + '/' + seconds2npt(this.duration ));
-				}				
+				}
 			}
 		}else{
 			//js_log(' ct:' + this.currentTime + ' dur: ' + this.duration);
@@ -1980,25 +1980,25 @@ embedVideo.prototype = {
 			}else if( this.isPaused() ){
 				this.setStatus( "paused" );
 			}else if( this.isPlaying() ){
-				if( this.currentTime && ! this.duration ) 
+				if( this.currentTime && ! this.duration )
 					this.setStatus( seconds2npt( this.currentTime ) + ' /' );
-				else   
+				else
 					this.setStatus(" - - - ");
 			}else{
 				this.setStatus( this.getTimeReq() );
-			}			
+			}
 		}
-		//update buffer information 
+		//update buffer information
 		this.updateBufferStatus();
-		
+
 		//update monitorTimerId to call child monitor
 		if( ! this.monitorTimerId ){
-			//make sure an instance of this.id exists: 
+			//make sure an instance of this.id exists:
 			if( document.getElementById(this.id) ){
 				this.monitorTimerId = setInterval('$j(\'#'+this.id+'\').get(0).monitor()', 250);
 			}
 		}
-	},		
+	},
 	stopMonitor:function(){
 		if( this.monitorTimerId != 0 )
 		{
@@ -2007,18 +2007,18 @@ embedVideo.prototype = {
 		}
 	},
 	updateBufferStatus: function(){
-			
-		//build the buffer targeet based for playlist vs clip 
-		var buffer_select = (this.pc) ? 
-			'#cl_status_' + this.id + ' .mv_buffer': 
+
+		//build the buffer targeet based for playlist vs clip
+		var buffer_select = (this.pc) ?
+			'#cl_status_' + this.id + ' .mv_buffer':
 			'#mv_play_head_' + this.id + ' .mv_buffer';
-			
+
 		//update the buffer progress bar (if available )
 		if( this.bufferedPercent != 0 ){
-			//js_log('bufferedPercent: ' + this.bufferedPercent);			
+			//js_log('bufferedPercent: ' + this.bufferedPercent);
 			if(this.bufferedPercent > 1)
-				this.bufferedPercent=1;							
-			
+				this.bufferedPercent=1;
+
 			$j(buffer_select).css("width", (this.bufferedPercent*100) +'%' );
 		}else{
 			$j(buffer_select).css("width", '0px' );
@@ -2028,7 +2028,7 @@ embedVideo.prototype = {
 		if(!this.start_offset)
 			this.start_offset =0;
 		var rt = this.currentTime - this.start_offset;
-		if( rt < 0 ) //should not happen but does. 
+		if( rt < 0 ) //should not happen but does.
 			return 0;
 		return rt;
 	},
@@ -2044,7 +2044,7 @@ embedVideo.prototype = {
 		}
 		return null;
 	},
-	//HELPER Functions for selected source	
+	//HELPER Functions for selected source
 	/*
 	* returns the selected source url for players to play
 	*/
@@ -2055,12 +2055,12 @@ embedVideo.prototype = {
 		//do head request if on the same domain
 		return this.media_element.selected_source.URLTimeEncoding;
 	},
-	setSliderValue: function(perc, hide_progress){		
-		if(this.controls){		
+	setSliderValue: function(perc, hide_progress){
+		if(this.controls){
 			var this_id = (this.pc)?this.pc.pp.id:this.id;
-			var val = parseInt( perc*1000 ); 
+			var val = parseInt( perc*1000 );
 			$j('#mv_play_head_'+this_id).slider('value', val);
-			
+
 			//js_log("embed video set: " + '#mv_play_head_'+this_id + ' to ' + val);
 		}
 		//js_log('set#mv_seeker_slider_'+this_id + ' perc in: ' + perc + ' * ' + $j('#mv_seeker_'+this_id).width() + ' = set to: '+ val + ' - '+ Math.round(this.mv_seeker_width*perc) );
@@ -2070,44 +2070,44 @@ embedVideo.prototype = {
 		js_log('highlightPlaySection');
 		var this_id = (this.pc)?this.pc.pp.id:this.id;
 		var dur = this.getDuration();
-		var hide_progress = true;		
-		//set the left percet and update the slider: 
+		var hide_progress = true;
+		//set the left percet and update the slider:
 		rel_start_sec = npt2seconds( options['start']);
-		//remove the start_offset if relevent: 
+		//remove the start_offset if relevent:
 		if(this.start_offset)
 			rel_start_sec = rel_start_sec - this.start_offset
-		
+
 		var slider_perc=0;
 		if( rel_start_sec <= 0 ){
-			left_perc =0;			 
+			left_perc =0;
 			options['start'] = seconds2npt( this.start_offset );
-			rel_start_sec=0;			
+			rel_start_sec=0;
 			this.setSliderValue( 0 , hide_progress);
 		}else{
-			left_perc = parseInt( (rel_start_sec / dur)*100 ) ;		
+			left_perc = parseInt( (rel_start_sec / dur)*100 ) ;
 			slider_perc = (left_perc / 100);
-		}		
-		js_log("slider perc:" + slider_perc);	
+		}
+		js_log("slider perc:" + slider_perc);
 		if( ! this.isPlaying() ){
-			this.setSliderValue( slider_perc , hide_progress);		
+			this.setSliderValue( slider_perc , hide_progress);
 		}
-		
-		width_perc = parseInt( (( npt2seconds( options['end'] ) - npt2seconds( options['start'] ) ) / dur)*100 ) ;							 
+
+		width_perc = parseInt( (( npt2seconds( options['end'] ) - npt2seconds( options['start'] ) ) / dur)*100 ) ;
 		if( (width_perc + left_perc) > 100 ){
-			width_perc = 100 - left_perc; 
-		}		
-		//js_log('should hl: '+rel_start_sec+ '/' + dur + ' re:' + rel_end_sec+' lp:'  + left_perc + ' width: ' + width_perc);	
+			width_perc = 100 - left_perc;
+		}
+		//js_log('should hl: '+rel_start_sec+ '/' + dur + ' re:' + rel_end_sec+' lp:'  + left_perc + ' width: ' + width_perc);
 		$j('#mv_seeker_' + this_id + ' .mv_highlight').css({
 			'left':left_perc+'%',
-			'width':width_perc+'%'			
-		}).show();				
-		
+			'width':width_perc+'%'
+		}).show();
+
 		this.jump_time =  options['start'];
 		this.seek_time_sec = npt2seconds( options['start']);
-		//trim output to 
-		this.setStatus( gM('seek_to')+' '+ seconds2npt( this.seek_time_sec ) );
+		//trim output to
+		this.setStatus( gM('mwe-seek_to')+' '+ seconds2npt( this.seek_time_sec ) );
 		js_log('DO update: ' +  this.jump_time);
-		this.updateThumbTime( rel_start_sec );	
+		this.updateThumbTime( rel_start_sec );
 	},
 	hideHighlight:function(){
 		var this_id = (this.pc)?this.pc.pp.id:this.id;
@@ -2119,7 +2119,7 @@ embedVideo.prototype = {
 		var id = (this.pc)?this.pc.pp.id:this.id;
 		//update status:
 		$j('#mv_time_'+id).html(value);
-	}	
+	}
 }
 
 
@@ -2146,9 +2146,9 @@ mediaPlayer.prototype =
 	supported_types:null,
 	library:null,
 	loaded:false,
-	loading_callbacks:null,	
+	loading_callbacks:null,
 	supportsMIMEType : function(type)
-	{		
+	{
 		for (var i=0; i < this.supported_types.length; i++)
 			if(this.supported_types[i] == type)
 				return true;
@@ -2156,7 +2156,7 @@ mediaPlayer.prototype =
 	},
 	getName : function()
 	{
-		return gM('mv_ogg-player-' + this.id);
+		return gM('mwe-ogg-player-' + this.id);
 	},
 	load : function(callback){
 		var libName = this.library+'Embed';
@@ -2164,17 +2164,17 @@ mediaPlayer.prototype =
 			js_log('plugin loaded, do callback:');
 			callback();
 		}else{
-			var _this = this;											
-			//jQuery based get script does not work so well. 							
-			mvJsLoader.doLoad([ 
+			var _this = this;
+			//jQuery based get script does not work so well.
+			mvJsLoader.doLoad([
 				libName
 			],function(){
-				callback();							
+				callback();
 			});
 		}
-	}	
+	}
 }
-/* players and supported mime types 
+/* players and supported mime types
 @@todo ideally we query the plugin to get what mime types it supports in practice not always reliable/avaliable
 */
 var flowPlayer = new mediaPlayer('flowplayer',['video/x-flv', 'video/h264'],'flash');
@@ -2191,7 +2191,7 @@ var vlcActiveXPlayer = new mediaPlayer('vlc-activex',vlcMineList,'vlc');
 //add generic
 var oggPluginPlayer = new mediaPlayer('oggPlugin',['video/ogg'],'generic');
 
-//depricate quicktime in favor of safari native 
+//depricate quicktime in favor of safari native
 //var quicktimeMozillaPlayer = new mediaPlayer('quicktime-mozilla',['video/ogg'],'quicktime');
 //var quicktimeActiveXPlayer = new mediaPlayer('quicktime-activex',['video/ogg'],'quicktime');
 
@@ -2216,24 +2216,24 @@ mediaPlayers.prototype =
 	{
 		this.players = new Array();
 		this.loadPreferences();
-		
-		//set up default players order for each library type		
+
+		//set up default players order for each library type
 		this.default_players['video/x-flv'] = ['flash','vlc'];
 		this.default_players['video/h264'] = ['flash', 'vlc'];
-		
-		this.default_players['video/ogg'] = ['native','vlc','java', 'generic'];		
-		this.default_players['application/ogg'] = ['native','vlc','java', 'generic'];		
-		this.default_players['audio/ogg'] = ['native','vlc', 'java', 'omtk' ];		
+
+		this.default_players['video/ogg'] = ['native','vlc','java', 'generic'];
+		this.default_players['application/ogg'] = ['native','vlc','java', 'generic'];
+		this.default_players['audio/ogg'] = ['native','vlc', 'java', 'omtk' ];
 		this.default_players['video/mp4'] = ['vlc'];
-		
+
 		this.default_players['text/html'] = ['html'];
 		this.default_players['image/jpeg'] = ['html'];
 		this.default_players['image/png'] = ['html'];
 		this.default_players['image/svg'] = ['html'];
-		
+
 	},
 	addPlayer : function(player, mime_type)
-	{		
+	{
 		//js_log('Adding ' + player.id + ' with mime_type ' + mime_type);
 		for (var i =0; i < this.players.length; i++){
 			if (this.players[i].id == player.id)
@@ -2241,52 +2241,52 @@ mediaPlayers.prototype =
 				if(mime_type!=null)
 				{
 					//make sure the mime_type is not already there:
-					var add_mime = true; 
+					var add_mime = true;
 					for(var j=0; j < this.players[i].supported_types.length; j++ ){
 						if( this.players[i].supported_types[j]== mime_type)
 							add_mime=false;
-					}					
+					}
 					if(add_mime)
 						this.players[i].supported_types.push(mime_type);
 				}
 				return;
 			}
 		}
-		//player not found: 
+		//player not found:
 		if(mime_type!=null)
-			player.supported_types.push(mime_type);	  
-				 
+			player.supported_types.push(mime_type);
+
 		this.players.push( player );
 	},
 	getMIMETypePlayers : function(mime_type)
-	{				
+	{
 		var mime_players = new Array();
 		var _this = this;
 		var inx = 0;
-		if( this.default_players[mime_type] ){						
-			$j.each( this.default_players[mime_type], function(d, lib){				
-				var library = _this.default_players[mime_type][d];				
-				for ( var i=0; i < _this.players.length; i++ ){					
+		if( this.default_players[mime_type] ){
+			$j.each( this.default_players[mime_type], function(d, lib){
+				var library = _this.default_players[mime_type][d];
+				for ( var i=0; i < _this.players.length; i++ ){
 					if ( _this.players[i].library == library && _this.players[i].supportsMIMEType(mime_type) ){
-						mime_players[ inx ] = _this.players[i];						
+						mime_players[ inx ] = _this.players[i];
 						inx++;
 					}
 				}
 			});
-		}		
+		}
 		return mime_players;
 	},
 	defaultPlayer : function(mime_type)
-	{				
-		js_log("get defaultPlayer for " + mime_type);		
-		var mime_players = this.getMIMETypePlayers(mime_type);				
+	{
+		js_log("get defaultPlayer for " + mime_type);
+		var mime_players = this.getMIMETypePlayers(mime_type);
 		if( mime_players.length > 0)
 		{
 			// check for prior preference for this mime type
 			for( var i=0; i < mime_players.length; i++ ){
 				if( mime_players[i].id==this.preference[mime_type] )
 					return mime_players[i];
-			}					
+			}
 			// otherwise just return the first compatible player
 			// (it will be chosen according to the default_players list
 			return mime_players[0];
@@ -2326,7 +2326,7 @@ mediaPlayers.prototype =
 	},
 	loadPreferences : function()
 	{
-		this.preference = new Object();				
+		this.preference = new Object();
 		// see if we have a cookie set to a clientSupported type:
 		var cookieVal = $j.cookie( 'ogg_player_exp' );
 		if (cookieVal)
@@ -2342,11 +2342,11 @@ mediaPlayers.prototype =
 	},
 	savePreferences : function()
 	{
-		var cookieVal = '';		
+		var cookieVal = '';
 		for(var i in this.preference)
 			cookieVal+= i + '='+ this.preference[i] + '&';
-			
-		cookieVal=cookieVal.substr(0, cookieVal.length-1);		
+
+		cookieVal=cookieVal.substr(0, cookieVal.length-1);
 		var week = 7*86400*1000;
 		$j.cookie( 'ogg_player_exp', cookieVal, { 'expires':week } );
 	}
@@ -2360,7 +2360,7 @@ mediaPlayers.prototype =
 var embedTypes = {
 	 // List of players
 	 players: null,
-	 detect_done:false,	 
+	 detect_done:false,
 	 init: function(){
 		//detect supported types
 		this.detect();
@@ -2380,7 +2380,7 @@ var embedTypes = {
 		 js_log("running detect");
 		this.players = new mediaPlayers();
 		//every browser supports html rendering:
-		this.players.addPlayer( htmlPlayer );			
+		this.players.addPlayer( htmlPlayer );
 		 // In Mozilla, navigator.javaEnabled() only tells us about preferences, we need to
 		 // search navigator.mimeTypes to see if it's installed
 		 var javaEnabled = navigator.javaEnabled();
@@ -2392,28 +2392,28 @@ var embedTypes = {
 		 // And it doesn't register an application/x-java-applet mime type like Mozilla does.
 		 if ( invisibleJava && javaEnabled )
 			 this.players.addPlayer( cortadoPlayer );
-		
+
 		 // ActiveX plugins
 		 if($j.browser.msie){
-			  // check for flash		 
-			   if ( this.testActiveX( 'ShockwaveFlash.ShockwaveFlash')){				   
-				   //try to get the flash version for omtk include: 
+			  // check for flash
+			   if ( this.testActiveX( 'ShockwaveFlash.ShockwaveFlash')){
+				   //try to get the flash version for omtk include:
 				   try {
 					a = new ActiveXObject(SHOCKWAVE_FLASH_AX + ".7");
 					d = a.GetVariable("$version");	// Will crash fp6.0.21/23/29
 					if (d) {
-						d = d.split(" ")[1].split(",");						
+						d = d.split(" ")[1].split(",");
 						//we need flash version 10 or greater:
 						if(parseInt( d[0]) >=10){
 							this.players.addPlayer( omtkPlayer );
 						}
-						
-					}					
-				}catch(e) {}				
-				
-				   //flowplayer has pretty good compatiablity 
+
+					}
+				}catch(e) {}
+
+				   //flowplayer has pretty good compatiablity
 				   // (but if we wanted to be fancy we would check for version of flash and update the mp4/h.264 support
-				   this.players.addPlayer( flowPlayer );				   
+				   this.players.addPlayer( flowPlayer );
 			   }
 			 // VLC
 			 if ( this.testActiveX( 'VideoLAN.VLCPlugin.2' ) )
@@ -2423,14 +2423,14 @@ var embedTypes = {
 				 this.players.addPlayer(cortadoPlayer);
 			 // quicktime
 			 //if ( this.testActiveX( 'QuickTimeCheckObject.QuickTimeCheck.1' ) )
-			 //	this.players.addPlayer(quicktimeActiveXPlayer);			 
-		 }				 
+			 //	this.players.addPlayer(quicktimeActiveXPlayer);
+		 }
 		// <video> element
 		if ( typeof HTMLVideoElement == 'object' // Firefox, Safari
 				|| typeof HTMLVideoElement == 'function' ) // Opera
 		{
-			//do another test for safari: 
-			if( $j.browser.safari ){				
+			//do another test for safari:
+			if( $j.browser.safari ){
 				try{
 					var dummyvid = document.createElement("video");
 					if (dummyvid.canPlayType && dummyvid.canPlayType("video/ogg;codecs=\"theora,vorbis\"") == "probably")
@@ -2441,7 +2441,7 @@ var embedTypes = {
 						   but xiph qt registers mimetype via quicktime plugin */
 						this.players.addPlayer( videoElementPlayer );
 					} else {
-						//@@todo add some user nagging to install the xiph qt 
+						//@@todo add some user nagging to install the xiph qt
 					}
 				}catch(e){
 					js_log('could not run canPlayType in safari');
@@ -2449,8 +2449,8 @@ var embedTypes = {
 			}else{
 				this.players.addPlayer( videoElementPlayer );
 			}
-		}		 
-		
+		}
+
 		 // Mozilla plugins
 		if( navigator.mimeTypes && navigator.mimeTypes.length > 0) {
 			for ( var i = 0; i < navigator.mimeTypes.length; i++ ) {
@@ -2464,17 +2464,17 @@ var embedTypes = {
 				if ( !pluginName ) {
 					// In case it is null or undefined
 					pluginName = '';
-				}				
+				}
 				if ( pluginName.toLowerCase() == 'vlc multimedia plugin' || pluginName.toLowerCase() == 'vlc multimedia plug-in' ) {
 					this.players.addPlayer(vlcMozillaPlayer, type);
 					continue;
 				}
-		
+
 				if ( javaEnabled && type == 'application/x-java-applet' ) {
 					this.players.addPlayer(cortadoPlayer);
 					continue;
-				}				
-		
+				}
+
 				if ( type == 'application/ogg' ) {
 					if ( pluginName.toLowerCase() == 'vlc multimedia plugin' ){
 						this.players.addPlayer(vlcMozillaPlayer, type);
@@ -2493,14 +2493,14 @@ var embedTypes = {
 						continue;
 					}
 				}
-		
+
 				/*if ( type == 'video/quicktime' ) {
 					this.players.addPlayer(vlcMozillaPlayer, type);
 					continue;
 				}*/
 				if(type=='application/x-shockwave-flash'){
 					this.players.addPlayer( flowPlayer );
-					
+
 					//check version to add omtk:
 					var flashDescription = navigator.plugins["Shockwave Flash"].description;
 					var descArray = flashDescription.split(" ");
@@ -2509,7 +2509,7 @@ var embedTypes = {
 					//js_log("version of flash: " + versionMajor);
 					if(versionMajor >= 10){
 						this.players.addPlayer( omtkPlayer );
-					}					
+					}
 					continue;
 				}
 			}
@@ -2528,5 +2528,5 @@ var embedTypes = {
 			 hasObj = false;
 		 }
 		 return hasObj;
-	}	 
+	}
 };
diff --git a/js2/mwEmbed/libSequencer/mvSequencer.js b/js2/mwEmbed/libSequencer/mvSequencer.js
index 8946f47a56..2eecbe2e4e 100644
--- a/js2/mwEmbed/libSequencer/mvSequencer.js
+++ b/js2/mwEmbed/libSequencer/mvSequencer.js
@@ -19,40 +19,40 @@
  */
 
 loadGM({
-	"menu_clipedit" : "Edit media",
-	"menu_transition" : "Transitions and effects",
-	"menu_cliplib" : "Add media",
-	"menu_resource_overview" : "Resource overview",
-	"menu_options" : "Options",
-	"loading_timeline" : "Loading timeline <blink>...<\/blink>",
-	"loading_user_rights" : "Loading user rights <blink>...<\/blink>",
-	"no_edit_permissions" : "You do not have permissions to save changes to this sequence",
-	"edit_clip" : "Edit clip",
-	"edit_save" : "Save sequence changes",
-	"saving_wait" : "Save in progress (please wait)",
-	"save_done" : "Save complete",
-	"edit_cancel" : "Cancel sequence edit",
-	"edit_cancel_confirm" : "Are you sure you want to cancel your edit? Changes will be lost.",
-	"zoom_in" : "Zoom in",
-	"zoom_out" : "Zoom out",
-	"cut_clip" : "Cut clips",
-	"expand_track" : "Expand track",
-	"colapse_track" : "Collapse track",
-	"play_from_position" : "Play from playline position",
-	"pixle2sec" : "pixles to seconds",
-	"rmclip" : "Remove clip",
-	"clip_in" : "clip in",
-	"clip_out" : "clip out",
-	"mv_welcome_to_sequencer" : "<h3>Welcome to the sequencer demo<\/h3> Very <b>limited<\/b> functionality right now. Not much documentation yet either.",
-	"no_selected_resource" : "<h3>No resource selected<\/h3> Select a clip to enable editing.",
-	"error_edit_multiple" : "<h3>Multiple resources selected<\/h3> Select a single clip to edit it.",
-	"mv_editor_options" : "Editor options",
-	"mv_editor_mode" : "Editor mode",
-	"mv_simple_editor_desc" : "simple editor (iMovie style)",
-	"mv_advanced_editor_desc" : "advanced editor (Final Cut style)",
-	"mv_other_options" : "Other options",
-	"mv_contextmenu_opt" : "Enable context menus",
-	"mv_sequencer_credit_line" : "Developed by <a href=\"http:\/\/kaltura.com\">Kaltura, Inc.<\/a> in partnership with the <a href=\"http:\/\/wikimediafoundation.org\/wiki\/Home\">Wikimedia Foundation<\/a> (<a href=\"#\">more information<\/a>)."
+	"mwe-menu_clipedit" : "Edit media",
+	"mwe-menu_transition" : "Transitions and effects",
+	"mwe-menu_cliplib" : "Add media",
+	"mwe-menu_resource_overview" : "Resource overview",
+	"mwe-menu_options" : "Options",
+	"mwe-loading_timeline" : "Loading timeline <blink>...<\/blink>",
+	"mwe-loading_user_rights" : "Loading user rights <blink>...<\/blink>",
+	"mwe-no_edit_permissions" : "You do not have permissions to save changes to this sequence",
+	"mwe-edit_clip" : "Edit clip",
+	"mwe-edit_save" : "Save sequence changes",
+	"mwe-saving_wait" : "Save in progress (please wait)",
+	"mwe-save_done" : "Save complete",
+	"mwe-edit_cancel" : "Cancel sequence edit",
+	"mwe-edit_cancel_confirm" : "Are you sure you want to cancel your edit? Changes will be lost.",
+	"mwe-zoom_in" : "Zoom in",
+	"mwe-zoom_out" : "Zoom out",
+	"mwe-cut_clip" : "Cut clips",
+	"mwe-expand_track" : "Expand track",
+	"mwe-collapse_track" : "Collapse track",
+	"mwe-play_from_position" : "Play from playline position",
+	"mwe-pixle2sec" : "pixels to seconds",
+	"mwe-rmclip" : "Remove clip",
+	"mwe-clip_in" : "clip in",
+	"mwe-clip_out" : "clip out",
+	"mwe-welcome_to_sequencer" : "<h3>Welcome to the sequencer demo<\/h3> Very <b>limited<\/b> functionality right now. Not much documentation yet either.",
+	"mwe-no_selected_resource" : "<h3>No resource selected<\/h3> Select a clip to enable editing.",
+	"mwe-error_edit_multiple" : "<h3>Multiple resources selected<\/h3> Select a single clip to edit it.",
+	"mwe-editor_options" : "Editor options",
+	"mwe-editor_mode" : "Editor mode",
+	"mwe-simple_editor_desc" : "simple editor (iMovie style)",
+	"mwe-advanced_editor_desc" : "advanced editor (Final Cut style)",
+	"mwe-other_options" : "Other options",
+	"mwe-contextmenu_opt" : "Enable context menus",
+	"mwe-sequencer_credit_line" : "Developed by <a href=\"http:\/\/kaltura.com\">Kaltura, Inc.<\/a> in partnership with the <a href=\"http:\/\/wikimediafoundation.org\/wiki\/Home\">Wikimedia Foundation<\/a> (<a href=\"#\">more information<\/a>)."
 });
  //used to set default values and validate the passed init object
 var sequencerDefaultValues = {
@@ -131,7 +131,7 @@ mvSequencer.prototype = {
 		},
 		'transition':{
 			'd':0,
-			'html' : '<h3>' + gM('menu_transition') + '</h3>',
+			'html' : '<h3>' + gM('mwe-menu_transition') + '</h3>',
 			'js':function(this_seq){
 				this_seq.doEditTransitionSelectedClip();
 			},
@@ -156,15 +156,15 @@ mvSequencer.prototype = {
 		},
 		'options':{
 			'd':0,
-			'html' : '<h3>' + gM('menu_options') + '</h3>' +
-				gM('mv_editor_mode') + '<br> ' +
+			'html' : '<h3>' + gM('mwe-menu_options') + '</h3>' +
+				gM('mwe-editor_mode') + '<br> ' +
 				'<blockquote><input type="radio" value="simple_editor" name="opt_editor">' +
-						gM('mv_simple_editor_desc') + ' </blockquote>' +
+						gM('mwe-simple_editor_desc') + ' </blockquote>' +
 				'<blockquote><input type="radio" value="advanced_editor" name="opt_editor">' +
-						gM('mv_advanced_editor_desc') + ' </blockquote>'+
-				gM('mv_other_options') + '<br>' +
+						gM('mwe-advanced_editor_desc') + ' </blockquote>'+
+				gM('mwe-other_options') + '<br>' +
 				'<blockquote><input type="checkbox" value="contextmenu_opt" name="contextmenu_opt">' +
-						gM('mv_contextmenu_opt') + ' </blockquote>',
+						gM('mwe-contextmenu_opt') + ' </blockquote>',
 			'js':function(this_seq){
 				$j('#options_ic input[value=\'simple_editor\']').attr({
 					'checked':(this_seq.timeline_mode=='storyboard')?true:false
@@ -216,14 +216,14 @@ mvSequencer.prototype = {
 				'width:' + this.video_width + 'px;height:'+this.video_height+'px;border:solid thin blue;background:#FFF;font-color:black;"/>'+
 			'<div id="' + this.timeline_id + '" class="ui-widget ui-widget-content ui-corner-all" style="position:absolute;' +
 				'left:0px;right:0px;top:'+(this.video_height+34)+'px;bottom:35px;overflow:auto;">'+
-					gM('loading_timeline')+ '</div>'+
+					gM('mwe-loading_timeline')+ '</div>'+
 			'<div class="seq_status" style="position:absolute;left:0px;width:300px;"></div>'+
 			'<div class="seq_save_cancel" style="position:absolute;'+
 				'left:5px;bottom:0px;height:25px;">'+
-					gM('loading_user_rights') +
+					gM('mwe-loading_user_rights') +
 			'</div>'+
 			'<div class="about_editor" style="position:absolute;right:5px;bottom:7px;">' +
-				gM('mv_sequencer_credit_line') +
+				gM('mwe-sequencer_credit_line') +
 			'</div>'+
 			'<div id="'+this.sequence_tools_id+'" style="position:absolute;' +
 				'left:0px;right:'+(this.video_width+15)+'px;top:0px;height:'+(this.video_height+23)+'px;"/>'
@@ -266,15 +266,15 @@ mvSequencer.prototype = {
 		var _this = this;
 		if( this.sequenceEditToken ){
 			$j(this.target_sequence_container+' .seq_save_cancel').html(
-				$j.btnHtml( gM('edit_save'), 'seq_edit_save', 'close') + ' ' +
-				$j.btnHtml( gM('edit_cancel'), 'seq_edit_cancel', 'close')
+				$j.btnHtml( gM('mwe-edit_save'), 'seq_edit_save', 'close') + ' ' +
+				$j.btnHtml( gM('mwe-edit_cancel'), 'seq_edit_cancel', 'close')
 			);
 		}else{
-			$j(this.target_sequence_container+' .seq_save_cancel').html( cancel_button + gM('no_edit_permissions') );
+			$j(this.target_sequence_container+' .seq_save_cancel').html( cancel_button + gM('mwe-no_edit_permissions') );
 		}
 		//assing bindings
 		$j(this.target_sequence_container +' .seq_edit_cancel').unbind().click(function(){
-			var x = window.confirm( gM('edit_cancel_confirm') );
+			var x = window.confirm( gM('mwe-edit_cancel_confirm') );
 			if( x ){
 				_this.closeModEditor();
 			}else{
@@ -285,7 +285,7 @@ mvSequencer.prototype = {
 			//pop up progress dialog ~requesting edit line summary~
 			//remove any other save dialog
 			$j('#seq_save_dialog').remove();
-			$j('body').append('<div id="seq_save_dialog" title="'+ gM('edit_save') +'">' +
+			$j('body').append('<div id="seq_save_dialog" title="'+ gM('mwe-edit_save') +'">' +
 						'<span class="mw-summary">'+
 							'<label for="seq_save_summary">Edit summary: </label>' +
 						'</span>'+
@@ -309,7 +309,7 @@ mvSequencer.prototype = {
 						};
 						//change to progress bar and save:
 						$j('#seq_save_dialog').html('<div class="progress" /><br>' +
-							gM('saving_wait')
+							gM('mwe-saving_wait')
 						)
 						$j('#seq_save_dialog .progress').progressbar({
 							value: 100
@@ -319,7 +319,7 @@ mvSequencer.prototype = {
 							'data': saveReq,
 							'url' : _this.getLocalApiUrl()
 						},function(data){
-							$j('#seq_save_dialog').html( gM('save_done') );
+							$j('#seq_save_dialog').html( gM('mwe-save_done') );
 							$j('#seq_save_dialog').dialog('option',
 								'buttons', {
 									"Done":function(){
@@ -373,16 +373,16 @@ mvSequencer.prototype = {
 			$j('#'+this.timeline_id).html(''+
 				'<div id="'+this.timeline_id+'_left_cnt" class="mv_tl_left_cnt">'+
 					'<div id="'+this.timeline_id+'_head_control" style="position:absolute;top:0px;left:0px;right:0px;height:30px;">' +
-						'<a title="'+gM('play_from_position')+'" href="javascript:'+this.instance_name+'.play_jt()">'+
+						'<a title="'+gM('mwe-play_from_position')+'" href="javascript:'+this.instance_name+'.play_jt()">'+
 							'<img style="width:16px;height:16px;border:0" src="' + mv_embed_path + 'images/control_play_blue.png">'+
 						'</a>'+
-						'<a title="'+gM('zoom_in')+'" href="javascript:'+this.instance_name+'.zoom_in()">'+
+						'<a title="'+gM('mwe-zoom_in')+'" href="javascript:'+this.instance_name+'.zoom_in()">'+
 							'<img style="width:16px;height:16px;border:0" src="' + mv_embed_path + 'images/zoom_in.png">'+
 						'</a>'+
-						'<a title="'+gM('zoom_out')+'" href="javascript:'+this.instance_name+'.zoom_out()">'+
+						'<a title="'+gM('mwe-zoom_out')+'" href="javascript:'+this.instance_name+'.zoom_out()">'+
 							'<img style="width:16px;height:16px;border:0" src="' + mv_embed_path + 'images/zoom_out.png">'+
 						'</a>'+
-						'<a title="'+gM('cut_clip')+'" href="javascript:'+this.instance_name+'.cut_mode()">'+
+						'<a title="'+gM('mwe-cut_clip')+'" href="javascript:'+this.instance_name+'.cut_mode()">'+
 							'<img style="width:16px;height:16px;border:0" src="' + mv_embed_path + 'images/cut.png">'+
 							'</a>'+
 					'</div>' +
@@ -406,13 +406,13 @@ mvSequencer.prototype = {
 						var track_height=60;
 						var exc_img = 'opened';
 						var exc_action='close';
-						var exc_msg = gM('colapse_track');
+						var exc_msg = gM('mwe-collapse_track');
 					break;
 					case 'text':
 						var track_height=20;
 						var exc_img = 'closed';
 						var exc_action='open';
-						var exc_msg = gM('expand_track');
+						var exc_msg = gM('mwe-expand_track');
 					break;
 				}
 				//add track name:
@@ -555,11 +555,11 @@ mvSequencer.prototype = {
 			}
 
 			o+='<li>' +
-				'<a id="mv_menu_item_'+tab_id+'" href="#' + tab_id + '_ic">'+gM('menu_' + tab_id ) + '</a>' +
+				'<a id="mv_menu_item_'+tab_id+'" href="#' + tab_id + '_ic">'+gM('mwe-menu_' + tab_id ) + '</a>' +
 			'</li>';
 
 			tabc += '<div id="' + tab_id + '_ic" style="overflow:auto;height:268px;" >';
-				tabc += (menu_item.html) ? menu_item.html : '<h3>' + gM('menu_'+tab_id) + '</h3>';
+				tabc += (menu_item.html) ? menu_item.html : '<h3>' + gM('mwe-menu_'+tab_id) + '</h3>';
 			tabc +='</div>';
 			inx++;
 		};
@@ -714,10 +714,10 @@ mvSequencer.prototype = {
 			_this.doEditTransition( _this.getClipFromSeqID( $j('.mv_selected_clip').parent().attr('id') ) );
 		}else if( $j('.mv_selected_clip').length === 0){
 			//no clip selected warning:
-			$j('#transition_ic').html( gM('no_selected_resource') );
+			$j('#transition_ic').html( gM('mwe-no_selected_resource') );
 		}else{
 			//multiple clip selected warning:
-			$j('#transition_ic').html( gM('error_edit_multiple') );
+			$j('#transition_ic').html( gM('mwe-error_edit_multiple') );
 		}
 	},
 	doEditSelectedClip:function(){
@@ -727,10 +727,10 @@ mvSequencer.prototype = {
 			this.doEditClip( this.getClipFromSeqID( $j('.mv_selected_clip').parent().attr('id') ) );
 		}else if( $j('.mv_selected_clip').length === 0){
 			//no clip selected warning:
-			$j('#clipedit_ic').html( gM('no_selected_resource') );
+			$j('#clipedit_ic').html( gM('mwe-no_selected_resource') );
 		}else{
 			//multiple clip selected warning:
-			$j('#clipedit_ic').html( gM('error_edit_multiple') );
+			$j('#clipedit_ic').html( gM('mwe-error_edit_multiple') );
 		}
 	},
 	doEditTransition:function( cObj ){
@@ -1075,9 +1075,9 @@ mvSequencer.prototype = {
 									'" class="mv_time_clip_text mv_clip_drag">'+clip.title;
 						}
 						//add in per clip controls
-						track_html+='<div title="'+gM('clip_in')+' '+clip.embed.start_ntp+'" class="ui-resizable-w ui-resizable-handle" style="width: 16px; height: 16px; left: 0px; top: 2px;background:url(\''+mv_embed_path+'images/application_side_contract.png\');" ></div>'+"\n";
-						track_html+='<div title="'+gM('clip_out')+' '+clip.embed.end_ntp+'" class="ui-resizable-e ui-resizable-handle" style="width: 16px; height: 16px; right: 0px; top: 2px;background:url(\''+mv_embed_path+'images/application_side_expand.png\');" ></div>'+"\n";
-						track_html+='<div title="'+gM('rmclip')+'" onClick="'+this.instance_name + '.removeClips(new Array([' + track_id + ',' + j + ']))" style="position:absolute;cursor:pointer;width: 16px; height: 16px; left: 0px; bottom:2px;background:url(\''+mv_embed_path+'images/delete.png\');"></div>'+"\n";
+						track_html+='<div title="'+gM('mwe-clip_in')+' '+clip.embed.start_ntp+'" class="ui-resizable-w ui-resizable-handle" style="width: 16px; height: 16px; left: 0px; top: 2px;background:url(\''+mv_embed_path+'images/application_side_contract.png\');" ></div>'+"\n";
+						track_html+='<div title="'+gM('mwe-clip_out')+' '+clip.embed.end_ntp+'" class="ui-resizable-e ui-resizable-handle" style="width: 16px; height: 16px; right: 0px; top: 2px;background:url(\''+mv_embed_path+'images/application_side_expand.png\');" ></div>'+"\n";
+						track_html+='<div title="'+gM('mwe-rmclip')+'" onClick="'+this.instance_name + '.removeClips(new Array([' + track_id + ',' + j + ']))" style="position:absolute;cursor:pointer;width: 16px; height: 16px; left: 0px; bottom:2px;background:url(\''+mv_embed_path+'images/delete.png\');"></div>'+"\n";
 						track_html+='<span style="display:none;" class="mv_clip_stats"></span>';
 
 						track_html+='</span>';
diff --git a/js2/mwEmbed/libSequencer/mvTimedEffectsEdit.js b/js2/mwEmbed/libSequencer/mvTimedEffectsEdit.js
index 50644ffc53..6988067b29 100644
--- a/js2/mwEmbed/libSequencer/mvTimedEffectsEdit.js
+++ b/js2/mwEmbed/libSequencer/mvTimedEffectsEdit.js
@@ -7,15 +7,14 @@
 
 //add our local msgs
 loadGM({
-	"transition_in" : "Transition in",
-	"transition_out" : "Transition out",
-	"effects" : "Effects stack",
-	"remove_transition" : "Remove transition",
-	"edit_transin" : "Edit transition into clip",
-	"edit_transout" : "Edit transition out of clip"
+	"mwe-transition_in" : "Transition in",
+	"mwe-transition_out" : "Transition out",
+	"mwe-effects" : "Effects stack",
+	"mwe-remove_transition" : "Remove transition",
+	"mwe-edit_transin" : "Edit transition into clip",
+	"mwe-edit_transout" : "Edit transition out of clip"
 });
 
-
 var default_timed_effect_values = {
 	'rObj':	null,		 // the resource object
 	'clip_disp_ct':null, //target clip disp
@@ -35,21 +34,21 @@ mvTimedEffectsEdit.prototype = {
 	//the menu_items Object contains: default html, js setup/loader functions
 	menu_items : {
 		'transin':{
-			'title':gM('transition_in'),
+			'title':gM('mwe-transition_in'),
 			'clip_attr':'transIn',
 			'doEdit':function(_this){
 				_this.doTransitionDisplayEdit('transin');
 			}
 		},
 		'transout':{
-			'title':gM('transition_out'),
+			'title':gM('mwe-transition_out'),
 			'clip_attr':'transOut',
 			'doEdit':function(_this){
 				_this.doTransitionDisplayEdit('transout');
 			}
 		},
 		'effects':{
-			'title':gM('effects'),
+			'title':gM('mwe-effects'),
 			'clip_attr':'Effects',
 			'doEdit':function(_this){
 				//display
@@ -126,7 +125,7 @@ mvTimedEffectsEdit.prototype = {
 		var _this = this;
 		var appendTarget = '#te_effects';
 		js_log('type:' + _this.rObj['type']);
-		$j(appendTarget).html(gM('loading_txt'));
+		$j(appendTarget).html(gM('mwe-loading_txt'));
 		//@@todo integrate into core and loading system:
 		loadExternalJs(mv_embed_path + 'libClipEdit/pixastic-editor/editor.js?' + getMvUniqueReqId() );
 		loadExternalJs(mv_embed_path + 'libClipEdit/pixastic-editor/pixastic.all.js?' + getMvUniqueReqId() );
@@ -159,7 +158,7 @@ mvTimedEffectsEdit.prototype = {
 			return ;
 		}
 		var cTran = this.rObj[ this.menu_items[ target_item ].clip_attr ];
-		var o='<h3>' + gM('edit_'+target_item ) + '</h3>';
+		var o='<h3>' + gM('mwe-edit_'+target_item ) + '</h3>';
 		o+='Type: ' +
 			'<select class="te_select_type">';
 		for(var typeKey in mvTransLib.type){
@@ -180,7 +179,7 @@ mvTimedEffectsEdit.prototype = {
 		_this.getSubTypeControl( target_item, cTran.type, apendTarget + ' .te_subtype_container' );
 
 		//add remove transition button:
-		$j(apendTarget).append( '<br><br>' + $j.btnHtml(gM('remove_transition'), 'te_remove_transition', 'close'  ) )
+		$j(apendTarget).append( '<br><br>' + $j.btnHtml(gM('mwe-remove_transition'), 'te_remove_transition', 'close'  ) )
 			.children('.te_remove_transition')
 			.click(function(){
 				//remove the transtion from the playlist
diff --git a/js2/mwEmbed/libTimedText/mvTextInterface.js b/js2/mwEmbed/libTimedText/mvTextInterface.js
index 8c0ef96689..b672106c38 100644
--- a/js2/mwEmbed/libTimedText/mvTextInterface.js
+++ b/js2/mwEmbed/libTimedText/mvTextInterface.js
@@ -1,9 +1,10 @@
 
 loadGM({
-	"select_transcript_set" : "Select layers",
-	"auto_scroll" : "auto scroll",
-	"close" : "close",
-	"improve_transcript" : "Improve"
+	"mwe-select_transcript_set" : "Select layers",
+	"mwe-auto_scroll" : "auto scroll",
+	"mwe-close" : "close",
+	"mwe-improve_transcript" : "Improve",
+	"mwe-no_text_tracks_found" : "No text tracks were found"
 })
 // text interface object (for inline display captions)
 var mvTextInterface = function( parentEmbed ){
@@ -94,7 +95,7 @@ mvTextInterface.prototype = {
 
 		//if nothing found anywhere update the loading icon to say no tracks found
 		if(!default_found)
-			$j('#mv_txt_load_'+_this.pe.id).html( gM('no_text_tracks_found') );
+			$j('#mv_txt_load_'+_this.pe.id).html( gM('mwe-no_text_tracks_found') );
 
 
 	},
@@ -229,7 +230,7 @@ mvTextInterface.prototype = {
 		var _this = this;
 		js_log('getTsSelect');
 		var selHTML = '<div id="mvtsel_' + this.pe.id + '" style="position:absolute;background:#FFF;top:30px;left:0px;right:0px;bottom:0px;overflow:auto;">';
-		selHTML+='<b>' + gM('select_transcript_set') + '</b><ul>';
+		selHTML+='<b>' + gM('mwe-select_transcript_set') + '</b><ul>';
 		//debugger;
 		for(var i in _this.availableTracks){ //for in loop ok on object
 			var checked = ( _this.availableTracks[i].display ) ? 'checked' : '';
@@ -237,7 +238,7 @@ mvTextInterface.prototype = {
 				_this.availableTracks[i].getTitle() + '</li>';
 		}
 		selHTML+='</ul>' +
-					'<a href="#" onClick="document.getElementById(\'' + this.pe.id + '\').textInterface.applyTsSelect();return false;">'+gM('close')+'</a>'+
+					'<a href="#" onClick="document.getElementById(\'' + this.pe.id + '\').textInterface.applyTsSelect();return false;">'+gM('mwe-close')+'</a>'+
 				'</div>';
 		$j('#metaBox_'+_this.pe.id).append( selHTML );
 	},
@@ -342,13 +343,13 @@ mvTextInterface.prototype = {
 		//add in loading icon:
 		var as_checked = (this.autoscroll)?'checked':'';
 		out+= '<div id="tt_mmenu_'+this.pe.id+'" class="ui-widget-header" style="font-size:.6em;position:absolute;top:0;height:30px;left:0px;right:0px;">' +
-				$j.btnHtml(gM('select_transcript_set'), 'tt-select', 'shuffle');
+				$j.btnHtml(gM('mwe-select_transcript_set'), 'tt-select', 'shuffle');
 		if(this.pe.media_element.linkback){
-			out+=' ' + $j.btnHtml(gM('improve_transcript'), 'tt-improve', 'document', {href:this.pe.media_element.linkback, target:'_new'});
+			out+=' ' + $j.btnHtml(gM('mwe-improve_transcript'), 'tt-improve', 'document', {href:this.pe.media_element.linkback, target:'_new'});
 		}
 		out+='<input onClick="document.getElementById(\''+this.pe.id+'\').textInterface.setAutoScroll(this.checked);return false;" ' +
-				'type="checkbox" '+as_checked +'>'+gM('auto_scroll') + ' ' +
-              $j.btnHtml(gM('close'), 'tt-close', 'circle-close');
+				'type="checkbox" '+as_checked +'>'+gM('mwe-auto_scroll') + ' ' +
+              $j.btnHtml(gM('mwe-close'), 'tt-close', 'circle-close');
 		out+='</div>';
 		return out;
 	},
diff --git a/js2/mwEmbed/mv_embed.js b/js2/mwEmbed/mv_embed.js
index ab2641815c..30b5594e36 100644
--- a/js2/mwEmbed/mv_embed.js
+++ b/js2/mwEmbed/mv_embed.js
@@ -218,7 +218,7 @@ lcPaths({
 //depencency mapping for css files for self contained included plugins:
 lcCssPath({
 	'$j.Jcrop'			: 'libClipEdit/Jcrop/css/jquery.Jcrop.css',
-	'$j.fn.ColorPicker'	: 'libClipEdit/colorpicker/css/colorpicker.css'	
+	'$j.fn.ColorPicker'	: 'libClipEdit/colorpicker/css/colorpicker.css'
 })
 
 /**
@@ -415,7 +415,7 @@ var mvJsLoader = {
 		}
 		if( this.checkLoading() ){
 			 if( this.load_time++ > 2000){ //time out after ~80seconds
-				 js_error( gM('error_load_lib') +  this.missing_path );
+				 js_error( gM('mwe-error_load_lib') +  this.missing_path );
 				 this.load_error = true;
 			 }else{
 				setTimeout( 'mvJsLoader.doLoad()', 20 );
@@ -624,13 +624,13 @@ function mwdomReady(force){
 		mvJsLoader.runQuededFunctions();
 	}
 }
-//a quick function that sets the intial text of swapable elements to "loading" 
-// (jquery might not be ready) 
-//(does not destroy inner elements)    
+//a quick function that sets the intial text of swapable elements to "loading"
+// (jquery might not be ready)
+//(does not destroy inner elements)
 function setSwapableToLoading(e){
 	//for(var i =0)
-	//for(var j = 0; i < j.length; j++){		
-	//}	
+	//for(var j = 0; i < j.length; j++){
+	//}
 }
 //js2AddOnloadHook: ensure jQuery and the DOM are ready:
 function js2AddOnloadHook( func ) {